From 1e8223439045c271bf1b86cdac738985992b03ba Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 14:21:12 -0800
Subject: [PATCH 001/203] certstrap: 1.0.1 -> 1.1.1

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -h` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --help` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap help` got 0 exit code
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -v` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --version` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap -h` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap --help` and found version 1.1.1
- ran `/nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin/bin/certstrap help` and found version 1.1.1
- found 1.1.1 with grep in /nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin
- found 1.1.1 in filename of file in /nix/store/ysm8fw6liwvqvnwk4yds5xz5md7vi42y-certstrap-1.1.1-bin
---
 pkgs/tools/security/certstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
index bf659f19e9b..e0935f0f760 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "certstrap-${version}";
-  version = "1.0.1";
+  version = "1.1.1";
 
   goPackagePath = "github.com/square/certstrap";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "square";
     repo = "certstrap";
     rev = "v${version}";
-    sha256 = "0pw1g6nyb212ayic42rkm6i0cf4n2003f02qym6zp130m6aysb47";
+    sha256 = "0j7gi2nzykny7i0gjax9vixw72l9jcm4wnwxgm72hh1pji0ysa8n";
   };
 
   meta = with stdenv.lib; {

From 4042708b7f2c5f0f84cff05c98e8b46f61f33818 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 20:18:18 -0800
Subject: [PATCH 002/203] double-conversion: 2.0.1 -> 3.0.0

Semi-automatic update. These checks were performed:

- built on NixOS
- found 3.0.0 with grep in /nix/store/3401963nw3aw97ng939gk6viifymqzgx-double-conversion-3.0.0
- found 3.0.0 in filename of file in /nix/store/3401963nw3aw97ng939gk6viifymqzgx-double-conversion-3.0.0
---
 pkgs/development/libraries/double-conversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 47c165c1bad..c656220f760 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "double-conversion-${version}";
-  version = "2.0.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
     rev = "v${version}";
-    sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
+    sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz";
   };
 
   nativeBuildInputs = [ cmake ];

From 251eca2f7da3ca61337b10585f179ea8859a14ab Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 20:44:16 -0800
Subject: [PATCH 003/203] electrum-ltc: 3.0.5.1 -> 3.0.6.2

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc -h` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc --help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/electrum-ltc version` and found version 3.0.6.2
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped -h` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped --help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped help` got 0 exit code
- ran `/nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2/bin/.electrum-ltc-wrapped version` and found version 3.0.6.2
- found 3.0.6.2 with grep in /nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2
- found 3.0.6.2 in filename of file in /nix/store/7fpp297s6qy7r9m8j7pwkxgndp72lmzd-electrum-ltc-3.0.6.2
---
 pkgs/applications/misc/electrum-ltc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix
index 10b2aacbf8c..8540c39d133 100644
--- a/pkgs/applications/misc/electrum-ltc/default.nix
+++ b/pkgs/applications/misc/electrum-ltc/default.nix
@@ -5,11 +5,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-ltc-${version}";
-  version = "3.0.5.1";
+  version = "3.0.6.2";
 
   src = fetchurl {
     url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
-    sha256 = "1acsgzmd83cz6ha5fw63mi7123fr6gbiq537p5lxxfs2i8zrl63r";
+    sha256 = "1bay4vfkanxsa8pj8n99sj55yc59s84nns97lbvagyp0p0lclia7";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 71286aa5ec757b4de5109146d4543cdaca381b67 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Feb 2018 20:47:15 -0800
Subject: [PATCH 004/203] emscripten: 1.37.16 -> 1.37.34

Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.37.34 with grep in /nix/store/mdr47v3wdjmzic5c2nvdx5krdwl6bcxf-emscripten-1.37.34
---
 pkgs/development/compilers/emscripten/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ae80ad6fc80..f8fc12200b7 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  rev = "1.37.16";
+  rev = "1.37.34";
   appdir = "share/emscripten";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
+    sha256 = "1v62jg0b65shh10lbkvjg79xwnwwms6lr6w5vn1gaq6cpc712y19";
     inherit rev;
   };
 

From d0a427d24f7f362a1a9190fdc0fbf0049db09c15 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 12:03:25 -0800
Subject: [PATCH 005/203] psi-plus: 0.16.575.639 -> 1.2.235

Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.2.235 with grep in /nix/store/9z3lbwjmcvgxpicxnkqsqyn2bmkyqvsw-psi-plus-1.2.235

cc "@orivej"
---
 .../networking/instant-messengers/psi-plus/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index c4d13ac7643..7c6f33935dc 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "psi-plus-${version}";
-  version = "0.16.575.639";
+  version = "1.2.235";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = "${version}";
-    sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg";
+    sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47";
   };
 
   resources = fetchFromGitHub {

From c7f69d04dd5dc4c9a997d855694e6119b8e30774 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 06:51:28 -0800
Subject: [PATCH 006/203] aj-snapshot: 0.9.7 -> 0.9.8

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.8 in filename of file in /nix/store/20clx4g7349qaa4z00grmvncaszmmr9w-aj-snapshot-0.9.8
---
 pkgs/applications/audio/aj-snapshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix
index c7033afac34..f84958e1f82 100644
--- a/pkgs/applications/audio/aj-snapshot/default.nix
+++ b/pkgs/applications/audio/aj-snapshot/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name =  packageName + "-" + version ;
   packageName = "aj-snapshot" ;
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/${packageName}/${name}.tar.bz2";
-    sha256 = "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8";
+    sha256 = "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p";
   };
 
   doCheck = false;

From f5a4fa7e9353ec16c2413bf0281907c44cc488cb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 07:41:49 -0800
Subject: [PATCH 007/203] ansifilter: 2.4 -> 2.9

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -h` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter --help` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter help` got 0 exit code
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -V` and found version 2.9
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter -v` and found version 2.9
- ran `/nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9/bin/ansifilter --version` and found version 2.9
- found 2.9 with grep in /nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9
- found 2.9 in filename of file in /nix/store/kws0dw1qp926cdc6msrndgq3iwp2l84a-ansifilter-2.9
---
 pkgs/tools/text/ansifilter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index a2b6e3e6c3b..7b899e0399e 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ansifilter-${version}";
-  version = "2.4";
+  version = "2.9";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
-    sha256 = "c57cb878afa7191c7b7db3c086a344b4234df814aed632596619a4bda5941d48";
+    sha256 = "0fmwb8w1bpfxjwddal6cnhgmip26xqgcanpz2vp8jasklkcc1i7r";
 
   };
 

From bab699faefd763e54c9743184640a6efbbcd52f8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 08:24:27 -0800
Subject: [PATCH 008/203] apktool: 2.3.0 -> 2.3.1

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -h` got 0 exit code
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool --help` got 0 exit code
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool help` got 0 exit code
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -V` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -v` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool --version` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool version` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool -h` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool --help` and found version 2.3.1
- ran `/nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1/bin/apktool help` and found version 2.3.1
- found 2.3.1 with grep in /nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1
- found 2.3.1 in filename of file in /nix/store/h8i3bh2ka65cj2ddfmvq2fv7wldsprk4-apktool-2.3.1
---
 pkgs/development/tools/apktool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 158de9226c6..d1320960f39 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "apktool-${version}";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     urls = [
       "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
       "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
     ];
-    sha256 = "b724c158ec99dbad723024e259fd73e5135c40d652a3c599cec6ade9264a568e";
+    sha256 = "01xj2hivwwp3msvv0psxyxrzg95vj2ny56l3n90glhwznn7l60ai";
   };
 
   phases = [ "installPhase" ];

From f51cc6fae68d30700ddf8a87b83f29adab80af25 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 08:28:46 -0800
Subject: [PATCH 009/203] argyllcms: 1.8.3 -> 2.0.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/hh6cqaai79dsh200g3c581iaq52yi580-argyllcms-2.0.0/bin/synthcal help` got 0 exit code
- found 2.0.0 with grep in /nix/store/hh6cqaai79dsh200g3c581iaq52yi580-argyllcms-2.0.0
- found 2.0.0 in filename of file in /nix/store/hh6cqaai79dsh200g3c581iaq52yi580-argyllcms-2.0.0
---
 pkgs/tools/graphics/argyllcms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 3cdb4497baf..d35eae87204 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
 , libXdmcp, libXau, lib, openssl, zlib }:
 let
-  version = "1.8.3";
+  version = "2.0.0";
  in
 stdenv.mkDerivation rec {
   name = "argyllcms-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
     url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
-    sha256 = "00ggh47qzb3xyl8rnppwxa6j113lr38aiwvsfyxwgs51aqmvq7bd";
+    sha256 = "1583hspas7rw5xwrs1rb4yn1yl34wh6lfik6xyszpfv39a2axdxx";
 
     # The argyllcms web server doesn't like curl ...
     curlOpts = "--user-agent 'Mozilla/5.0'";

From 848d597eab83fe26f46f5988f998770064789e37 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 18:25:56 -0800
Subject: [PATCH 010/203] biboumi: 6.1 -> 7.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2/bin/biboumi --help` got 0 exit code
- found 7.2 with grep in /nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2
- found 7.2 in filename of file in /nix/store/ng1gidmaivbb5ngd4awq6wgraa55yjd5-biboumi-7.2
---
 pkgs/servers/xmpp/biboumi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index e59aaa9116c..f46b3189edf 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "biboumi-${version}";
-  version = "6.1";
+  version = "7.2";
 
   src = fetchurl {
     url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz";
-    sha256 = "1la1n502v2wyfm0vl8v4m0hbigkkjchi21446n9mb203fz1cvr77";
+    sha256 = "0gyr2lp2imrjm5hvijcq0s7k9fzkirfl70cprjy9r4yvq6mg1jvd";
   };
 
   louiz_catch = fetchgit {

From 2bb8c17e5536eec0d4bd6b480839e29af7a3770d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:01:36 -0800
Subject: [PATCH 011/203] binaryen: 42 -> 44

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-shell -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-shell --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-shell help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-opt -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-opt --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-merge -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-merge --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-metadce -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-metadce --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/asm2wasm -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/asm2wasm --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm2asm -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm2asm --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/s2wasm -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/s2wasm --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/s2wasm help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-emscripten-finalize -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-emscripten-finalize --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-as -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-as --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-dis -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-dis --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-ctor-eval -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-ctor-eval --help` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-reduce -h` got 0 exit code
- ran `/nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44/bin/wasm-reduce --help` got 0 exit code
- found 44 with grep in /nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44
- found 44 in filename of file in /nix/store/1vkah592g2qsd97hnx0g9w7sgayf8zwv-binaryen-44
---
 pkgs/development/compilers/binaryen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 3f9ee17ca27..2b3919160e4 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "42";
+  version = "44";
   rev = "version_${version}";
   name = "binaryen-${version}";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "binaryen";
-    sha256 = "0b8qc9cd7ncshgfjwv4hfapmwa81gmniaycnxmdkihq9bpm26x2k";
+    sha256 = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p";
     inherit rev;
   };
 

From 617a8bda3bd27e247b20ae082d4bd56523fc7f2c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:16:54 -0800
Subject: [PATCH 012/203] bleachbit: 1.12 -> 2.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped -h` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped --help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped -v` and found version 2.0
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/.bleachbit-wrapped --version` and found version 2.0
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit -h` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit --help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit help` got 0 exit code
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit -v` and found version 2.0
- ran `/nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0/bin/bleachbit --version` and found version 2.0
- found 2.0 with grep in /nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0
- found 2.0 in filename of file in /nix/store/3wdy7impkb43r97w6hqqmcrncqkh05j1-bleachbit-2.0
---
 pkgs/applications/misc/bleachbit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 196db45d905..f0dce54675c 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -1,13 +1,13 @@
 { stdenv, pythonPackages, fetchurl }:
 pythonPackages.buildPythonApplication rec {
   name = "bleachbit-${version}";
-  version = "1.12";
+  version = "2.0";
 
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://sourceforge/bleachbit/${name}.tar.bz2";
-    sha256 = "1x58n429q1c77nfpf2g3vyh6yq8wha69zfzmxf1rvjvcvvmqs62m";
+    sha256 = "0ps98zx4n13q92bq7ykqi6hj3i7brdqgm87i9gk6ibvljp1vxdz9";
   };
 
   buildInputs = [  pythonPackages.wrapPython ];

From 00a44c0c8cd396da43a9b973d5b1119c0fb1f945 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:33:22 -0800
Subject: [PATCH 013/203] bwidget: 1.9.10 -> 1.9.12

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.12 with grep in /nix/store/5rrcmy0g4sj5q2yhxxyczgddnjhgjfxm-bwidget-1.9.12
- found 1.9.12 in filename of file in /nix/store/5rrcmy0g4sj5q2yhxxyczgddnjhgjfxm-bwidget-1.9.12
---
 pkgs/development/libraries/bwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix
index 6dc658c03e3..76c041e2ad5 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/libraries/bwidget/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bwidget-${version}";
-  version = "1.9.10";
+  version = "1.9.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz";
-    sha256 = "025lmriaq4qqy99lh826wx2cnqqgxn7srz4m3q06bl6r9ch15hr6";
+    sha256 = "0qrj8k4zzrnhwgdn5dpa6j0q5j739myhwn60ssnqrzq77sljss1g";
   };
 
   dontBuild = true;

From bf110ef56a9cb3b521efe58df6a85cd7d6627285 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:34:38 -0800
Subject: [PATCH 014/203] byobu: 5.121 -> 5.124

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu -v` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu --version` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ctrl-a -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ctrl-a --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable-prompt -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable-prompt --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-disable-prompt help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-enable -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-enable --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-enable help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-janitor -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-janitor --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-janitor help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-keybindings -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-keybindings --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-keybindings help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launch -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launch --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launch help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher -v` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher --version` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-install -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-install --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-install help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-uninstall -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-uninstall --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-launcher-uninstall help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-select-profile -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status-detail -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status-detail --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-status-detail help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph version` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph -h` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ugraph --help` and found version 5.124
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ulevel -h` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ulevel --help` got 0 exit code
- ran `/nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124/bin/byobu-ulevel --help` and found version 5.124
- found 5.124 with grep in /nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124
- found 5.124 in filename of file in /nix/store/5vgygd2nxww9higxqnqy2cpjkpvi3jck-byobu-5.124
---
 pkgs/tools/misc/byobu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index 82ae4d40f2d..8f3c067018d 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  version = "5.121";
+  version = "5.124";
   name = "byobu-" + version;
 
   src = fetchurl {
     url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
-    sha256 = "0rbwb7kh0f458ad51grrhz56889g6xj1c29c838pi37cjdgl3wjx";
+    sha256 = "08pipvh2iwy5d4b1bnrh0vwlmm884cqzgsz6jx3ar4shp63i5jjf";
   };
 
   doCheck = true;

From bc7ca17345e660c7c03d207dff029850203005f6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:50:56 -0800
Subject: [PATCH 015/203] cadvisor: 0.28.3 -> 0.29.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.29.1 with grep in /nix/store/8zpvaz7imhsknld6d0qyykqw9b718lxi-cadvisor-0.29.1
- found 0.29.1 in filename of file in /nix/store/8zpvaz7imhsknld6d0qyykqw9b718lxi-cadvisor-0.29.1
---
 pkgs/servers/monitoring/cadvisor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 695e5aa4558..0480d056c59 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cadvisor-${version}";
-  version = "0.28.3";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "1rdw09cbhs4il63lv1f92dw8pav9rjnkbrqx37lqij8x6xmv01gy";
+    sha256 = "132mpcp35cymm2zqig0yrvhnvgn72k7cmn6gla0v7r0yxfl879m3";
   };
 
   nativeBuildInputs = [ go ];

From 7272190333510b2c8f84c8e56161424ea633088c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 7 Mar 2018 22:06:50 -0600
Subject: [PATCH 016/203] json2hcl: init at 0.0.6

Fixes #36416
---
 pkgs/development/tools/json2hcl/default.nix | 24 +++++++++++++++++++++
 pkgs/development/tools/json2hcl/deps.nix    | 20 +++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/tools/json2hcl/default.nix
 create mode 100644 pkgs/development/tools/json2hcl/deps.nix

diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
new file mode 100644
index 00000000000..cddf6054d48
--- /dev/null
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "json2hcl";
+  name = "${pname}-${version}";
+  version = "0.0.6";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0knil88n2w41w3nzqz6ljgfjkl5r3x0bh7ifqgiyf6sin3pl4pn0";
+  };
+
+  owner = "kvz";
+  goPackagePath = "github.com/${owner}/${pname}";
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Convert JSON to HCL, and vice versa";
+    license = with licenses; [ mit ];
+    maintainers = [ maintainers.matthewbauer ];
+  };
+}
diff --git a/pkgs/development/tools/json2hcl/deps.nix b/pkgs/development/tools/json2hcl/deps.nix
new file mode 100644
index 00000000000..bb9df28ad87
--- /dev/null
+++ b/pkgs/development/tools/json2hcl/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/Acconut/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Acconut/hcl";
+      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
+      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f6255aa16..18bfc58e988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9359,6 +9359,8 @@ with pkgs;
 
   jshon = callPackage ../development/tools/parsing/jshon { };
 
+  json2hcl = callPackage ../development/tools/json2hcl { };
+
   json-glib = callPackage ../development/libraries/json-glib { };
 
   json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable

From 6edbf98d341f6b7e2acd3b5b619619756c1f5849 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 20:08:56 -0800
Subject: [PATCH 017/203] calc: 2.12.6.3 -> 2.12.6.6

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -V` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere --version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere -h` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere --help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/4dsphere help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/fproduct -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/fproduct --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/fproduct help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/mersenne -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/mersenne --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/mersenne help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/piforever -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/piforever -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus --version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus version` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus --help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/plus help` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/powerterm -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/powerterm --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/powerterm help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/simple -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/cscript/square -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/calc -v` and found version 2.12.6.6
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped -h` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped --help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped help` got 0 exit code
- ran `/nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6/bin/.calc-wrapped -v` and found version 2.12.6.6
- found 2.12.6.6 with grep in /nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6
- found 2.12.6.6 in filename of file in /nix/store/mdjaq6pgxp9qrfg9s7iaavj2rsvjqh9q-calc-2.12.6.6
---
 pkgs/applications/science/math/calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 5787cb3d6b8..efd38f05345 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -12,11 +12,11 @@ in
 stdenv.mkDerivation rec {
 
   name = "calc-${version}";
-  version = "2.12.6.3";
+  version = "2.12.6.6";
 
   src = fetchurl {
     url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "01m20s5zs74zyb23x6zg6i13gc30a2ay2iz1rdbkxram01cblzky";
+    sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5";
   };
 
   buildInputs = [ makeWrapper readline ncurses utillinux ];

From 99547c4334db4d4ed18a57b2bf3aca5e9bdccb38 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 23:24:18 -0800
Subject: [PATCH 018/203] cherrytree: 0.37.6 -> 0.38.4

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/.cherrytree-wrapped -h` got 0 exit code
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/.cherrytree-wrapped --help` got 0 exit code
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/cherrytree -h` got 0 exit code
- ran `/nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4/bin/cherrytree --help` got 0 exit code
- found 0.38.4 with grep in /nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4
- found 0.38.4 in filename of file in /nix/store/z6xvmmp8nc09wcg5wmgdlvg0vmawm2vn-cherrytree-0.38.4
---
 pkgs/applications/misc/cherrytree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 324fa12dc46..ff1712f12fe 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "cherrytree-${version}";
-  version = "0.37.6";
+  version = "0.38.4";
 
   src = fetchurl {
     url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "0x4cgsimpwh7wfbzbzw2f5ipxxjizpi4wa99s1cwizynfjr38y5s";
+    sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2";
   };
 
   buildInputs = with pythonPackages;

From 2f090641ecf4555884d61e23140c626a3eb030e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 23:44:47 -0800
Subject: [PATCH 019/203] chessx: 1.4.0 -> 1.4.6

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.6 with grep in /nix/store/9cv1znh739dblr4avnhnp463v77yq9by-chessx-1.4.6
- found 1.4.6 in filename of file in /nix/store/9cv1znh739dblr4avnhnp463v77yq9by-chessx-1.4.6
---
 pkgs/games/chessx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index b8a4d4e06dc..c8d23fcc9de 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
 stdenv.mkDerivation rec {
   name = "chessx-${version}";
-  version = "1.4.0";
+  version = "1.4.6";
   src = fetchurl {
     url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
-    sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74";
+    sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd";
   };
   buildInputs = [
    qtbase

From eb03591afd1756ee67e09fdc59e93b73ac8acf58 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:00:11 -0800
Subject: [PATCH 020/203] chromedriver: 2.35 -> 2.36

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver -h` got 0 exit code
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver --help` got 0 exit code
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver -v` and found version 2.36
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver --version` and found version 2.36
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver -h` and found version 2.36
- ran `/nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36/bin/chromedriver --help` and found version 2.36
- found 2.36 with grep in /nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36
- found 2.36 in filename of file in /nix/store/in6njcawrv5bjk2j6p5bwdj0qrygsrk7-chromedriver-2.36
---
 pkgs/development/tools/selenium/chromedriver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 554a5585f15..d5671b974f5 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,7 +6,7 @@ let
   allSpecs = {
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "13iyz6579yw4fk9dr4nf2pdj55v1iflj8yf9a4zz7qw5996d5yk7";
+      sha256 = "1m119kbsr6gm8a37q92rflp5mp3fjzw8cy4r5j4bnihkai7khq94";
     };
 
     "x86_64-darwin" = {
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.35";
+  version = "2.36";
 
   src = fetchurl {
     url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From efea9f0fa93a0a8dab1ab135028f62f4113b8e7f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:16:47 -0800
Subject: [PATCH 021/203] cminpack: 1.3.4 -> 1.3.6

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.6 in filename of file in /nix/store/ch2n83jgh0mv5h7992gm4lf9lmxp59lp-cminpack-1.3.6
---
 pkgs/development/libraries/cminpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix
index a13b42a08a8..cb4f3e39aef 100644
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/pkgs/development/libraries/cminpack/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cminpack-1.3.4";
+  name = "cminpack-1.3.6";
   
   src = fetchurl {
     url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
-    sha256 = "1jh3ymxfcy3ykh6gnvds5bbkf38aminvjgc8halck356vkvpnl9v";
+    sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";
   };
 
   patchPhase = ''

From 48801b8507d13107b2d372a2fd3d1a2ae8bc6d08 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:33:13 -0800
Subject: [PATCH 022/203] cmst: 2017.09.19 -> 2018.01.06

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.01.06 with grep in /nix/store/va2g67lavq3xhp2154dlgz95p4438ccx-cmst-2018.01.06
- found 2018.01.06 in filename of file in /nix/store/va2g67lavq3xhp2154dlgz95p4438ccx-cmst-2018.01.06
---
 pkgs/tools/networking/cmst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index e0912007d95..1d9e2e1677f 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cmst-${version}";
-  version = "2017.09.19";
+  version = "2018.01.06";
 
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
     rev = name;
-    sha256 = "14inss0mr9i4q6vfqqfxbjgpjaclp1kh60qlm5xv4cwnvi395rc7";
+    sha256 = "1a3v7z75ghziymdj2w8603ql9nfac5q224ylfsqfxcqxw4bdip4r";
   };
 
   nativeBuildInputs = [ qmake ];

From 0d961f02d234e3af3e376533b56dc4a4671d79aa Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 00:48:25 -0800
Subject: [PATCH 023/203] cni: 0.5.2 -> 0.6.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.0 with grep in /nix/store/20rzgnqnxfx21j49wr48pd4p9wb0ai5z-cni-0.6.0
- found 0.6.0 in filename of file in /nix/store/20rzgnqnxfx21j49wr48pd4p9wb0ai5z-cni-0.6.0
---
 pkgs/applications/networking/cluster/cni/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index a7205f1bc7a..3ce056c1e11 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cni-${version}";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "cni";
     rev = "v${version}";
-    sha256 = "0n2sc5xf1h0i54am80kj7imrvawddn0kxvgi65w0194dpmyrg5al";
+    sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
   };
 
   buildInputs = [ go ];

From 752736b34836eb58b79bed3400cd74ebb57e754d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 01:39:13 -0800
Subject: [PATCH 024/203] csound: 6.09.0 -> 6.10.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csanalyze -h` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csanalyze --help` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csanalyze help` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/csb64enc help` got 0 exit code
- ran `/nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0/bin/makecsd help` got 0 exit code
- found 6.10.0 with grep in /nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0
- found 6.10.0 in filename of file in /nix/store/y5y28sldhyh69vy0xxy9y1zajzyzg4ln-csound-6.10.0
---
 pkgs/applications/audio/csound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index dc0c8eabcac..191074eba27 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   name = "csound-${version}";
-  version = "6.09.0";
+  version = "6.10.0";
 
   enableParallelBuilding = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "csound";
     repo = "csound";
     rev = version;
-    sha256 = "1vfb0mab89psfwidadjrn5mbzq3bhjbyrrmyp98yp0xm6a8cssih";
+    sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n";
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

From 1e2afe8b19c43b909cd861cd98a1b82694ca16a4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 01:55:09 -0800
Subject: [PATCH 025/203] dateutils: 0.4.2 -> 0.4.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/strptime --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateadd --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateconv --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datediff --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dategrep --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateround --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/dateseq --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datesort --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datetest --version` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone -h` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone --help` got 0 exit code
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone -V` and found version 0.4.3
- ran `/nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3/bin/datezone --version` and found version 0.4.3
- found 0.4.3 with grep in /nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3
- found 0.4.3 in filename of file in /nix/store/2nrrhpq3w9cxjrxzpi6w3czfzn0lmbsi-dateutils-0.4.3
---
 pkgs/tools/misc/dateutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 86a8d3f234b..7c689211f6e 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.3";
   name = "dateutils-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
-    sha256 = "0sxl5rz9rw02dfn5mdww378hjgnnbxavs52viyfyx620b29finpc";
+    sha256 = "06lgqp2cyvmh09j04lm3g6ml7yxn1x92rjzgnwzq4my95c37kmdh";
   };
 
   meta = with stdenv.lib; {

From f18054f8ad66da789e9a5eb8ae0808df5d111324 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:11:02 -0800
Subject: [PATCH 026/203] discount: 2.2.2 -> 2.2.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown help` got 0 exit code
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown -V` and found version 2.2.3
- ran `/nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3/bin/markdown --version` and found version 2.2.3
- found 2.2.3 with grep in /nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3
- found 2.2.3 in filename of file in /nix/store/rq0ny7n6qfg7sgjqa5ki2ds6v3gzjwil-discount-2.2.3
---
 pkgs/tools/text/discount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index d3dcb662c49..8a1de29b0d9 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  version = "2.2.2";
+  version = "2.2.3";
   name = "discount-${version}";
 
   src = fetchurl {
     url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2";
-    sha256 = "0r4gjyk1ngx47zhb25q0gkjm3bz2m5x8ngrk6rim3y1y3rricygc";
+    sha256 = "17797xiaq0kk152pj4rvd9grg4i518x3glnwg1lgl8rry3dbrzx8";
   };
 
   patches = ./fix-configure-path.patch;

From c4605f23874d31b4bfc11194bc3e9d91a2efee02 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:26:41 -0800
Subject: [PATCH 027/203] doit: 0.30.3 -> 0.31.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped --help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/.doit-wrapped --version` and found version 0.31.0
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit --help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit help` got 0 exit code
- ran `/nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0/bin/doit --version` and found version 0.31.0
- found 0.31.0 with grep in /nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0
- found 0.31.0 in filename of file in /nix/store/y6r8fjncv9axs205hmi0vjv8rb2s4i6v-doit-0.31.0
---
 pkgs/development/tools/build-managers/doit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix
index 200ec6429a7..aeeb4dbd779 100644
--- a/pkgs/development/tools/build-managers/doit/default.nix
+++ b/pkgs/development/tools/build-managers/doit/default.nix
@@ -3,14 +3,14 @@
 let
 
   name = "doit";
-  version = "0.30.3";
+  version = "0.31.0";
 
 in python3Packages.buildPythonApplication {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz";
-    sha256 = "1fcsslc3mc4bszq5xdqbxv37720s1s31d6pbfwc2iyxk1x2wi219";
+    sha256 = "0v1yr04bfqnz3sp261np3zhf0y1b3a1daxc83iq308lscf39fdgx";
   };
 
   buildInputs = with python3Packages; [ mock pytest ];

From 54adc7a8244c0e6726ea52f15902521298ba7049 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:44:00 -0800
Subject: [PATCH 028/203] drumstick: 1.1.0 -> 1.1.1

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpsmf --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpwrk --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpove --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-dumpmid --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-playsmf --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo --help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-sysinfo help` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -h` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome --help` got 0 exit code
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -V` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -v` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome --version` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome -h` and found version 1.1.1
- ran `/nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1/bin/drumstick-metronome --help` and found version 1.1.1
- found 1.1.1 with grep in /nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1
- found 1.1.1 in filename of file in /nix/store/38x7gw88p7nwk586p5s5synjz2x1nral-drumstick-1.1.1
---
 pkgs/development/libraries/drumstick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index a46c6bab647..ab25a651844 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumstick-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2";
-    sha256 = "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df";
+    sha256 = "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn";
   };
 
   outputs = [ "out" "dev" "man" ];

From 691c823a2ed1f74b8360063746cd4edac5dfe3d8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 02:59:55 -0800
Subject: [PATCH 029/203] easyloggingpp: 9.96.0 -> 9.96.1

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 9.96.1 with grep in /nix/store/ha2fl2l2j3p9lcn6scxn1n50f1vsb5k6-easyloggingpp-9.96.1
- found 9.96.1 in filename of file in /nix/store/ha2fl2l2j3p9lcn6scxn1n50f1vsb5k6-easyloggingpp-9.96.1
---
 pkgs/development/libraries/easyloggingpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 80c3f7b100e..4aa1f279886 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -4,12 +4,12 @@
 { stdenv, fetchFromGitHub, cmake, gtest }:
 stdenv.mkDerivation rec {
   name = "easyloggingpp-${version}";
-  version = "9.96.0";
+  version = "9.96.1";
   src = fetchFromGitHub {
     owner = "muflihun";
     repo = "easyloggingpp";
     rev = "v${version}";
-    sha256 = "134arh13rksfsxa80h6xw104458ihzp1mpblz5sprx5gxkq7yqfv";
+    sha256 = "1x5wwm62l1231sgxfwx8mj7fc8452j3f509jyxa9wd2krkpvqxmy";
   };
 
   nativeBuildInputs = [cmake];

From bc3ec20c29f1f075e0ae14c9f2d3ef16bee0050a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 03:42:55 -0800
Subject: [PATCH 030/203] emby: 3.2.70.0 -> 3.3.0.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.0.0 with grep in /nix/store/nnp01d2wwym58qqvw6kigskycdqch47x-emby-3.3.0.0
---
 pkgs/servers/emby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 12c475bfc28..eeb3d39fa1d 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.70.0";
+  version = "3.3.0.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "051mbzh1igcbda43n14aijbvhhh98rqw8i13f06xqsm67afrjjcv";
+    sha256 = "14nnrlwx8bghiz72lspxahwadhvnf8vs3bqbffnd5nrrv4shijhm";
   };
 
   buildInputs = with pkgs; [

From 6e2345c81277def1d2553425980808a4497add3b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 04:20:26 -0800
Subject: [PATCH 031/203] focuswriter: 1.6.8 -> 1.6.10

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.6.10 with grep in /nix/store/xj71q5kp9k5m2nsfydjhjra8axf3kdj8-focuswriter-1.6.10
- found 1.6.10 in filename of file in /nix/store/xj71q5kp9k5m2nsfydjhjra8axf3kdj8-focuswriter-1.6.10
---
 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 4964de13986..7be55b873bc 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.6.8";
+  version = "1.6.10";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "1d2q99xa7dhdpqkipapzi1r1mvynf70s7sgdczd59kn0d8sr3map";
+    sha256 = "0hrbycy5lapdkaa2xm90j45sgsiqdnlk9wry41kxxpdln9msabxs";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From cedffe1677faeea9a2f78ac6841275032425c2b9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 04:57:54 -0800
Subject: [PATCH 032/203] fping: 3.16 -> 4.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.0 with grep in /nix/store/mcwq9l7zxi30ksdmlfj5vlcw98dv08ny-fping-4.0
- found 4.0 in filename of file in /nix/store/mcwq9l7zxi30ksdmlfj5vlcw98dv08ny-fping-4.0
---
 pkgs/tools/networking/fping/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 8cdda4e35e3..b76b32ec4c8 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-3.16";
+  name = "fping-4.0";
 
   src = fetchurl {
     url = "http://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54";
+    sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7";
   };
 
   configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];

From 561a90f6f3b719f413133a918e26db0f7020d85b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 05:21:39 -0800
Subject: [PATCH 033/203] freeswitch: 1.6.15 -> 1.6.19

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/freeswitch -h` got 0 exit code
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -h` got 0 exit code
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli --help` got 0 exit code
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -V` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -v` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli --version` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli -h` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fs_cli --help` and found version 1.6.19
- ran `/nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19/bin/fsxs --help` got 0 exit code
- found 1.6.19 with grep in /nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19
- found 1.6.19 in filename of file in /nix/store/jpf73ild0rhyvsgngigp3ksb94nmf6pk-freeswitch-1.6.19
---
 pkgs/servers/sip/freeswitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 9a1ea5b5580..559af3bdbef 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -3,11 +3,11 @@
 , ldns, libedit, yasm, which, lua, libopus, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.6.15";
+  name = "freeswitch-1.6.19";
 
   src = fetchurl {
     url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
-    sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld";
+    sha256 = "019n16yyzk9yp6h7iwsg30h62zj5vqvigr5cl8pjik4106xzcjyr";
   };
   postPatch = ''
     patchShebangs     libs/libvpx/build/make/rtcd.pl

From f8dd6d60571c2d5dc81da8e458dc133ac421e815 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 13:21:18 -0800
Subject: [PATCH 034/203] google-play-music-desktop-player: 4.4.1 -> 4.5.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.5.0 with grep in /nix/store/9xvi5jsdbiphz2w704njd975xkv31y8g-google-play-music-desktop-player-4.5.0
- found 4.5.0 in filename of file in /nix/store/9xvi5jsdbiphz2w704njd975xkv31y8g-google-play-music-desktop-player-4.5.0
---
 .../audio/google-play-music-desktop-player/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 83df4b33940..6c7d6dba455 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "4.4.1";
+  version = "4.5.0";
 
   deps = [
     alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
-    sha256 = "0jqgawgij6jxf3zy3glviqj6s34mq7d756syg2c7kk1gkqkwgdpw";
+    sha256 = "06h9g1yhd5q7gg8v55q143fr65frxg0khfgckr03gsaw0swin51q";
   };
 
   dontBuild = true;

From e979e9cc65ae6eec96ff696f9ebaff00185aaadd Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 17:07:39 -0800
Subject: [PATCH 035/203] gtkdatabox: 0.9.2.0 -> 0.9.3.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.3.0 with grep in /nix/store/3axd91hc3vi45w0j8yw0qfgwip4cx9da-gtkdatabox-0.9.3.0
- found 0.9.3.0 in filename of file in /nix/store/3axd91hc3vi45w0j8yw0qfgwip4cx9da-gtkdatabox-0.9.3.0
---
 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 de5fd8343e3..d074f51d3ca 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.2.0";
+  name = "gtkdatabox-0.9.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
-    sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl";
+    sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7844ae2366646b38973e89f2e3dab008e887257d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 17:24:39 -0800
Subject: [PATCH 036/203] gtkwave: 3.3.86 -> 3.3.87

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/evcd2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fst2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2fst help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/fstminer --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2miner --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/lxt2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/shmidcat -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/shmidcat --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2lxt2 help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vcd2vzt help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vzt2vcd --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vztminer --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -V` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -v` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave --version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave version` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave -h` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave --help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/gtkwave help` and found version 3.3.87
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin -h` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin --help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin help` got 0 exit code
- ran `/nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87/bin/vermin -h` and found version 3.3.87
- found 3.3.87 with grep in /nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87
- found 3.3.87 in filename of file in /nix/store/4zxs7f77kc86xgy6k86cb8471l2kndax-gtkwave-3.3.87
---
 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 e866b947fbc..4da7f0f608f 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.86";
+  version = "3.3.87";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1l1hikhhk7drkbpdmj9qg7c3lj1b86z7f5rnwagrql8bss2j80fx";
+    sha256 = "0yjvxvqdl276wv0y55bqxwna6lwc99hy6dkfiy6bij3nd1qm5rf6";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 12d19f1fcd19d9224ff6648386b3751843a2e325 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 18:33:13 -0800
Subject: [PATCH 037/203] hivex: 1.3.14 -> 1.3.15

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.15 with grep in /nix/store/i73ksxx7rd6dfwiasx7xacm4pvskprpv-hivex-1.3.15
- found 1.3.15 in filename of file in /nix/store/i73ksxx7rd6dfwiasx7xacm4pvskprpv-hivex-1.3.15
---
 pkgs/development/libraries/hivex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index 7b4b9866d04..b2e2dbd35a4 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "hivex-${version}";
-  version = "1.3.14";
+  version = "1.3.15";
 
   src = fetchurl {
     url = "http://libguestfs.org/download/hivex/${name}.tar.gz";
-    sha256 = "0aqv28prjcmc66znw0wgaxjijg5mjm44bgn1iil8a4dlbsgv4p7b";
+    sha256 = "02vzipzrp1gr87rn7mkhyzr4zdjkp2dzcvvb223x7i0ch8ci7r4c";
   };
 
   patches = [ ./hivex-syms.patch ];

From 94f2cd8c450f59e726b1eae9ab44caf60b894b6d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 19:06:27 -0800
Subject: [PATCH 038/203] icoutils: 0.31.3 -> 0.32.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -V` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -v` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript help` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --help` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --help` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -V` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -v` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped --version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped version` and found version 0.32.2
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped help` and found version 0.32.2
- found 0.32.2 with grep in /nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2
- found 0.32.2 in filename of file in /nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2
---
 pkgs/tools/graphics/icoutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 720af4622c7..0941b3eabf9 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "icoutils-0.31.3";
+  name = "icoutils-0.32.2";
 
   src = fetchurl {
     url = "mirror://savannah/icoutils/${name}.tar.bz2";
-    sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152";
+    sha256 = "1g8ihxw24gbiy189h36w16lbyfq7fn260qkbc85n9jqrvkxsz4p8";
   };
 
   buildInputs = [ makeWrapper libpng perl ];

From 5b98a269c6d14c1f52747cbcc560944eaedb883b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 20:22:29 -0800
Subject: [PATCH 039/203] jackett: 0.8.151 -> 0.8.716

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/j1arij5hyi6b28sg3hf08k4s81nz26bz-jackett-0.8.716/bin/Jackett -v` and found version 0.8.716
- found 0.8.716 with grep in /nix/store/j1arij5hyi6b28sg3hf08k4s81nz26bz-jackett-0.8.716
- found 0.8.716 in filename of file in /nix/store/j1arij5hyi6b28sg3hf08k4s81nz26bz-jackett-0.8.716
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 594bc8caf5b..fc43e949269 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.151";
+  version = "0.8.716";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "2df2b296b5b314ed035e8d370bf5708a8b5a23957353e2e1e0007ec08a2138a0";
+    sha256 = "0i770f4h06jf76977y3cp9l5n5csnb9wzpskndc7mgk0h02m7nrc";
   };
 
   buildInputs = [ makeWrapper ];

From 13e96c16e4ee745c6dacc21296f9e5be3a1367e2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 00:16:57 -0800
Subject: [PATCH 040/203] matio: 1.5.10 -> 1.5.11

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump --help` got 0 exit code
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump help` got 0 exit code
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump -V` and found version 1.5.11
- ran `/nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11/bin/matdump --version` and found version 1.5.11
- found 1.5.11 with grep in /nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11
- found 1.5.11 in filename of file in /nix/store/252hdlnl6q9xajw71ydmpgi5nnybdc0n-matio-1.5.11
---
 pkgs/development/libraries/matio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 83ddcbf52e1..9fcc9c70a9b 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "matio-1.5.10";
+  name = "matio-1.5.11";
   src = fetchurl {
     url = "mirror://sourceforge/matio/${name}.tar.gz";
-    sha256 = "00dmg2f5k2xgakp7l0lganz122b1agazw5d899xci35xrqc9j821";
+    sha256 = "02ygr7bslzvn6mhxvapz57bh4d448xjf3ds82g1cvhn9al6fvk0c";
   };
 
   meta = with stdenv.lib; {

From a28a2e382970fb94a4e07b09946aafe799b5f391 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 01:01:28 -0800
Subject: [PATCH 041/203] mosquitto: 1.4.14 -> 1.4.15

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.15 with grep in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15
- found 1.4.15 in filename of file in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15
---
 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 c157064fcb2..bce69370d2b 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "1.4.14";
+  version = "1.4.15";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz";
-    sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
+    sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx";
   };
 
   buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]

From 9e3690e87ca2eb39f0fb8960a08d27583192aae3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 02:55:13 -0800
Subject: [PATCH 042/203] ngspice: 26 -> 27

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 27 with grep in /nix/store/73sh9hf5c9fjgh962pd1ac16kr8dvzxg-ngspice-27
- found 27 in filename of file in /nix/store/73sh9hf5c9fjgh962pd1ac16kr8dvzxg-ngspice-27
---
 pkgs/applications/science/electronics/ngspice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index ee7c0a5844d..114a2eea85f 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}:
 
 stdenv.mkDerivation {
-  name = "ngspice-26";
+  name = "ngspice-27";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
-    sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+    url = "mirror://sourceforge/ngspice/ngspice-27.tar.gz";
+    sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
   };
 
   buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];

From 905e6f357ce4d1de10cd9b375673fa793983fbff Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 03:59:23 -0800
Subject: [PATCH 043/203] obs-studio: 21.0.2 -> 21.0.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/obs -h` got 0 exit code
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/obs --help` got 0 exit code
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/.obs-wrapped -h` got 0 exit code
- ran `/nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3/bin/.obs-wrapped --help` got 0 exit code
- found 21.0.3 with grep in /nix/store/f600v8k119a2l3hscik6xsbsvz3w4jx8-obs-studio-21.0.3
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 1c7a72d95ae..a3ed28c3fd0 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -29,13 +29,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "21.0.2";
+  version = "21.0.3";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "1yyvxqzxy9dz6rmjcrdn90nfaff4f38mfz2gsq535cr59sg3f8jc";
+    sha256 = "1mrihhzlsc66w5lr1lcm8c8jg6z0iwmmckr3pk3gk92z4s55969q";
   };
 
   patches = [ ./find-xcb.patch ];

From 724667fa3f4262e9385c661191493ff84921a25d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 05:10:28 -0800
Subject: [PATCH 044/203] openlibm: 0.5.4 -> 0.5.5

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.5.5 with grep in /nix/store/im5hsldagl6la2yf5s8rsnv2w57mb76m-openlibm-0.5.5
- found 0.5.5 in filename of file in /nix/store/im5hsldagl6la2yf5s8rsnv2w57mb76m-openlibm-0.5.5
---
 pkgs/development/libraries/science/math/openlibm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 6b229f31f16..195b90c86e1 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "openlibm-${version}";
-  version = "0.5.4";
+  version = "0.5.5";
   src = fetchurl {
     url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
-    sha256 = "0cwqqqlblj3kzp9aq1wnpfs1fl0qd1wp1xzm5shb09w06i4rh9nn";
+    sha256 = "1z8cj5q8ca8kmrakwkpjxf8svi81waw0c568cx8v8pv9kvswbp07";
   };
 
   makeFlags = [ "prefix=$(out)" ];

From c1d8663ad561939d1b04464cc9030c2cccd8bd29 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 05:58:14 -0800
Subject: [PATCH 045/203] os-prober: 1.73 -> 1.76

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.linux-boot-prober-wrapped -h` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.linux-boot-prober-wrapped --help` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.linux-boot-prober-wrapped help` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.os-prober-wrapped -h` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.os-prober-wrapped --help` got 0 exit code
- ran `/nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76/bin/.os-prober-wrapped help` got 0 exit code
- found 1.76 with grep in /nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76
- found 1.76 in filename of file in /nix/store/y8qy7xrvq4ji5hg5k5gv8v5f08m4ps1g-os-prober-1.76
---
 pkgs/tools/misc/os-prober/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index 87659802e50..b879f621e14 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -11,11 +11,11 @@ ntfs3g ? null
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.73";
+  version = "1.76";
   name = "os-prober-${version}";
   src = fetchurl {
     url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
-    sha256 = "1prssbwdgj5c33zhl3ldgaxk7lab9qvs4zhyrhag88wiivirb0sq";
+    sha256 = "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk";
   };
 
   buildInputs = [ makeWrapper ];

From 49272f60dd63950611b445106be15259ac11ae20 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 07:22:27 -0800
Subject: [PATCH 046/203] paml: 4.9c -> 4.9g

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.9g in filename of file in /nix/store/70p59yxnlzhbj8ig1ax8lrrsdbcf37zp-paml-4.9g
---
 pkgs/applications/science/biology/paml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index 589c2809a93..bfadf9e704a 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  version = "4.9c";
+  version = "4.9g";
   name = "paml-${version}";
   src = fetchurl {
     url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
-    sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j";
+    sha256 = "1kxkl47azkrsmdxiymnc76c2ccc514vlfnjvvm7lwch5l43j029h";
   };
 
   preBuild = ''

From b6cba53df339e8a56b677fd0a1972356fc78b43a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 12:42:42 -0800
Subject: [PATCH 047/203] softhsm: 2.3.0 -> 2.4.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --version` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --version` and found version 2.4.0
- found 2.4.0 with grep in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
- found 2.4.0 in filename of file in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
---
 pkgs/tools/security/softhsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index ff3871bfbd9..4a4b790181d 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "softhsm-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "https://dist.opendnssec.org/source/${name}.tar.gz";
-    sha256 = "09y1ladg7j0j5n780b1hdzwd2g2b5j5c54pfs7bzjviskb409mjy";
+    sha256 = "01ysfmq0pzr3g9laq40xwq8vg8w135d4m8n05mr1bkdavqmw3ai6";
   };
 
   configureFlags = [

From 1b103a1e242924daaf790bd4341a6420fa304400 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 12:59:04 -0800
Subject: [PATCH 048/203] sonarr: 2.0.0.5085 -> 2.0.0.5153

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.0.5153 with grep in /nix/store/w0qkw2a73gnidkkr5ggvy1bm15w7fhn6-sonarr-2.0.0.5153
- found 2.0.0.5153 in filename of file in /nix/store/w0qkw2a73gnidkkr5ggvy1bm15w7fhn6-sonarr-2.0.0.5153
---
 pkgs/servers/sonarr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 635fd96b06f..04e6e97c54e 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.5085";
+  version = "2.0.0.5153";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "1m6gdgsxk1d50kf4wnq6zyhbyf6rc0ma86l8m65am08xb0pihldz";
+    sha256 = "1zdsba5bpi87dhsa62qbpj55wbakl6w380pijs8qxn80bvapv3xy";
   };
 
   buildInputs = [

From 8643a32c8c7ad4d5c8a809a906ea5e6b7a56d976 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 13:50:56 -0800
Subject: [PATCH 049/203] syncplay: 1.5.0 -> 1.5.2

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped --help` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped -v` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-wrapped --version` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay --help` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay -v` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay --version` and found version 1.5.2
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-server-wrapped -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/.syncplay-server-wrapped --help` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay-server -h` got 0 exit code
- ran `/nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2/bin/syncplay-server --help` got 0 exit code
- found 1.5.2 with grep in /nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2
- found 1.5.2 in filename of file in /nix/store/s02mpddajsz1q5h5r8mvmyd31np2ha26-syncplay-1.5.2
---
 pkgs/applications/networking/syncplay/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 80ad1a43332..e41671f2360 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -2,13 +2,13 @@
 
 python2Packages.buildPythonApplication rec {
   name = "syncplay-${version}";
-  version = "1.5.0";
+  version = "1.5.2";
 
   format = "other";
 
   src = fetchurl {
-    url = https://github.com/Syncplay/syncplay/archive/v1.5.0.tar.gz;
-    sha256 = "762e6318588e14aa02b1340baa18510e7de87771c62ca5b44d985b6d1289964d";
+    url = https://github.com/Syncplay/syncplay/archive/v1.5.2.tar.gz;
+    sha256 = "0a7lqq3y53ag5hzkkjpz61gfmglf3w1kpvyynhq2514fn9rnwsla";
   };
 
   propagatedBuildInputs = with python2Packages; [ pyside twisted ];

From 28e31f1c07fc24356ad1e4c444138b736b2a9991 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 14:23:54 -0800
Subject: [PATCH 050/203] teyjus: 2.0b2 -> 2.1

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjcc --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjdepend --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjdis --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjlink --help` got 0 exit code
- ran `/nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1/bin/tjsim --help` got 0 exit code
- found 2.1 with grep in /nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1
- found 2.1 in filename of file in /nix/store/s3a893figs9wwy07swfzxbf2ai7g6f1d-teyjus-2.1
---
 pkgs/development/compilers/teyjus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix
index 222a22bf1cd..53ab4ec0e85 100644
--- a/pkgs/development/compilers/teyjus/default.nix
+++ b/pkgs/development/compilers/teyjus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, omake, ocaml, flex, bison }:
 
 stdenv.mkDerivation {
-  name = "teyjus-2.0b2";
+  name = "teyjus-2.1";
 
   src = fetchurl {
     url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/teyjus/teyjus-source-2.0-b2.tar.gz";
-    sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052";
+    sha256 = "0llhm5nrfyj7ihz2qq1q9ijrh6y4f8vl39mpfkkad5bh1m3gp2gm";
   };
 
   patches = [ ./fix-lex-to-flex.patch ];

From 6baeaa0e1bdd2f98340668348d5a89a3c668636c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 14:39:48 -0800
Subject: [PATCH 051/203] tini: 0.16.1 -> 0.17.0

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0/bin/tini -h` got 0 exit code
- ran `/nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0/bin/tini --version` and found version 0.17.0
- ran `/nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0/bin/tini -h` and found version 0.17.0
- found 0.17.0 with grep in /nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0
- found 0.17.0 in filename of file in /nix/store/p41wb0fqnvn4bx6jjs7hs98xlrzp8s79-tini-0.17.0
---
 pkgs/applications/virtualization/tini/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index 0d4aa4783c6..c027541c01c 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, glibc }:
 
 stdenv.mkDerivation rec {
-  version = "0.16.1";
+  version = "0.17.0";
   name = "tini-${version}";
 
   src = fetchFromGitHub {
     owner = "krallin";
     repo = "tini";
     rev = "v${version}";
-    sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp";
+    sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0";
   };
 
   patchPhase = "sed -i /tini-static/d CMakeLists.txt";

From 99fbca02ff7a349a645c3a01da9424c3c0e3e144 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 15:20:31 -0800
Subject: [PATCH 052/203] umockdev: 0.11 -> 0.11.1

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

- built on NixOS
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-run -h` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-run --help` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-run --version` and found version 0.11.1
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-record -h` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-record --help` got 0 exit code
- ran `/nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1/bin/umockdev-record --version` and found version 0.11.1
- found 0.11.1 with grep in /nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1
- found 0.11.1 in filename of file in /nix/store/cm17lsw2d83wwlh6hd7slh9amjlqrv7a-umockdev-0.11.1
---
 pkgs/development/libraries/umockdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index a0936310c42..e3ad65a86dd 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "umockdev-${version}";
-  version = "0.11";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = "umockdev";
     rev = version;
-    sha256 ="1gpk2f03nad4qv084hx7549d68cqc1xibxm0ncanafm5xjz1hp55";
+    sha256 ="0cmswac8m7zfvk6cb8k5iisqr7arnn1yhcmasri072yz0pmr6dr0";
   };
 
   buildInputs = [ glib systemd libgudev ];

From b7cb6fac4aa02bdebf7f18a9962725cef141591d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 15:52:32 -0800
Subject: [PATCH 053/203] valum: 0.3.14 -> 0.3.15

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.3.15 with grep in /nix/store/7w47g1l0qg7bzc1rrmllxxinjyg7zg5c-valum-0.3.15
- found 0.3.15 in filename of file in /nix/store/7w47g1l0qg7bzc1rrmllxxinjyg7zg5c-valum-0.3.15
---
 pkgs/development/web/valum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix
index 90f2a8dcfed..266217d94e2 100644
--- a/pkgs/development/web/valum/default.nix
+++ b/pkgs/development/web/valum/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "valum-${version}";
-  version = "0.3.14";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "valum-framework";
     repo = "valum";
     rev = "v${version}";
-    sha256 = "1w1mipczcfmrrxg369wvrj3wvf76rqn8rrkxbq88aial1bi23kd3";
+    sha256 = "1wk23aq5lxsqns58s4g9jrwx6wrk7k9hq9rg8jcs42rxn2pckaxw";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];

From def8f8757cc38f79ec457d9db49d4c2eb3d736ca Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 17:09:50 -0800
Subject: [PATCH 054/203] w_scan: 20161022 -> 20170107

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

- built on NixOS
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan -h` got 0 exit code
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan --help` got 0 exit code
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan -V` and found version 20170107
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan -h` and found version 20170107
- ran `/nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107/bin/w_scan --help` and found version 20170107
- found 20170107 in filename of file in /nix/store/w28jzw0lnbqy9sdpm78lf4n282x05f74-w_scan-20170107
---
 pkgs/applications/video/w_scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix
index 59ba63b32ee..2bf74da3d0f 100644
--- a/pkgs/applications/video/w_scan/default.nix
+++ b/pkgs/applications/video/w_scan/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "w_scan-${version}";
-  version = "20161022";
+  version = "20170107";
 
   src = fetchurl {
     url = "http://wirbel.htpc-forum.de/w_scan/${name}.tar.bz2";
-    sha256 = "0y8dq2sm13xn2r2lrqf5pdhr9xcnbxbg1aw3iq1szds2idzsyxr0";
+    sha256 = "1zkgnj2sfvckix360wwk1v5s43g69snm45m0drnzyv7hgf5g7q1q";
   };
 
   meta = {

From 133310eeec79a25f79edcf0dbf6b36a1ba4bdc4e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 17:25:57 -0800
Subject: [PATCH 055/203] wcslib: 5.15 -> 5.18

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.18 with grep in /nix/store/pr88acrgc8w11q3p8407w7v0kwd2asq8-wcslib-5.18
- found 5.18 in filename of file in /nix/store/pr88acrgc8w11q3p8407w7v0kwd2asq8-wcslib-5.18
---
 pkgs/development/libraries/wcslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 64c5293fac7..5dd79980680 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "5.15";
+  version = "5.18";
   name = "wcslib-${version}";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
-    sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb";
+    sha256 ="16jh568k99c9p0y3qzcgps2rii933x9wlay7q1xm0lr59zqzp4xn";
   };
 
   prePatch = ''

From f8922862b742760dbbce1e664a3e117a2d6419ac Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 17:43:42 -0800
Subject: [PATCH 056/203] winswitch: 0.12.16 -> 0.12.23

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

- built on NixOS
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.wcw-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_applet-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_applet-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_applet-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_away-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_back-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_client-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_client-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_command_wrapper-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_server-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_server-wrapped --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_server-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_Xnest-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_Xnest-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_Xnest-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_session-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_session-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_ssh_session-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_socket-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -V` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -v` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/.winswitch_stdio_tcp-wrapped help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/wcw --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_applet -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_applet --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_applet help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_away --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_back --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_client -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_client --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_command_wrapper --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_server --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_server --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_server --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_Xnest -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_Xnest --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_Xnest help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_session -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_session --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_ssh_session help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_socket --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -h` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp --help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp help` got 0 exit code
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -V` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -v` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp --version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp version` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp -h` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp --help` and found version 0.12.23
- ran `/nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23/bin/winswitch_stdio_tcp help` and found version 0.12.23
- found 0.12.23 with grep in /nix/store/71f89z56xhgvh29an8nc7d5jl283968l-winswitch-0.12.23
---
 pkgs/tools/X11/winswitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index 90159d82c39..cd9d6aecdef 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -5,11 +5,11 @@ let
   base = pythonPackages.buildPythonApplication rec {
     name = "winswitch-${version}";
     namePrefix = "";
-    version = "0.12.16";
+    version = "0.12.23";
 
     src = fetchurl {
       url = "http://winswitch.org/src/${name}.src.tar.bz2";
-      sha256 = "0ix122d7rgzdkk70f2q3sd7a4pvyaqsyxkw93pc4zkcg1xh9z3y8";
+      sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9";
     };
 
     propagatedBuildInputs = with pythonPackages; [

From da6aefba6a6d70b4ae415cb6c957c5130caf4e82 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 18:02:00 -0800
Subject: [PATCH 057/203] wxSVG: 1.5.11 -> 1.5.13

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.5.13 with grep in /nix/store/hcf1ibw1hvrwic1zagy3cvi1fc73rfgk-wxSVG-1.5.13
- found 1.5.13 in filename of file in /nix/store/hcf1ibw1hvrwic1zagy3cvi1fc73rfgk-wxSVG-1.5.13
---
 pkgs/development/libraries/wxSVG/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index b991590924d..82b72a0fc7b 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
 
   name = "wxSVG-${version}";
   srcName = "wxsvg-${version}";
-  version = "1.5.11";
+  version = "1.5.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
-    sha256 = "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x";
+    sha256 = "029a1rayp4c480x8ayng13rcjk1j98ar0z6ggijrznkn8kgx8j2j";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2cb01fb4ea5e6ccdc09bd048eecc73a5595ac3e3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 19:19:22 -0800
Subject: [PATCH 058/203] xvkbd: 3.8 -> 3.9

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.9 with grep in /nix/store/254qz2nmlqkyzn1hv598i5y9spx50wji-xvkbd-3.9
- found 3.9 in filename of file in /nix/store/254qz2nmlqkyzn1hv598i5y9spx50wji-xvkbd-3.9
---
 pkgs/tools/X11/xvkbd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 399531f71eb..7221555ed33 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "xvkbd-${version}";
-  version = "3.8";
+  version = "3.9";
   src = fetchurl {
-    url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz";
-    sha256 = "16r5wbb5za02ha0ilwswx37lrwa6j40px8c9gkpnmmpb5r7kv91c";
+    url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz";
+    sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q";
   };
 
   buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];

From ef4790cfd4c9ff937612ff631f622674dc59919d Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sun, 11 Mar 2018 15:16:24 +0100
Subject: [PATCH 059/203] notary: 0.5.1 -> 0.6.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/tools/security/notary/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 36685b1d1e4..4a42c9162e1 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -2,22 +2,22 @@
 
 buildGoPackage rec {
   name = "notary-${version}";
-  version = "0.5.1";
-  gitcommit = "9211198";
+  version = "0.6.0";
+  gitcommit = "34f53ad";
 
   src = fetchFromGitHub {
     owner = "theupdateframework";
     repo = "notary";
     rev = "v${version}";
-    sha256 = "0z9nsb1mrl0q5j02jkyzbc6xqsm83qzacsckypsxcrijhw935rs5";
+    sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a";
   };
 
   buildInputs = [ libtool ];
 
-  goPackagePath = "github.com/docker/notary";
+  goPackagePath = "github.com/theupdateframework/notary";
 
   buildPhase = ''
-    cd go/src/github.com/docker/notary
+    cd go/src/github.com/theupdateframework/notary
     make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client
   '';
 

From b619881ae055297c5cc966006e7ea64f20ffc6a5 Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 11 Mar 2018 01:01:25 -0500
Subject: [PATCH 060/203] nextcloud-client: restrict platform to linux

Some dependencies fail to build on darwin.
---
 pkgs/applications/networking/nextcloud-client/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index f61b887cd87..6ed5e63cd0f 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = https://nextcloud.com;
     license = licenses.gpl2;
     maintainers = with maintainers; [ caugner ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 5c1e42276d0620736a45e70632580c1fd7c37894 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Mon, 12 Mar 2018 15:13:31 +1100
Subject: [PATCH 061/203] singularity: 2.4 -> 2.4.2

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/singularity.nix        | 20 +++++++++++++++++++
 .../virtualization/singularity/default.nix    |  7 +++++--
 .../singularity-tools/default.nix             |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/programs/singularity.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7f28c670be..74ed92de0c0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -104,6 +104,7 @@
   ./programs/shadow.nix
   ./programs/shell.nix
   ./programs/spacefm.nix
+  ./programs/singularity.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./programs/sysdig.nix
diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix
new file mode 100644
index 00000000000..86153d93385
--- /dev/null
+++ b/nixos/modules/programs/singularity.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.programs.singularity;
+in {
+  options.programs.singularity = {
+    enable = mkEnableOption "Singularity";
+  };
+
+  config = mkIf cfg.enable {
+      environment.systemPackages = [ pkgs.singularity ];
+      systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -"
+                                 "d /var/singularity/mnt/final 0770 root root -"
+                                 "d /var/singularity/mnt/overlay 0770 root root -"
+                                 "d /var/singularity/mnt/container 0770 root root -"
+                                 "d /var/singularity/mnt/source 0770 root root -"];
+  };
+
+}
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 236cb8f31e6..66280543895 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   name = "singularity-${version}";
-  version = "2.4";
+  version = "2.4.2";
 
   enableParallelBuilding = true;
 
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  configureFlags = "--localstatedir=/var";
+  installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy";
+
   fixupPhase = ''
     patchShebangs $out
     for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do
@@ -42,7 +45,7 @@ stdenv.mkDerivation rec {
     owner = "singularityware";
     repo = "singularity";
     rev = version;
-    sha256 = "1hi1ag1lb2x4djbz4x34wix83ymx0g9mzn2md6yrpiflc1d85rjz";
+    sha256 = "0cpa2yp82g9j64mgr90p75ddk85kbj1qi1r6hy0sz17grqdlaxl4";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 62cf13e5202..60271e592a2 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -96,6 +96,7 @@ rec {
             echo creating
             singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
             echo importing
+            mkdir -p /var/singularity/mnt/container
             tar -c . | singularity image.import $out
           '');
 

From 833851cd6e00221c69d166f752ee7b300dd57455 Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Mon, 12 Mar 2018 02:04:28 -0400
Subject: [PATCH 062/203] qtlocation: fix darwin build

A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.
---
 pkgs/development/libraries/qt-5/modules/qtlocation.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index 008583ebaf9..e8952e29cba 100644
--- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
@@ -1,4 +1,4 @@
-{ qtModule, qtbase, qtmultimedia }:
+{ stdenv, qtModule, qtbase, qtmultimedia }:
 
 qtModule {
   name = "qtlocation";
@@ -6,4 +6,11 @@ qtModule {
   outputs = [ "bin" "out" "dev" ];
   # Linking with -lclipper fails with parallel build enabled
   enableParallelBuilding = false;
+  qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
+     # boost uses std::auto_ptr which has been disabled in clang with libcxx
+     # This flag re-enables this feature
+     # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros
+     "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
+  ];
+
 }

From 9c7e9ef023e7747c79b40dab52b676e927820084 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 13 Mar 2018 19:43:16 +0100
Subject: [PATCH 063/203] faust: 2.5.21 -> 2.5.23

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

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 877bd26a5c1..f0564f37d6b 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -16,13 +16,13 @@ with stdenv.lib.strings;
 
 let
 
-  version = "2.5.21";
+  version = "2.5.23";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
     rev = "${version}";
-    sha256 = "1kfrcfhpzkpjxsrvgwmc2valgwfb4b7gfwwnlnjq6f6dp56yflpz";
+    sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
     fetchSubmodules = true;
   };
 

From 4f225f96d5a379e9955652e8867541ad04c297f6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 10 Mar 2018 00:08:27 +0100
Subject: [PATCH 064/203] xautolock: implement basic test to confirm
 functionality

---
 nixos/release.nix         |  1 +
 nixos/tests/xautolock.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 nixos/tests/xautolock.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index a1310a409a1..6a3fcea1768 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -368,6 +368,7 @@ in rec {
   tests.vault = callTest tests/vault.nix {};
   tests.virtualbox = callSubTestsOnTheseSystems ["x86_64-linux"] tests/virtualbox.nix {};
   tests.wordpress = callTest tests/wordpress.nix {};
+  tests.xautolock = callTest tests/xautolock.nix {};
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
   tests.xrdp = callTest tests/xrdp.nix {};
diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix
new file mode 100644
index 00000000000..ee46d9e05b0
--- /dev/null
+++ b/nixos/tests/xautolock.nix
@@ -0,0 +1,24 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+{
+  name = "xautolock";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+
+  nodes.machine = {
+    imports = [ ./common/x11.nix ./common/user-account.nix ];
+
+    services.xserver.displayManager.auto.user = "bob";
+    services.xserver.xautolock.enable = true;
+    services.xserver.xautolock.time = 1;
+  };
+
+  testScript = ''
+    $machine->start;
+    $machine->waitForX;
+    $machine->mustFail("pgrep xlock");
+    $machine->sleep(120);
+    $machine->mustSucceed("pgrep xlock");
+  '';
+})

From 2b114a8c29071b8adc44d5d5c63abbf503bc4cc8 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 13 Mar 2018 20:13:31 +0000
Subject: [PATCH 065/203] Fix qca-qt5 build on darwin

---
 .../development/libraries/qca-qt5/default.nix |  6 +++++-
 .../libraries/qca-qt5/move-project.patch      | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/qca-qt5/move-project.patch

diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index ee27d89f563..db40a40d02d 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl qtbase ];
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  # Without this patch cmake fails with a "No known features for CXX compiler"
+  # error
+  patches = [./move-project.patch];
+
   # tells CMake to use this CA bundle file if it is accessible
   preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
 
@@ -22,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = http://delta.affinix.com/qca;
     maintainers = with maintainers; [ ttuegel ];
     license = licenses.lgpl21Plus;
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch
new file mode 100644
index 00000000000..2a109a3aa3c
--- /dev/null
+++ b/pkgs/development/libraries/qca-qt5/move-project.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 453fd8a..5f6ee11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX)
+   unset(CMAKE_INSTALL_PREFIX CACHE)
+ endif(NOT CMAKE_INSTALL_PREFIX)
+
+-project(qca)
+
+ if(NOT APPLE)
+   cmake_minimum_required(VERSION 2.8.12)
+ else()
+   cmake_minimum_required(VERSION 3.0)
+ endif()
++project(qca)
+
+ set(QCA_LIB_MAJOR_VERSION "2")
+ set(QCA_LIB_MINOR_VERSION "1")

From 273fd896bc5eb560ad4dc102cde6a1a5ce9e5c8d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Feb 2018 09:21:56 -0600
Subject: [PATCH 066/203] virtualbox: 5.2.6 -> 5.2.8

Tested against all the VirtualBox VM tests.

Signed-off-by: aszlig <aszlig@nix.build>
Closes: #36127
---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 011a4e34e74..29cb7c192b5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -21,10 +21,10 @@ let
   buildType = "release";
   # Manually sha256sum the extensionPack file, must be hex!
   # Do not forget to update the hash in ./guest-additions/default.nix!
-  extpack = "70584a70b666e9332ae2c6be0e64da4b8e3a27124801156577f205750bdde4f5";
-  extpackRev = "120293";
-  main = "1rx45ivwk89ghjc5zdd7c7j92w0w3930xj7l1zhwrvshxs454w7y";
-  version = "5.2.6";
+  extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26";
+  extpackRev = "121009";
+  main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8";
+  version = "5.2.8";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f82eec07a29..96e8404b3ef 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1px9jp6lv7ff7kn4ns5r4dq7xl4wiz3h4ckgdhgvxs040njpdzy5";
+    sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

From 4436d21dfa444ff65a9079def7b601580a919864 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 13 Mar 2018 22:20:59 +0100
Subject: [PATCH 067/203] libdynd: fix build w/gcc7

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

diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix
index 8deec094866..93ece69cf05 100644
--- a/pkgs/development/libraries/libdynd/default.nix
+++ b/pkgs/development/libraries/libdynd/default.nix
@@ -15,6 +15,12 @@ stdenv.mkDerivation {
     "-DDYND_BUILD_BENCHMARKS=OFF"
   ];
 
+  # added to fix build with gcc7
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=implicit-fallthrough"
+    "-Wno-error=nonnull"
+  ];
+
   buildInputs = [ cmake ];
 
   outputs = [ "out" "dev" ];
@@ -24,5 +30,6 @@ stdenv.mkDerivation {
     description = "C++ dynamic ndarray library, with Python exposure.";
     homepage = http://libdynd.org;
     license = licenses.bsd2;
+    platforms = platforms.linux;
   };
 }

From 591fd5ee9b4c1a5f1847b090eed83b13e784ff63 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 13 Mar 2018 22:40:07 +0100
Subject: [PATCH 068/203] libsemanage: fix build w/gcc7

---
 pkgs/os-specific/linux/libsemanage/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index c60d96bba78..587349e4067 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -13,7 +13,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+  NIX_CFLAGS_COMPILE = [
+    "-fstack-protector-all"
+    "-std=gnu89"
+    # these were added to fix build with gcc7. review on update
+    "-Wno-error=format-truncation"
+    "-Wno-error=implicit-fallthrough"
+  ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")

From 490079cf373d3f671f994c3132f036a8ed68b316 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 13 Mar 2018 22:15:48 +0000
Subject: [PATCH 069/203] libgksu: fix build

no longer builds after gtk-doc bump in https://github.com/NixOS/nixpkgs/commit/eb0368554661385ae470e245e50bd0bc10693bf0

https://hydra.nixos.org/build/70843465/nixlog/1
---
 pkgs/development/libraries/libgksu/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 8961afcd620..652848d8a95 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
   libstartup_notification, libgtop, perl, perlXMLParser,
-  autoreconfHook, intltool, gtk-doc, docbook_xsl, xauth, sudo
+  autoreconfHook, intltool, docbook_xsl, xauth, sudo
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig autoreconfHook intltool gtk-doc docbook_xsl wrapGAppsHook
+    pkgconfig autoreconfHook intltool docbook_xsl wrapGAppsHook
   ];
 
   buildInputs = [
@@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
     intltoolize --force --copy --automake
   '';
 
+  configureFlags = [
+    "--disable-gtk-doc"
+  ];
+
   meta = {
     description = "A library for integration of su into applications";
     longDescription = ''

From a4fd4e3af05802c9f1e17347bccef5d33e0c3cd8 Mon Sep 17 00:00:00 2001
From: DarkScythe97 <darknx97@gmail.com>
Date: Wed, 14 Mar 2018 12:09:07 +1030
Subject: [PATCH 070/203] microcode-intel: 20171117 -> 20180312

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

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 97843b2253f..857a3b580a8 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "microcode-intel-${version}";
-  version = "20171117";
+  version = "20180312";
 
   src = fetchurl {
-    url = "https://downloadmirror.intel.com/27337/eng/microcode-${version}.tgz";
-    sha256 = "1p14ypbg28bdkbza6dx6dpjrdr5p13vmgrh2cw0y1v2qzalivgck";
+    url = "https://downloadmirror.intel.com/27591/eng/microcode-${version}.tgz";
+    sha256 = "0yg7q5blcqgq8jyjxhn9n48rxws77ylqzyn4kn10l6yzwan1yf0b";
   };
 
   buildInputs = [ libarchive ];

From a73c91c99c0217f99ba8636e79fb907364f26b15 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 01:42:16 -0700
Subject: [PATCH 071/203] chunksync: 0.3 -> 0.4

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

- built on NixOS
- ran `/nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4/bin/chunksync -h` got 0 exit code
- ran `/nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4/bin/chunksync -V` and found version 0.4
- ran `/nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4/bin/chunksync -h` and found version 0.4
- found 0.4 with grep in /nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4
- found 0.4 in filename of file in /nix/store/bgpzi08y1w7zgv0iaisdd974mdy6pdpl-chunksync-0.4
---
 pkgs/tools/backup/chunksync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix
index e1d19a48971..91d12a568a4 100644
--- a/pkgs/tools/backup/chunksync/default.nix
+++ b/pkgs/tools/backup/chunksync/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.3";
+  version = "0.4";
   name = "chunksync-${version}";
 
   src = fetchurl {
     url = "http://chunksync.florz.de/chunksync_${version}.tar.gz";
-    sha256 = "e0c27f925c5cf811798466312a56772864b633728c433fb2fcce23c8712b52fc";
+    sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00";
   };
 
   buildInputs = [openssl perl];

From e2fb4411ebd73ed221101d5ab06f72d7f46c752f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 01:59:10 -0700
Subject: [PATCH 072/203] clutter-gst: 3.0.24 -> 3.0.26

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.26 with grep in /nix/store/3x1gsqxcrbyiq3jncz9k8dfa8bi0bamf-clutter-gst-3.0.26
- found 3.0.26 in filename of file in /nix/store/3x1gsqxcrbyiq3jncz9k8dfa8bi0bamf-clutter-gst-3.0.26
---
 pkgs/development/libraries/clutter-gst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index b2d397e3d55..962ca9ff9b5 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "clutter-gst";
-  version = "3.0.24";
+  version = "3.0.26";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9";
+    sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl ];

From b32839211ba7727ed87cb2b8e4ec80f3b1006b84 Mon Sep 17 00:00:00 2001
From: Michal Rus <m@michalrus.com>
Date: Wed, 14 Mar 2018 10:08:15 +0100
Subject: [PATCH 073/203] =?UTF-8?q?hubstaff:=201.3.0=20=E2=86=92=201.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
index bd4a891a329..2b6e58a6ab3 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -5,7 +5,7 @@
 
 let
 
-  version = "1.3.0-9b2ba62";
+  version = "1.3.1-ff75f26";
 
   rpath = stdenv.lib.makeLibraryPath
     [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh";
-    sha256 = "1dxzyl3yxbfmbw1pv8k3vhqzbmyyf16zkgrhzsbm866nmbgnqk1s";
+    sha256 = "0jm5l34r6lkfkg8vsdfqbr0axngxznhagwcl9y184lnyji91fmdl";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From f161fe06b86508f5ac31b9cce768394efc421db5 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 14 Mar 2018 09:13:38 +0000
Subject: [PATCH 074/203] sshuttle: fix build on i686-linux

---
 pkgs/tools/security/sshuttle/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 8674de1fcee..f01a1f00a6d 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ];
+  nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
   buildInputs =
     [ coreutils openssh ] ++
     stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];

From a7bedb193399e6cd24c24f410ce0d05e416fb885 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 02:28:16 -0700
Subject: [PATCH 075/203] editres: 1.0.6 -> 1.0.7

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.7 in filename of file in /nix/store/3mbmc1niw3y2m109f6v0xlch0pn1ml8q-editres-1.0.7
---
 pkgs/tools/graphics/editres/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index 91dd85b0757..8bc33fb1b0a 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }:
 
 stdenv.mkDerivation rec {
-  name = "editres-1.0.6";
+  name = "editres-1.0.7";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/${name}.tar.gz";
-    sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45";
+    sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 619af3dc1e0eed185ecc175dd48f2163d7b0d653 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 14 Mar 2018 09:29:02 +0000
Subject: [PATCH 076/203] graalvm8: dontFixup = true

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

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index ce324b353ec..2eb9c4a7e83 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -116,6 +116,7 @@ in rec {
       mv jdk1.8.0_*/linux-amd64/product $out
       find $out -type f -exec sed -i "s#${oraclejdk8}#$out#g" {} \;
     '';
+    dontFixup = true; # do not nuke path of ffmpeg etc
     dontStrip = true; # why? see in oraclejdk derivation
     inherit (oraclejdk8) meta;
   };
@@ -174,6 +175,7 @@ in rec {
         --replace file:/dev/random    file:/dev/./urandom \
         --replace NativePRNGBlocking  SHA1PRNG
     '';
+    dontFixup = true; # do not nuke path of ffmpeg etc
     dontStrip = true; # why? see in oraclejdk derivation
     doInstallCheck = true;
     installCheckPhase = ''

From ca1921eb5bd8edc941be6abc7e971baf3a24fba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 14 Mar 2018 09:32:17 +0000
Subject: [PATCH 077/203] shuttle: disable buggy test on darwin

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

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index f01a1f00a6d..d2c194308e1 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -29,6 +29,10 @@ python3Packages.buildPythonApplication rec {
   # uses Python 3, so it should be fine.
   doCheck = true;
 
+  checkPhase = ''
+    py.test -k "${stdenv.lib.optionalString stdenv.isDarwin "not test_parse_subnetport_ip6"}"
+  '';
+
   postInstall = let
     mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
   in ''

From 99866d022322b40f15a4ac950efbce9e1ecda9f8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 02:49:40 -0700
Subject: [PATCH 078/203] evince: 3.26.0 -> 3.28.0

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

- built on NixOS
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince --version` and found version 3.28.0
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-thumbnailer -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-thumbnailer --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-previewer -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/evince-previewer --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-wrapped -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-wrapped --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-wrapped --version` and found version 3.28.0
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-thumbnailer-wrapped -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-thumbnailer-wrapped --help` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-previewer-wrapped -h` got 0 exit code
- ran `/nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0/bin/.evince-previewer-wrapped --help` got 0 exit code
- found 3.28.0 with grep in /nix/store/xa8kjq7jlp5dy53nfd91lmiw7liwg5vw-evince-3.28.0
---
 pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 2d52e22c54c..f2459d7885c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name = "evince-${version}";
-  version = "3.26.0";
+  version = "3.28.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8";
+    sha256 = "1a3kcls18dcz1lj8hrx8skcli9xxfyi71c17xjwayh71cm5jc8zs";
   };
 
   passthru = {

From cce7d1b60ac3d72b766c9a866409c827a6f8dc45 Mon Sep 17 00:00:00 2001
From: mt_caret <mtakeda.enigsol@gmail.com>
Date: Wed, 14 Mar 2018 18:57:08 +0900
Subject: [PATCH 079/203] satysfi: init at 2018-03-07 (#36428)

---
 pkgs/tools/typesetting/satysfi/default.nix | 45 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/typesetting/satysfi/default.nix

diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
new file mode 100644
index 00000000000..aee85e08375
--- /dev/null
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchzip, fetchFromGitHub, ocamlPackages }:
+let
+  lm = fetchzip {
+    url = "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip";
+    sha256 = "1mc88fbhfd2wki2vr700pgv96smya6d1z783xs3mfy138yb6ga2p";
+    stripRoot = false;
+  };
+  lm-math = fetchzip {
+    url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
+    sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
+  };
+in
+  stdenv.mkDerivation rec {
+    name = "satysfi-${version}";
+    version = "2018-03-07";
+    src = fetchFromGitHub {
+      owner = "gfngfn";
+      repo = "SATySFi";
+      rev = "a050ec0906d083682c630b0dea68887415b5f53d";
+      sha256 = "12bhl7s2kc02amr8rm71pihj203f2j15y5j0kz3swgsw0gqh81gv";
+      fetchSubmodules = true;
+    };
+
+    preConfigure = ''
+      substituteInPlace src/frontend/main.ml --replace \
+      '/usr/local/share/satysfi"; "/usr/share/satysfi' \
+      $out/share/satysfi
+    '';
+
+    buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib menhir
+      ppx_deriving uutf result core_kernel bitv batteries yojson camlimages ];
+    installPhase = ''
+      cp -r ${lm}/* lib-satysfi/dist/fonts/
+      cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
+      make install PREFIX=$out LIBDIR=$out/share/satysfi
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/gfngfn/SATySFi;
+      description = "A statically-typed, functional typesetting system";
+      license = licenses.lgpl3;
+      maintainers = [ maintainers.mt-caret ];
+      platforms = platforms.all;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8858029a687..d27e93eb041 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20556,6 +20556,10 @@ with pkgs;
 
   sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
+  satysfi = callPackage ../tools/typesetting/satysfi {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_06;
+  };
+
   sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
     inherit libusb1; # Shadow python.pkgs.libusb1.
     librsvg = librsvg.override { enableIntrospection = true; };

From 352c567d1ca0cffd24a5f8a48fb3fb3a8ba2c86a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 14 Mar 2018 11:44:29 +0100
Subject: [PATCH 080/203] graphviz_2_32: restore libgraph, the reason to keep
 this version

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d27e93eb041..238c0e55a5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2617,9 +2617,9 @@ with pkgs;
    * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
    * objections before removal. The feature is libgraph.
    */
-  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix {
+  graphviz_2_32 = lib.overrideDerivation (callPackage ../tools/graphics/graphviz/2.32.nix {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-  };
+  }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];});
 
   grin = callPackage ../tools/text/grin { };
   ripgrep = callPackage ../tools/text/ripgrep { };

From 0077c7651c572b237f243abc898d1e0a84971d0b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 14 Mar 2018 12:06:46 +0100
Subject: [PATCH 081/203] netsurfPackages.libcss: fix build by
 -Wno-error=implicit-fallthrough.

---
 pkgs/applications/misc/netsurf/libcss/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix
index 02bb593ce71..e97452249bc 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/pkgs/applications/misc/netsurf/libcss/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
   ];
 
+  NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ];
+
   meta = with stdenv.lib; {
     homepage = http://www.netsurf-browser.org/;
     description = "Cascading Style Sheets library for netsurf browser";

From 864f4ceba4b3064157363a647156764c1bebf307 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 13 Mar 2018 21:12:32 +0900
Subject: [PATCH 082/203] flashplayer: 28.0.0.161 -> 29.0.0.113

---
 .../networking/browsers/chromium/plugins.nix         |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 .../mozilla-plugins/flashplayer/standalone.nix       | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index bac4a361a19..07bc2bbc5f0 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,12 +98,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "28.0.0.161";
+    version = "29.0.0.113";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0xhfr2mqmg71dxnsq4x716hzkryj2dmmlzgyi8hf7s999p7x8djw";
+      sha256 = "1ix86jv4ckn5pcj37fgx4mncqjyvabdvwxp9zs9frdfbyx740izr";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index dc9c3358552..7d69c03ea36 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "28.0.0.161";
+  version = "29.0.0.113";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz"
       else
         "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0dsgq39c2d0kkdcd9j4nddqn3qiq5pvm2r67ji4m4wyv9chn518m"
+          "15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0"
         else
-          "0x26qi9qr01rppji5l4nwvmrhmq6qy83dsppbb7jqjmgyvknq5jd"
+          "0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7"
       else
         if arch == "x86_64" then
-          "1s62gx2a9q962w3gc847x2xwlzkq4dkzbmvf74x5k5c2k2l9hhg0"
+          "18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4"
         else
-          "1m5pcgz2w9f3jkm3hpvysc8ap20y458xnba7j51d7h7fjy6md89x";
+          "06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 4528dd70cbd..fead4cb9fad 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,19 +55,19 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "28.0.0.161";
+  version = "29.0.0.113";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0934vs3c51fjz9pr846wg9xn7h2qybswayfkhz0pnzcfnng2rrf1"
+        "12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc"
       else
-        "0pwi7pbfldiqiwc7yfy7psyr93679r025vjxmiybs2ap69vly4v0";
+        "17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348";
   };
 
   nativeBuildInputs = [ unzip ];

From eb0fa09232a35148aaffcfbfb900663a166a11bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 14 Mar 2018 15:06:31 +0100
Subject: [PATCH 083/203] 18.09: let's call it "Jackrabbit"

I was mainly considering Jellyfish and Jaguar (and Jackrabbit).
Originally I was inclined for Jellyfish, but then I thought of the
release T-shirts someone makes and it didn't seem suitable...
Jaguar would keep the name referring to a car as well, but as a
not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
---
 nixos/doc/manual/release-notes/rl-1809.xml | 2 +-
 nixos/modules/misc/version.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index f44d9cad52f..55f294e3957 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -4,7 +4,7 @@
          version="5.0"
          xml:id="sec-release-18.09">
 
-<title>Release 18.09 (“??”, 2018/09/??)</title>
+<title>Release 18.09 (“Jackrabbit”, 2018/09/??)</title>
 
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 6af584250a7..957eeb90850 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -86,7 +86,7 @@ in
       versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
 
       # Note: code names must only increase in alphabetical order.
-      codeName = "Impala";
+      codeName = "Jackrabbit";
     };
 
     # Generate /etc/os-release.  See

From 4fcadba5eabba61c47bdd2a82dc60cdc4e7d09d7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 21 Feb 2018 17:22:00 +0000
Subject: [PATCH 084/203] ocamlPackages: default to 4.05

---
 pkgs/top-level/all-packages.nix   | 2 +-
 pkgs/top-level/ocaml-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 238c0e55a5d..6ac59bb2739 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16425,7 +16425,7 @@ with pkgs;
 
   linuxsampler = callPackage ../applications/audio/linuxsampler { };
 
-  llpp = ocaml-ng.ocamlPackages.callPackage ../applications/misc/llpp { };
+  llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { };
 
   lmms = libsForQt5.callPackage ../applications/audio/lmms {
     lame = null;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a8111f9256e..65d3de2d9e2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1036,5 +1036,5 @@ in rec
 
   ocamlPackages_latest = ocamlPackages_4_06;
 
-  ocamlPackages = ocamlPackages_4_04;
+  ocamlPackages = ocamlPackages_4_05;
 }

From bdc72254e86a8d5090a8691d137659191a6ec357 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 14 Mar 2018 17:32:15 +0100
Subject: [PATCH 085/203] gns3Packages.{server,gui}{Stable,Preview}: 2.1.3 ->
 2.1.4

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

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index a140de2c236..66bf843865e 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.3";
+  stableVersion = "2.1.4";
   # Currently there is no preview version.
   previewVersion = stableVersion;
   addVersion = args:
@@ -10,8 +10,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "1yya0alc4ifgikka513ps243l8211rvifm0xz1ymx8nck0s6sj35";
-  serverSrcHash = "16d698gpj2r3z7qvvlrsx8ylgb1nfkmia2pcvk22068p3ajwypx1";
+  guiSrcHash = "03x9qgqs4y9swyipigviyscvlcfkb2v6iasc54nv07ks8srqwf93";
+  serverSrcHash = "0qzx0y4mqxpn5xhzgr2865lvszhi6szdli1jq64gihwdy3bhli4f";
 in {
   guiStable = mkGui {
     stable = true;

From 725c2b322ba267ea90cf163099f6cffc55d6865e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 10:25:47 -0700
Subject: [PATCH 086/203] googler: 3.3 -> 3.5

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

- built on NixOS
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler -h` got 0 exit code
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler --help` got 0 exit code
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler -v` and found version 3.5
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler --version` and found version 3.5
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler -h` and found version 3.5
- ran `/nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5/bin/googler --help` and found version 3.5
- found 3.5 with grep in /nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5
- found 3.5 in filename of file in /nix/store/g2q5sbf3gfjrm20zdgzpdk1fd01w5yj7-googler-3.5
---
 pkgs/applications/misc/googler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 026457fb857..3b8b08c1b66 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, python}:
 
 stdenv.mkDerivation rec {
-  version = "3.3";
+  version = "3.5";
   name = "googler-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "googler";
     rev = "v${version}";
-    sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43";
+    sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa";
   };
 
   propagatedBuildInputs = [ python ];

From 9a10c55a8ae1f1a74e1bb66eac93bde93b0d94cc Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 00:22:19 +0100
Subject: [PATCH 087/203] pythonPackages.nevow: fix build, 0.14.2->0.14.3

fix tests, minor update, move to development/python-modules/
---
 .../python-modules/nevow/default.nix          | 41 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 43 +------------------
 2 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/development/python-modules/nevow/default.nix

diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix
new file mode 100644
index 00000000000..ccbb59c44dc
--- /dev/null
+++ b/pkgs/development/python-modules/nevow/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, twisted }:
+
+buildPythonPackage rec {
+  pname = "Nevow";
+  version = "0.14.3";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "0pid8dj3p8ai715n9a59cryfxrrbxidpda3f8hvgmfpcrjdmnmmb";
+  };
+
+  propagatedBuildInputs = [ twisted ];
+
+  checkPhase = ''
+    trial formless nevow
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Nevow, a web application construction kit for Python";
+    longDescription = ''
+      Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
+      is a web application construction kit written in Python.  It is
+      designed to allow the programmer to express as much of the view
+      logic as desired in Python, and includes a pure Python XML
+      expression syntax named stan to facilitate this.  However it
+      also provides rich support for designer-edited templates, using
+      a very small XML attribute language to provide bi-directional
+      template manipulation capability.
+
+      Nevow also includes formless, a declarative syntax for
+      specifying the types of method parameters and exposing these
+      methods to the web.  Forms can be rendered automatically, and
+      form posts will be validated and input coerced, rendering error
+      pages if appropriate.  Once a form post has validated
+      successfully, the method will be called with the coerced values.
+    '';
+    homepage = https://github.com/twisted/nevow;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d3f4ed9280..8259e0caac8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10689,48 +10689,7 @@ in {
     };
   };
 
-  nevow = buildPythonPackage (rec {
-    name = "nevow-${version}";
-    version = "0.14.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz";
-      sha256 = "0wsh40ysj5gvfc777nrdvf5vbkr606r1gh7ibvw7x8b5g8afdy3y";
-      name = "${name}.tar.gz";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ twisted ];
-
-    postInstall = "twistd --help > /dev/null";
-
-    meta = {
-      description = "Nevow, a web application construction kit for Python";
-
-      longDescription = ''
-        Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
-        is a web application construction kit written in Python.  It is
-        designed to allow the programmer to express as much of the view
-        logic as desired in Python, and includes a pure Python XML
-        expression syntax named stan to facilitate this.  However it
-        also provides rich support for designer-edited templates, using
-        a very small XML attribute language to provide bi-directional
-        template manipulation capability.
-
-        Nevow also includes formless, a declarative syntax for
-        specifying the types of method parameters and exposing these
-        methods to the web.  Forms can be rendered automatically, and
-        form posts will be validated and input coerced, rendering error
-        pages if appropriate.  Once a form post has validated
-        successfully, the method will be called with the coerced values.
-      '';
-
-      homepage = http://divmod.org/trac/wiki/DivmodNevow;
-
-      license = "BSD-style";
-    };
-  });
+  nevow = callPackage ../development/python-modules/nevow { };
 
   nibabel = callPackage ../development/python-modules/nibabel {};
 

From dc2104d132aa89b705486691c891c4573e07c7ca Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 14 Mar 2018 20:42:46 +0300
Subject: [PATCH 088/203] sleekxmpp: 1.3.1 -> 1.3.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d3f4ed9280..97e1fa9ee4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10588,19 +10588,22 @@ in {
 
   sleekxmpp = buildPythonPackage rec {
     name = "sleekxmpp-${version}";
-    version = "1.3.1";
+    version = "1.3.3";
 
-    propagatedBuildInputs = with self ; [ dnspython pyasn1 ];
+    propagatedBuildInputs = with self; [ dnspython pyasn1 gevent ];
+    checkInputs = [ pkgs.gnupg ];
+    checkPhase = "${python.interpreter} testall.py";
+    doCheck = false; # Tests failed all this time and upstream doesn't seem to care.
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz";
-      sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr";
+      sha256 = "0samiq1d97kk8g9pszfbrbfw9zc41zp6017dbkwha9frf7gc24yj";
     };
 
     meta = {
       description = "XMPP library for Python";
       license = licenses.mit;
-      homepage = "http://sleekxmpp.com/";
+      homepage = http://sleekxmpp.com/;
     };
   };
 

From 863fb7b86ad9992bd098bb64655af6f6f01ed144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 14 Mar 2018 18:06:21 +0000
Subject: [PATCH 089/203] glm: fix darwin build

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

diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index 803f08a7a11..319a0359c58 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   # fetch newer version of platform.h which correctly supports gcc 7.3
   gcc7PlatformPatch = fetchurl {
-    url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
-    sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
+    url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h";
+    sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia";
   };
 
   postPatch = ''
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     cp ${gcc7PlatformPatch} glm/simd/platform.h
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [
+    "-DGLM_COMPILER=0"
+  ];
+
   postInstall = ''
     mkdir -p $doc/share/doc/glm
     cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm

From 4e96d0e2b7a87197610e7fea3a1c486ceda58c8a Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 14 Mar 2018 18:22:10 +0000
Subject: [PATCH 090/203] Only apply patch on darwin

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

diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index db40a40d02d..6e190a656f6 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   # Without this patch cmake fails with a "No known features for CXX compiler"
-  # error
-  patches = [./move-project.patch];
+  # error on darwin
+  patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ;
 
   # tells CMake to use this CA bundle file if it is accessible
   preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';

From 7dd7638cba521e527d41a15d6e56cb24cfe95c4c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 13 Mar 2018 22:30:06 +0100
Subject: [PATCH 091/203] pythonPackages.diff_cover: fix build

In order to adjust the language with `LC_ALL` properly the
`glibcLocales` is needed as `checkInput`. This was the only thing
preventing the testsuite from passing.

See ticket #36453
See https://hydra.nixos.org/build/70682982/nixlog/3
---
 pkgs/development/python-modules/diff_cover/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix
index b8286e7d6b1..57f0a1ef238 100644
--- a/pkgs/development/python-modules/diff_cover/default.nix
+++ b/pkgs/development/python-modules/diff_cover/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, jinja2, jinja2_pluralize, pygments,
   six, inflect, mock, nose, coverage, pycodestyle, flake8, pyflakes, git,
-  pylint, pydocstyle, fetchpatch }:
+  pylint, pydocstyle, fetchpatch, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "diff_cover";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ];
 
-  checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git ];
+  checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git glibcLocales ];
 
   meta = with stdenv.lib; {
     description = "Automatically find diff lines that need test coverage";

From 9b044a1dba64f08762157f131aed18684602ff01 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 19:52:34 +0100
Subject: [PATCH 092/203] python-tkinter: mark linux only

/cc ZHF #36454
---
 pkgs/top-level/python-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 27d60f6e238..691876095ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16700,7 +16700,9 @@ in {
       patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
     '';
 
-    inherit (py) meta;
+    meta = py.meta // {
+      platforms = platforms.linux;
+    };
   };
 
   tlslite = buildPythonPackage rec {

From 42555f6c7dc88c014f0963d6c030f740526d5fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 14 Mar 2018 19:58:02 +0100
Subject: [PATCH 093/203] pythonPackages.pycurl: Fix darwin build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcbaabdc334..1d892ce7c64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13013,8 +13013,10 @@ in {
 
     buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
 
-    # error: invalid command 'test'
-    doCheck = false;
+    checkInputs = with self; [ bottle pytest nose ];
+    checkPhase = ''
+      py.test -k "not test_ssl_in_static_libs" tests
+    '';
 
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
@@ -13024,7 +13026,6 @@ in {
     meta = {
       homepage = http://pycurl.sourceforge.net/;
       description = "Python wrapper for libcurl";
-      platforms = platforms.linux;
     };
   });
 

From 2217c706d48d1550a6b91bc14b2978b832955ce5 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sun, 28 Jan 2018 19:53:44 +0100
Subject: [PATCH 094/203] doitlive: init at 3.0.3

---
 pkgs/tools/misc/doitlive/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/doitlive/default.nix

diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix
new file mode 100644
index 00000000000..aa3e1e18ae6
--- /dev/null
+++ b/pkgs/tools/misc/doitlive/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "doitlive";
+  version = "3.0.3";
+
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "19i16ca835rb3gal1sxyvpyilj9a80n6nikf0smlzmxck38x86fj";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ click ];
+
+  # disable tests (too many failures)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Tool for live presentations in the terminal";
+    homepage = https://pypi.python.org/pypi/doitlive;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39cc942bc7a..a567eeb7038 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1114,6 +1114,8 @@ with pkgs;
 
   dlx = callPackage ../misc/emulators/dlx { };
 
+  doitlive = callPackage ../tools/misc/doitlive { };
+
   dosage = pythonPackages.dosage;
 
   dpic = callPackage ../tools/graphics/dpic { };

From 9e78baf5c75ed87360dfcab4c5eeeee2256be2dc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 7 Mar 2018 18:28:33 +0200
Subject: [PATCH 095/203] nixos/qemu-vm: Add virtualized display + HID devices
 on AArch64

---
 nixos/modules/virtualisation/qemu-vm.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 3270f1507f9..c5b1cc5375a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -434,9 +434,11 @@ in
 
     virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
-    # FIXME: Figure out how to make this work on non-x86
-    virtualisation.qemu.options =
-      mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ];
+    # FIXME: Consolidate this one day.
+    virtualisation.qemu.options = mkMerge [
+      (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ])
+      (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
+    ];
 
     # Mount the host filesystem via 9P, and bind-mount the Nix store
     # of the host into our own filesystem.  We use mkVMOverride to

From 5568e25fa029272a341a502da4ad6182f7458f0f Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Thu, 8 Mar 2018 00:10:24 +0100
Subject: [PATCH 096/203] python.msgpack-numpy: init 0.4.1

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

diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
new file mode 100644
index 00000000000..0244b03c484
--- /dev/null
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, cython
+, msgpack-python
+, numpy
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "msgpack-numpy";
+  version = "0.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1czf125nixzwskiqiw0145kfj15030sp334cb89gp5w4rz3h7img";
+  };
+
+  buildInputs = [
+    cython
+  ];
+
+  propagatedBuildInputs = [
+   msgpack-python
+   numpy
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} msgpack_numpy.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Practical Machine Learning for NLP in Python";
+    homepage = https://github.com/lebedov/msgpack-numpy;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ aborsu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4529f7febd4..33b971d3564 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10161,6 +10161,8 @@ in {
 
   msgpack = callPackage ../development/python-modules/msgpack {};
 
+  msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {};
+
   msgpack-python = self.msgpack.overridePythonAttrs {
     pname = "msgpack-python";
     postPatch = ''

From 2e67c8e03021b42f1bc4fffc59e3c92074652772 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Mon, 12 Mar 2018 23:44:45 +0100
Subject: [PATCH 097/203] python.murmurhash: 0.26.4 -> 0.28.0

---
 .../python-modules/murmurhash/default.nix     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index 023c94cdc8e..f689bc2ff49 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -1,35 +1,34 @@
 { stdenv
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , cython
 , python
 }:
 
 buildPythonPackage rec {
   pname = "murmurhash";
-  version = "0.26.4";
-  name = pname + "-" + version;
+  version = "0.28.0";
 
-  src = fetchFromGitHub {
-    owner = "explosion";
-    repo = "murmurhash";
-    rev = "0.26.4";
-    sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16id8jppw8r54wisrlaaiprcszzb7d7lbpnskqn38s8i7vnkf4b5";
   };
 
   buildInputs = [
    cython
   ];
 
+  # No test
+  doCheck = false;
+
   checkPhase = ''
-    cd murmurhash/tests
-    ${python.interpreter} -m unittest discover -p "*test*"
+    pytest murmurhash
   '';
 
   meta = with stdenv.lib; {
     description = "Cython bindings for MurmurHash2";
     homepage = https://github.com/explosion/murmurhash;
     license = licenses.mit;
-    maintainers = with maintainers; [ sdll ];
-    };
+    maintainers = with maintainers; [ aborsu sdll ];
+  };
 }

From 9478948f4dd80b2fbc70728aa35d067c00469699 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Mon, 12 Mar 2018 23:45:13 +0100
Subject: [PATCH 098/203] python.thinc: 6.5.1 -> 6.10.2

---
 .../python-modules/thinc/default.nix          | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 15794caf58b..2c6df953e16 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -1,15 +1,19 @@
 { stdenv
+, lib
 , pkgs
 , buildPythonPackage
 , fetchPypi
-, fetchFromGitHub
+, pythonOlder
 , pytest
 , cython
 , cymem
+, msgpack-numpy
+, msgpack-python
 , preshed
 , numpy
 , python
 , murmurhash
+, pathlib
 , hypothesis
 , tqdm
 , cytoolz
@@ -21,36 +25,21 @@
 , dill
 }:
 
-let
-  enableDebugging = true;
-
-  pathlibLocked = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "pathlib";
-    version = "1.0.1";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
-    };
-
-    doCheck = false; # fails to import support from test
-  };
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "thinc";
-  version = "6.5.1";
+  version = "6.10.2";
   name = pname + "-" + version;
 
-  src = fetchFromGitHub {
-    owner = "explosion";
-    repo = "thinc";
-    rev = "v${version}";
-    sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs";
   };
 
   propagatedBuildInputs = [
    cython
    cymem
+   msgpack-numpy
+   msgpack-python
    preshed
    numpy
    murmurhash
@@ -64,22 +53,34 @@ in buildPythonPackage rec {
    termcolor
    wrapt
    dill
-   pathlibLocked
+  ] ++ lib.optional (pythonOlder "3.4") pathlib;
+
+
+  checkInputs = [
+    pytest
   ];
 
+  prePatch = ''
+    substituteInPlace setup.py --replace \
+      "'pathlib>=1.0.0,<2.0.0'," \
+      "\"pathlib>=1.0.0,<2.0.0; python_version<'3.4'\","
+
+    substituteInPlace setup.py --replace \
+      "'cytoolz>=0.8,<0.9'," \
+      "'cytoolz>=0.8',"
+  '';
+
+  # Cannot find cython modules.
   doCheck = false;
 
-  # fails to import some modules
-  # checkPhase = ''
-  #   ${python.interpreter} -m pytest thinc/tests
-  #   # cd thinc/tests
-  #   # ${python.interpreter} -m unittest discover -p "*test*"
-  # '';
+  checkPhase = ''
+    pytest thinc/tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Practical Machine Learning for NLP in Python";
     homepage = https://github.com/explosion/thinc;
     license = licenses.mit;
-    maintainers = with maintainers; [ sdll ];
+    maintainers = with maintainers; [ aborsu sdll ];
     };
 }

From 458ba30fa97b6534dd984387191081d092ed49a0 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Tue, 13 Mar 2018 22:10:39 +0100
Subject: [PATCH 099/203] add aborsu as maintainer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 74b9f23af79..2e1953326f7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -176,6 +176,11 @@
     github = "abigailbuccaneer";
     name = "Abigail Bunyan";
   };
+  aborsu = {
+    email = "a.borsu@gmail.com";
+    github = "aborsu";
+    name = "Augustin Borsu";
+  };
   aboseley = {
     email = "adam.boseley@gmail.com";
     github = "aboseley";

From 8187d93da2b586e7d96358283171899e9efc4ef3 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Wed, 14 Mar 2018 00:01:04 +0100
Subject: [PATCH 100/203] python.ftfy: 5.3.0 -> 4.4.3

V5 only supports python3. Since at the moment the only packages
that use ftfy are spacy and textacy which both support
python2 and 3, I propose to roll back to v4 until another package
requires v5, at that point we can make a duplicate package.
---
 .../python-modules/ftfy/default.nix           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index d88c894009c..ca1c9a09e4e 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -7,18 +7,23 @@
 , python
 , isPy3k
 }:
+
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "ftfy";
-  # latest is 5.1.1, buy spaCy requires 4.4.3
-  version = "5.3.0";
+
+  version = "4.4.3";
+  # ftfy v5 only supports python3. Since at the moment the only
+  # packages that use ftfy are spacy and textacy which both support
+  # python 2 and 3, they have pinned ftfy to the v4 branch.
+  # I propose to stick to v4 until another package requires v5.
+  # At that point we can make a ftfy_v4 package.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ba702d5138f9b35df32b55920c9466208608108f1f3d5de1a68c17e3d68cb7f";
+    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";
   };
 
-  propagatedBuildInputs = [ html5lib wcwidth];
+  propagatedBuildInputs = [ html5lib wcwidth ];
 
   checkInputs = [
     nose
@@ -32,13 +37,10 @@ buildPythonPackage rec {
   # FileNotFoundError: [Errno 2] No such file or directory: 'ftfy'
   doCheck = false;
 
-  # "this version of ftfy is no longer written for Python 2"
-  disabled = !isPy3k;
-
   meta = with stdenv.lib; {
     description = "Given Unicode text, make its representation consistent and possibly less broken.";
     homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests;
     license = licenses.mit;
-    maintainers = with maintainers; [ sdll ];
-    };
+    maintainers = with maintainers; [ sdll aborsu ];
+  };
 }

From 2184aac78c47f65943491ed2c934a4c7d7cb200d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 14:28:38 -0500
Subject: [PATCH 101/203] wllvm: 1.1.3 -> 1.1.5

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

diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index 19bdb1cd9ef..c78767e115a 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,13 +1,13 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.1.3";
+  version = "1.1.5";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1scv9bwr888x2km8njg0000xkj8pz73c0gjbphhqaj8vy87y25cb";
+    sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv";
   };
 
   meta = with stdenv.lib; {

From 22fdb0bd9df0e9e9c0485fcb7fdac92f776aa165 Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Wed, 14 Mar 2018 00:02:00 +0100
Subject: [PATCH 102/203] python.spacy: 1.8.2 -> 2.0.9

---
 .../python-modules/spacy/default.nix          | 59 ++++++++++++-------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 6c7c3c8400c..b94374aeda8 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -3,12 +3,11 @@
 , buildPythonPackage
 , python
 , fetchPypi
-, fetchFromGitHub
+, html5lib
 , pytest
 , cython
-, cymem
 , preshed
-, pathlib2
+, ftfy
 , numpy
 , murmurhash
 , plac
@@ -16,7 +15,6 @@
 , ujson
 , dill
 , requests
-, ftfy
 , thinc
 , pip
 , regex
@@ -24,32 +22,49 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "1.8.2";
+  version = "2.0.9";
 
-  src = fetchFromGitHub {
-    owner = "explosion";
-    repo = "spaCy";
-    rev = "v${version}";
-    sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ihkhflhyz67bp73kfjqfrbcgdxi2msz5asbrh0pkk590c4vmms5";
   };
 
+  prePatch = ''
+    substituteInPlace setup.py --replace \
+      "'html5lib==1.0b8'," \
+      "'html5lib',"
+
+    substituteInPlace setup.py --replace \
+      "'regex==2017.4.5'," \
+      "'regex',"
+
+    substituteInPlace setup.py --replace \
+      "'ftfy==2017.4.5'," \
+      "'ftfy',"
+
+    substituteInPlace setup.py --replace \
+      "'pathlib'," \
+      "\"pathlib; python_version<'3.4'\","
+  '';
+
   propagatedBuildInputs = [
    cython
-   cymem
-   pathlib2
-   preshed
-   numpy
-   murmurhash
-   plac
-   six
-   ujson
    dill
-   requests
+   html5lib
+   murmurhash
+   numpy
+   plac
+   preshed
    regex
-   ftfy
+   requests
+   six
    thinc
-   pytest
-   pip
+   ujson
+   ftfy
+  ];
+
+  checkInputs = [
+    pytest
   ];
 
   doCheck = false;

From db691029d6931eb03076f6ec569587c3e79ae342 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 20:36:47 +0100
Subject: [PATCH 103/203] avian: fix darwin build

/cc ZHF #36454
---
 pkgs/development/compilers/avian/default.nix | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix              |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix
index 3d58e75200c..4dc384f70a3 100644
--- a/pkgs/development/compilers/avian/default.nix
+++ b/pkgs/development/compilers/avian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, jdk }:
+{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
 
 stdenv.mkDerivation rec {
   name = "avian-${version}";
@@ -11,10 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48";
   };
 
-  buildInputs = [
-    zlib
-    jdk
-  ];
+  buildInputs = [ zlib jdk ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error";
+
+  postPatch = ''
+    substituteInPlace makefile \
+        --replace 'g++' 'c++' \
+        --replace 'gcc' 'cc'
+  '';
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9866a2aaf99..2ed949ac7a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5769,7 +5769,8 @@ with pkgs;
   avra = callPackage ../development/compilers/avra { };
 
   avian = callPackage ../development/compilers/avian {
-    stdenv = overrideCC stdenv gcc49;
+    inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
+    stdenv = if stdenv.cc.isGNU then overrideCC stdenv gcc49 else stdenv;
   };
 
   bigloo = callPackage ../development/compilers/bigloo { };

From e95539115767a77dab2f4852d7373bb37833517a Mon Sep 17 00:00:00 2001
From: Roosembert Palacios <roosembert.palacios@epfl.ch>
Date: Wed, 14 Mar 2018 18:37:16 +0100
Subject: [PATCH 104/203] Add name to maintainers' list

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f4e4355673..ec357d37085 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -111,6 +111,11 @@
     github = "Profpatsch";
     name = "Profpatsch";
   };
+  roosemberth = {
+    email = "roosembert.palacios+nixpkgs@gmail.com";
+    github = "roosemberth";
+    name = "Roosembert (Roosemberth) Palacios";
+  };
   SShrike = {
     email = "severen@shrike.me";
     github = "severen";

From 43c474457cbe627cf1bdc36f083369f9c25c7e42 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 14:48:57 -0500
Subject: [PATCH 105/203] gllvm: init at 2018-02-09

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

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
new file mode 100644
index 00000000000..58ee7699b45
--- /dev/null
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "gllvm-${version}";
+  version = "2018-02-09";
+
+  goPackagePath = "github.com/SRI-CSL/gllvm";
+
+  src = fetchFromGitHub {
+    owner = "SRI-CSL";
+    repo = "gllvm";
+    rev = "ef83222afd22452dd1277329df227a326db9f84f";
+    sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/SRI-CSL/gllvm;
+    description = "Whole Program LLVM: wllvm ported to go";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9866a2aaf99..e0d343fc362 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1222,6 +1222,8 @@ with pkgs;
 
   gixy = callPackage ../tools/admin/gixy { };
 
+  gllvm = callPackage ../development/tools/gllvm { };
+
   glide = callPackage ../development/tools/glide { };
 
   glock = callPackage ../development/tools/glock { };

From 70467b9a126a09ae0d90929e06dffe5180d2896e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 20:49:01 +0100
Subject: [PATCH 106/203] Fix cross-compilation builds of several Haskell
 packages.

---
 .../haskell-modules/configuration-common.nix          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 69a8bf1e8f2..0466e77738f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -102,6 +102,7 @@ self: super: {
 
   # Test suite doesn't terminate
   hzk = dontCheck super.hzk;
+
   # Tests require a Kafka broker running locally
   haskakafka = dontCheck super.haskakafka;
 
@@ -937,11 +938,11 @@ self: super: {
   JuicyPixels = dontHaddock super.JuicyPixels;
 
   # armv7l fixes.
-  happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
-  hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
-  servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs;
-  servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger;
-  swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+  happy = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
+  hashable = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
+  servant-docs = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-docs else super.servant-docs;
+  servant-swagger = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-swagger else super.servant-swagger;
+  swagger2 = if pkgs.stdenv.hostPlatform.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;

From b02694dd45ffe06c8e537a773fa888125e4866a2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 20:58:56 +0100
Subject: [PATCH 107/203] python-selenium: fix darwin build

/cc ZHF #36454
---
 .../python-modules/selenium/default.nix       | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index 6b64cd18b4f..1661dd2cf3a 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -7,6 +7,19 @@
 , xorg
 }:
 
+
+let
+  # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some
+  # absolute paths. Replaced by relative path so it is found when used in nix.
+  x_ignore_nofocus =
+    fetchFromGitHub {
+      owner = "SeleniumHQ";
+      repo = "selenium";
+      rev = "selenium-3.6.0";
+      sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v";
+    };
+in
+
 buildPythonPackage rec {
   pname = "selenium";
   version = "3.6.0";
@@ -23,21 +36,11 @@ buildPythonPackage rec {
     geckodriver
   ];
 
-  # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some
-  # absolute paths. Replaced by relative path so it is found when used in nix.
-  x_ignore_nofocus =
-    fetchFromGitHub {
-      owner = "SeleniumHQ";
-      repo = "selenium";
-      rev = "selenium-3.6.0";
-      sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v";
-    };
-
-  patchPhase = ''
+  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
     cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
     substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6"
-    gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
-    gcc -shared \
+    cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
+    cc -shared \
       -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \
       -o x_ignore_nofocus.so \
       x_ignore_nofocus.o

From 77d794fe64bb8136cb4e3fbe367dee32f56e36fc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 15:08:21 -0500
Subject: [PATCH 108/203] closurecompiler: 20170910 -> 20180204

---
 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 8d1b06f52b7..9472384020b 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 = "20170910";
+  version = "20180204";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "0znzsks8ql9qajhcjzfkhmnpz8zs6b8cji04fhivyq973jpxxrak";
+    sha256 = "1nh4yznabwpp9k6flk9562w87d6sxk1fwwpk4d3knwy25iyn3mwq";
   };
 
   sourceRoot = ".";

From 2f2ad74369d2f516786ca02e2dff37e7713629a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 21:08:43 +0100
Subject: [PATCH 109/203] Fix cross-compilation builds of several Haskell
 packages some more.

---
 .../haskell-modules/configuration-common.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0466e77738f..2a0981d2a22 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -937,12 +937,12 @@ self: super: {
   # https://github.com/Twinside/Juicy.Pixels/issues/149
   JuicyPixels = dontHaddock super.JuicyPixels;
 
-  # armv7l fixes.
-  happy = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
-  hashable = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
-  servant-docs = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-docs else super.servant-docs;
-  servant-swagger = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-swagger else super.servant-swagger;
-  swagger2 = if pkgs.stdenv.hostPlatform.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+  # aarch64 and armv7l fixes.
+  happy = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
+  hashable = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
+  servant-docs = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;
+  servant-swagger = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;
+  swagger2 = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;

From c05eb52c1f3e625cd4d6c4e85d7d0ee6ce8fb626 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 13:18:01 -0700
Subject: [PATCH 110/203] insomnia: 5.14.7 -> 5.14.9

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.14.9 with grep in /nix/store/5pw045b91pq83nph1x95pqqfd3fbjpi1-insomnia-5.14.9
- found 5.14.9 in filename of file in /nix/store/5pw045b91pq83nph1x95pqqfd3fbjpi1-insomnia-5.14.9
---
 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 45cf993f25e..03db11df5e4 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -18,11 +18,11 @@ let
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "5.14.7";
+  version = "5.14.9";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1y6bn9kaxxplzyv7jjrcsfkrjnivjqdk5mbdp8vz32hv2bmdvzzy";
+    sha256 = "0hq9pcfw1ic2acaknwp2d5yphg901dmk7d4n7ikx42nya8p39c6j";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];

From 1583cc6449f0d5c05c27963e17a9db38236b9768 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 21:22:18 +0100
Subject: [PATCH 111/203] haskell-SHA: fix compiler crash while trying to build
 the test suite on i686

Fixes https://github.com/NixOS/nixpkgs/issues/36949.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

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

From 33287099183d36a8e4927b007cf47d934b218cb6 Mon Sep 17 00:00:00 2001
From: Roosembert Palacios <roosembert.palacios@epfl.ch>
Date: Tue, 13 Mar 2018 20:33:05 +0100
Subject: [PATCH 112/203] pcm: init at 201710

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
---
 pkgs/os-specific/linux/pcm/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pcm/default.nix

diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
new file mode 100644
index 00000000000..43810210a88
--- /dev/null
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "201710";
+  name = "pcm-${version}";
+
+  src = fetchFromGitHub {
+    owner = "opcm";
+    repo = "pcm";
+    rev = "${version}";
+    sha256 = "02rq8739zwwbfrhagvcgf6qpmnswxl9b0qsld26rg6zp91v2npbj";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pcm*.x $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Processor counter monitor";
+    homepage = https://www.intel.com/software/pcm;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ roosemberth ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9866a2aaf99..75a1f152346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13092,6 +13092,8 @@ with pkgs;
 
   i7z = callPackage ../os-specific/linux/i7z { };
 
+  pcm = callPackage ../os-specific/linux/pcm { };
+
   ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
 
   intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };

From ba4356f5856874ebda4211289b35f48e2bbd93b3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 14 Mar 2018 15:31:40 -0500
Subject: [PATCH 113/203] json2hcl: fix meta

---
 pkgs/development/tools/json2hcl/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index cddf6054d48..d53b3902133 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "json2hcl";
@@ -16,9 +16,10 @@ buildGoPackage rec {
   goPackagePath = "github.com/${owner}/${pname}";
   goDeps = ./deps.nix;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convert JSON to HCL, and vice versa";
     license = with licenses; [ mit ];
     maintainers = [ maintainers.matthewbauer ];
+    platforms = platforms.unix;
   };
 }

From e140014a52205ab68d15ab44fd7df6830c9d02c6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 13:39:01 -0700
Subject: [PATCH 114/203] intel-gpu-tools: 1.21 -> 1.22

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

- built on NixOS
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/igt_stats -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/igt_stats --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/igt_stats help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_reg --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_reg help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_forcewaked -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_firmware_decode help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_gpu_top -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_gpu_top -h` and found version 1.22
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_guc_logger -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_guc_logger --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_opregion_decode -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_opregion_decode --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dump_decode help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_error_decode help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance --help` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance -h` and found version 1.22
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_dp_compliance --help` and found version 1.22
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_aubdump -h` got 0 exit code
- ran `/nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22/bin/intel_aubdump --help` got 0 exit code
- found 1.22 with grep in /nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22
- found 1.22 in filename of file in /nix/store/xk5lsqw4vfa5ndqvsg23w6jblxx0js78-intel-gpu-tools-1.22
---
 pkgs/development/tools/misc/intel-gpu-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 3d8b29e4ebc..775a31df2b1 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -3,11 +3,11 @@
 , procps, autoreconfHook, utilmacros, gnome2 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.21";
+  name = "intel-gpu-tools-1.22";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
-    sha256 = "0gvh317dg5c7kvjxxkh8g70hh3r3dc73mc4dzyvfa8nb4ix6xbyr";
+    sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix";
   };
 
   nativeBuildInputs = [ pkgconfig utilmacros ];

From 4bc0f88bb30cc51f88851fe3af352a39a1546e8a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 15:42:45 -0500
Subject: [PATCH 115/203] libdwarf: 20170709 -> 20180129

Upstream describes changes:

Fixes libdwarf/dwarfdump vulnerabilities related to detecting corrupt
DWARF and includes other small improvements
---
 pkgs/development/libraries/libdwarf/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 4bb91878bd3..6057dae4be2 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, libelf }:
 
 let
-  version = "20170709";
+  version = "20180129";
   src = fetchurl {
     url = "http://www.prevanders.net/libdwarf-${version}.tar.gz";
-    sha512 = "afff6716ef1af5d8aae2b887f36b9a6547fb576770bc6f630b82725ed1e59cbd"
-           + "387779aa729bbd1a5ae026a25ac76aacf64b038cd898b2419a8676f9aa8c59f1";
+    # Upstream displays this hash broken into three parts:
+    sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595"
+           + "6d643921a173e6f9e0a184db7aef66f0fd2548d669"
+           + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58";
   };
   meta = {
     homepage = https://www.prevanders.net/dwarf.html;

From 6f9a9e887662c5a05a8401782e36629f68d75931 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Mar 2018 21:13:25 +0100
Subject: [PATCH 116/203] tor-browser-bundle-bin: 7.5 -> 7.5.1

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 299ec43a8b9..1e1ea74b680 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5";
+  version = "7.5.1";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1ia8qv5hj7zrrli5d9qf65s3rlrls0whrx3q96lw63x2gn05nwv7";
+      sha256 = "1c5mrc10gm5nklirzwflg7lrdr1v36354g9lgxnjk432izhwb1s0";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1sw1n7jsagyl5cjs265x3k9jzh0j0yh767ixcy17vif5f9dfyzak";
+      sha256 = "0d274f3qhbf1cid3fmpk9s482bjvgcig3q7gdklv9va89bpxzsa6";
     };
   };
 in

From 4e1083256bcd8623e426e0994f954333e1edab60 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Mar 2018 22:07:20 +0100
Subject: [PATCH 117/203] Revert "Merge pull request #35636 from
 ryantm/auto-update/emscripten-1.37.16-to-1.37.34"

This reverts commit 5c02b9ab330729d97dd34ecd0e474d93f847af74, reversing
changes made to 2f2ad74369d2f516786ca02e2dff37e7713629a8.

https://github.com/NixOS/nixpkgs/pull/35636#issuecomment-373171672
---
 pkgs/development/compilers/emscripten/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index f8fc12200b7..ae80ad6fc80 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  rev = "1.37.34";
+  rev = "1.37.16";
   appdir = "share/emscripten";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "1v62jg0b65shh10lbkvjg79xwnwwms6lr6w5vn1gaq6cpc712y19";
+    sha256 = "1qyhjx5zza01vnwmj6qzxbkagxknn4kzb6gw12fqw5q8pa8fy4zy";
     inherit rev;
   };
 

From 95f1754a527e2665a85add731fd448a69959c4f1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 14 Mar 2018 19:09:44 +0100
Subject: [PATCH 118/203] youtube-dl: 2018.03.10 -> 2018.03.14

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index bd041d8645d..316d3f181fe 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,12 +15,12 @@
 with stdenv.lib;
 buildPythonApplication rec {
 
-  name = "youtube-dl-${version}";
-  version = "2018.03.10";
+  pname = "youtube-dl";
+  version = "2018.03.14";
 
   src = fetchurl {
-    url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1ibmz91anli1vzkgw2i3h4wf1i8arzd74730ylwcwyg3375xryjb";
+    url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
+    sha256 = "0j8j797gqc29fd5ra3cjvwkp8dgvigdydsj0zzjs05zccfqrj9lh";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5defdee634189be2f7cd29848f54ef9b1bf45210 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 22:41:47 +0100
Subject: [PATCH 119/203] cataclysm-dda: fix clang build

/cc ZHF #36454
---
 pkgs/games/cataclysm-dda/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index a3adec38401..01829238daa 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
     "WARNINGS+=-Wno-inconsistent-missing-override"
   ];
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-user-defined-warnings";
+
   postBuild = stdenv.lib.optionalString (tiles && stdenv.isDarwin) ''
     # iconutil on macOS is not available in nixpkgs
     png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/*

From b546c7440e2953907919cb13121a0927497454bb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 16:58:04 -0500
Subject: [PATCH 120/203] busybox: patchshebangs to fix build on "limited"
 /bin/sh builders

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

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 744f37b8b8c..d4c4582ffb2 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
     ./busybox-in-store.patch
   ];
 
+  postPatch = "patchShebangs .";
+
   configurePhase = ''
     export KCONFIG_NOTIMESTAMP=1
     make ${if enableMinimal then "allnoconfig" else "defconfig"}

From ee6d0a7025df93ee93142de0c25264c586b125c7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 23:02:52 +0100
Subject: [PATCH 121/203] ccl: fix darwin build

/cc ZHF #36454
---
 pkgs/development/compilers/ccl/default.nix | 15 +++------------
 pkgs/top-level/all-packages.nix            |  4 +++-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 087f7470021..f3a4ff74aa0 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc, glibc, m4, coreutils }:
+{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }:
 
 let
   options = rec {
@@ -27,19 +27,11 @@ let
       runtime = "dx86cl64";
       kernel = "darwinx8664";
     };
-    i686-darwin = {
-      arch = "darwinx86";
-      sha256 = x86_64-darwin.sha256;
-      runtime = "dx86cl";
-      kernel = "darwinx8632";
-    };
     armv6l-linux = armv7l-linux;
   };
-  cfg = options.${stdenv.system};
+  cfg = options."${stdenv.system}" or (throw "missing source url for platform ${stdenv.system}");
 in
 
-assert builtins.hasAttr stdenv.system options;
-
 stdenv.mkDerivation rec {
   name     = "ccl-${version}";
   version  = "1.11.5";
@@ -49,7 +41,7 @@ stdenv.mkDerivation rec {
     sha256 = cfg.sha256;
   };
 
-  buildInputs = if stdenv.isDarwin then [ m4 ] else [ gcc glibc m4 ];
+  buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ];
 
   CCL_RUNTIME = cfg.runtime;
   CCL_KERNEL = cfg.kernel;
@@ -58,7 +50,6 @@ stdenv.mkDerivation rec {
     substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
       --replace "M4 = gm4"   "M4 = m4" \
       --replace "dtrace"     "/usr/sbin/dtrace" \
-      --replace "mig"        "/usr/bin/mig" \
       --replace "/bin/rm"    "${coreutils}/bin/rm" \
       --replace "/bin/echo"  "${coreutils}/bin/echo"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6e6c6adc6e..fbae4e25104 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5797,7 +5797,9 @@ with pkgs;
     chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { };
   };
 
-  ccl = callPackage ../development/compilers/ccl { };
+  ccl = callPackage ../development/compilers/ccl {
+    inherit (darwin) bootstrap_cmds;
+  };
 
   chez = callPackage ../development/compilers/chez {
     inherit (darwin) cctools;

From 0c8e8ce7e879edbd66cc5728d470fbb246bc5d1e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 14 Mar 2018 23:14:37 +0100
Subject: [PATCH 122/203] cdo: fix darwin build

/cc ZHF #36454
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbae4e25104..dd1d42fad93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8462,7 +8462,9 @@ with pkgs;
 
   cdk = callPackage ../development/libraries/cdk {};
 
-  cdo = callPackage ../development/libraries/cdo {};
+  cdo = callPackage ../development/libraries/cdo {
+    stdenv = gccStdenv;
+  };
 
   cimg = callPackage  ../development/libraries/cimg { };
 

From f79f80dbf267036a96f8eae281c8501482756d03 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 13 Mar 2018 18:00:52 -0400
Subject: [PATCH 123/203] treewide: get rid of platforms.allBut

Negative reasoning like `allBut` is a bad idea with an open world of
platforms. Concretely, if we add a new, quite different sort of
platform, existing packages with `allBut` will claim they work on it
even though they probably won't.
---
 lib/systems/doubles.nix                             |  3 ++-
 pkgs/applications/graphics/ahoviewer/default.nix    |  4 +++-
 pkgs/applications/window-managers/i3/lock-color.nix |  2 +-
 pkgs/data/icons/numix-icon-theme-square/default.nix |  2 +-
 pkgs/development/compilers/chicken/default.nix      |  2 +-
 pkgs/development/compilers/mono/generic.nix         |  2 +-
 pkgs/development/libraries/buddy/default.nix        |  2 +-
 pkgs/development/libraries/cln/default.nix          |  2 +-
 pkgs/development/libraries/cloog-ppl/default.nix    |  2 +-
 pkgs/development/libraries/cloog/0.18.0.nix         |  2 +-
 pkgs/development/libraries/cloog/default.nix        |  2 +-
 pkgs/development/libraries/rocksdb/default.nix      |  2 +-
 pkgs/development/tools/rtags/default.nix            |  2 +-
 pkgs/games/endless-sky/default.nix                  |  2 +-
 pkgs/misc/screensavers/alock/default.nix            |  2 +-
 pkgs/misc/screensavers/xscreensaver/default.nix     |  2 +-
 pkgs/tools/graphics/barcode/default.nix             |  2 +-
 pkgs/tools/graphics/dcraw/default.nix               |  2 +-
 pkgs/tools/misc/mbuffer/default.nix                 |  2 +-
 pkgs/tools/networking/dnscrypt-proxy/default.nix    |  2 +-
 pkgs/tools/networking/zerotierone/default.nix       |  2 +-
 pkgs/top-level/python-packages.nix                  |  2 +-
 pkgs/top-level/release-lib.nix                      |  2 +-
 pkgs/top-level/release-small.nix                    | 10 +++++-----
 24 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 20294a28a11..0e1ee62ac95 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -24,10 +24,11 @@ let
 in rec {
   inherit all;
 
-  allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
   none = [];
 
   arm     = filterDoubles predicates.isArm;
+  aarch64 = filterDoubles predicates.isAarch64;
+  x86     = filterDoubles predicates.isx86;
   i686    = filterDoubles predicates.isi686;
   mips    = filterDoubles predicates.isMips;
   x86_64  = filterDoubles predicates.isx86_64;
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 2d42a479999..b7647803b3d 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -37,7 +37,9 @@ stdenv.mkDerivation rec {
     description = "A GTK2 image viewer, manga reader, and booru browser";
     maintainers = with maintainers; [ skrzyp xzfc ];
     license = licenses.mit;
-    platforms = platforms.allBut [ "darwin" "cygwin" ];
+    # Unintentionally not working on Darwin:
+    # https://github.com/ahodesuka/ahoviewer/issues/62
+    platforms = platforms.linux;
   };
 }
 
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index ec1673f5040..edaa88bde23 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
 
     # Needs the SSE2 instruction set. See upstream issue
     # https://github.com/chrjguill/i3lock-color/issues/44
-    platforms = platforms.i686 ++ platforms.x86_64;
+    platforms = platforms.x86;
   };
 }
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 198229cce37..99871abe5d4 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Numix icon theme (square version)";
     homepage = https://numixproject.org;
     license = licenses.gpl3;
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
     maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 4a2893c303f..ad9e57f794f 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     homepage = http://www.call-cc.org/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = with stdenv.lib.platforms; allBut darwin;
+    platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
     description = "A portable compiler for the Scheme programming language";
     longDescription = ''
       CHICKEN is a compiler for the Scheme programming language.
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index a8012f6bb9e..3b476bce027 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://mono-project.com/;
     description = "Cross platform, open source .NET development framework";
-    platforms = with stdenv.lib.platforms; allBut [ "aarch64-linux" ];
+    platforms = stdenv.lib.platforms.x86;
     maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
     license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
   };
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index 313ac086726..00e236eba8c 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Binary decision diagram package";
     license = "as-is";
 
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 9d7c9c4f30f..e39386dca3f 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "C/C++ library for numbers, a part of GiNaC";
     homepage = http://www.ginac.de/CLN/;
     maintainers = [ ];
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index 2c49e036358..442b115a408 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix
index ccd93828319..fa4e19f716a 100644
--- a/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/pkgs/development/libraries/cloog/0.18.0.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 5da29273a8b..902e0b26687 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
        make[3]: *** [Box.lo] Error 1
 
     */
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
   };
 }
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 562942f230f..6ccb78003cf 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     homepage = http://rocksdb.org;
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.bsd3;
-    platforms = platforms.allBut [ "i686-linux" ];
+    platforms = platforms.x86_64 ++ platforms.aarch64;
     maintainers = with maintainers; [ adev wkennington ];
   };
 }
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 13fbea3fc23..a2c75a02aa2 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "C/C++ client-server indexer based on clang";
     homepage = https://github.com/andersbakken/rtags;
     license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.allBut [ "i686-linux" ];
+    platforms = with stdenv.lib.platforms; x86_64 ++ aarch64;
   };
 }
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 40dbd1d33a7..8e1bd52eb42 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
       gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
     ];
     maintainers = with maintainers; [ lheckemann ];
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
   };
 }
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 1dc03e1e9f0..5b7c12dee1b 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       xscreensaver and never will. It's just for locking the current
       X session.
     '';
-    platforms = with platforms; allBut cygwin;
+    platforms = platforms.unix; # Cygwin had problems at one point
     maintainers = with maintainers; [ ftrvxmtrx chris-martin ];
   };
 }
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index b337b6cb0e9..8035e7da37d 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.jwz.org/xscreensaver/;
     description = "A set of screensavers";
     maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     inherit version;
     downloadPage = "https://www.jwz.org/xscreensaver/download.html";
     updateWalker = true;
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix
index d6a31bd5c7f..7ed2cc8b6aa 100644
--- a/pkgs/tools/graphics/barcode/default.nix
+++ b/pkgs/tools/graphics/barcode/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "GNU barcode generator";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
     downloadPage = "http://ftp.gnu.org/gnu/barcode/";
     updateWalker = true;
     homepage = http://ftp.gnu.org/gnu/barcode/;
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 66d3a110080..30546865bcc 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.cybercom.net/~dcoffin/dcraw/;
     description = "Decoder for many camera raw picture formats";
     license = stdenv.lib.licenses.free;
-    platforms = with stdenv.lib.platforms; allBut cygwin;
+    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index e81fa7958b5..ed6c08d5554 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description  = "A tool for buffering data streams with a large set of unique features";
     license = stdenv.lib.licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ tokudan ];
-    platforms = with stdenv.lib.platforms; allBut darwin;
+    platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
   };
 }
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 95bfdca6315..6120b821bf4 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.isc;
     maintainers = with maintainers; [ joachifm jgeerds ];
     # upstream claims OSX support, but Hydra fails
-    platforms = with platforms; allBut darwin;
+    platforms = platforms.linux; # Maybe other non-darwin Unix
   };
 }
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 37812029c96..77df8cbf6f7 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.zerotier.com;
     license = licenses.gpl3;
     maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ];
-    platforms = platforms.allBut [ "i686-linux" ];
+    platforms = platforms.x86_64 ++ platforms.aarch64;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 370fe91f998..7969765a95e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13517,7 +13517,7 @@ in {
       homepage = https://pypi.python.org/pypi/PyICU/;
       description = "Python extension wrapping the ICU C++ API";
       license = licenses.mit;
-      platforms = with platforms; allBut darwin;
+      platforms = platforms.linux; # Maybe other non-darwin Unix
       maintainers = [ maintainers.rycee ];
     };
   };
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 87fb00a9682..3e842f8b556 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -108,7 +108,7 @@ rec {
 
 
   /* Common platform groups on which to test packages. */
-  inherit (platforms) unix linux darwin cygwin allBut all mesaPlatforms;
+  inherit (platforms) unix linux darwin cygwin all mesaPlatforms;
 
   /* Platform groups for specific kinds of applications. */
   x11Supported = linux;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 391d79e47f1..e92ad47e142 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -21,7 +21,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   atlas = linux;
   autoconf = all;
   automake = all;
-  avahi = allBut cygwin;  # Cygwin builds fail
+  avahi = unix; # Cygwin builds fail
   bash = all;
   bashInteractive = all;
   bc = all;
@@ -54,7 +54,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   gnumake = all;
   gnupatch = all;
   gnupg = linux;
-  gnuplot = allBut cygwin;
+  gnuplot = unix; # Cygwin builds fail
   gnused = all;
   gnutar = all;
   gnutls = linux;
@@ -128,7 +128,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   pkgconfig = all;
   pmccabe = linux;
   procps = linux;
-  python = allBut cygwin;
+  python = unix; # Cygwin builds fail
   readline = all;
   rlwrap = all;
   rpm = linux;
@@ -138,9 +138,9 @@ with import ./release-lib.nix { inherit supportedSystems; };
   scrot = linux;
   sdparm = linux;
   sharutils = all;
-  sloccount = allBut cygwin;
+  sloccount = unix; # Cygwin builds fail
   smartmontools = all;
-  sqlite = allBut cygwin;
+  sqlite = unix; # Cygwin builds fail
   squid = linux;
   ssmtp = linux;
   stdenv = all;

From 99131b4fc20f1256bdfc4c5237392434c157d234 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 17:50:25 -0500
Subject: [PATCH 124/203] pycurl: 7.19.5.1 -> 7.43.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 373c3a27de2..6f85300f1e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12944,19 +12944,21 @@ in {
   };
 
   pycurl = buildPythonPackage (rec {
-    name = "pycurl-7.19.5.1";
+    pname = "pycurl";
+    version = "7.43.0.1";
     disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
-    src = pkgs.fetchurl {
-      url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";
-      sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
     };
 
     buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
 
-    checkInputs = with self; [ bottle pytest nose ];
+    checkInputs = with self; [ bottle pytest nose flaky ];
+
     checkPhase = ''
-      py.test -k "not test_ssl_in_static_libs" tests
+      py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
     '';
 
     preConfigure = ''

From 86fbdfdd4c19549d1b299ff284ae53dde1c79f36 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 01:19:39 +0100
Subject: [PATCH 125/203] woff2: propagate brotli build input

brotli is a runtime dependency, as per pc files in woff2.dev

cc @hrdinka
---
 pkgs/development/web/woff2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index 3480924370e..1142c1e006b 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ brotli ];
+  propagatedBuildInputs = [ brotli ];
 
   # without this binaries only get built if shared libs are disable
   patchPhase = ''

From 0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 01:23:26 +0100
Subject: [PATCH 126/203] wxwidgets: depend on generic webkitgtk instead of
 218x

Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6
---
 pkgs/development/libraries/wxwidgets/3.0/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 98621bb781e..309d9be274d 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -4,13 +4,13 @@
 , withMesa ? true, libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , withGtk2 ? true
-, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
 assert withMesa -> libGLU != null && libGL != null;
-assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null;
+assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
 
 with stdenv.lib;
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
     ++ optional withMesa libGLU
-    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x)
+    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];

From 80582c600dadd6bd2a15f64a4e3e7da074adc71d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 15 Mar 2018 01:29:45 +0100
Subject: [PATCH 127/203] vimb-unwrapped: depend on generic webkitgtk instead
 of 218x

Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6

cc @rickynils
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd1d42fad93..e501b1d9206 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20699,9 +20699,7 @@ with pkgs;
   };
   vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
-  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
-    webkit = webkitgtk218x;
-  };
+  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
   vimb = wrapFirefox vimb-unwrapped { };
 
   vips = callPackage ../tools/graphics/vips { };

From a8824ab4fb67e414daa820dd1c9e36ee37dec276 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 10:40:24 -0500
Subject: [PATCH 128/203] llvm_5: patch sanitizers to enable w/musl

https://gitweb.gentoo.org/proj/musl.git/plain/sys-libs/compiler-rt-sanitizers/files/compiler-rt-sanitizers-5.0.0-musl-patches.patch
---
 pkgs/development/compilers/llvm/5/llvm.nix    |   4 +-
 .../compilers/llvm/5/sanitizers-nongnu.patch  | 370 ++++++++++++++++++
 pkgs/development/compilers/llvm/6/llvm.nix    |   9 +-
 3 files changed, 377 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index f574eb05f92..ac575a0bf7a 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -79,6 +79,7 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -114,9 +115,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
-
-    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
-    "-DCOMPILER_RT_BUILD_XRAY=OFF"
   ];
 
   postBuild = ''
diff --git a/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..c9ddfe45c89
--- /dev/null
+++ b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch
@@ -0,0 +1,370 @@
+From 3e1fcb7d4909db8f0f7dd0109b2eee20115c8be3 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sat, 9 Sep 2017 08:31:15 -0500
+Subject: [PATCH] Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc                             |  4 +--
+ lib/interception/interception_linux.cc             |  2 +-
+ lib/interception/interception_linux.h              |  2 +-
+ lib/msan/msan_linux.cc                             |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc        |  4 +--
+ lib/sanitizer_common/sanitizer_common_syscalls.inc |  2 +-
+ lib/sanitizer_common/sanitizer_linux_libcdep.cc    | 12 +++----
+ lib/sanitizer_common/sanitizer_platform.h          |  7 ++++
+ .../sanitizer_platform_interceptors.h              |  2 +-
+ .../sanitizer_platform_limits_posix.cc             | 40 +++++++++++++---------
+ lib/tsan/rtl/tsan_platform_linux.cc                |  2 +-
+ 11 files changed, 47 insertions(+), 32 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 6d47ba432..c58dd4864 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -39,7 +39,7 @@
+ #include <sys/link_elf.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #else
+@@ -86,7 +86,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 6e908ac01..76c1688ce 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+   return real == wrapper;
+ }
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && defined(__GLIBC__)  // android does not have dlvsym
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 27a66c882..f60c38991 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & (func),                                   \
+       (::__interception::uptr) & WRAP(func))
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 0a687f620..0852d97d7 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX
++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU
+ 
+ #include "msan.h"
+ #include "msan_thread.h"
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 4ed9afedf..64f584e93 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -100,7 +100,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -361,7 +361,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 52196db12..045d9331f 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -148,7 +148,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -176,11 +176,11 @@ void InitTlsSize() {
+ }
+ #else
+ void InitTlsSize() { }
+-#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ 
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
+     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
+-    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
++    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t kThreadDescriptorSize;
+ 
+@@ -335,7 +335,7 @@ uptr ThreadSelf() {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -362,7 +362,7 @@ static void GetTls(uptr *addr, uptr *size) {
+     *addr = (uptr) dtv[2];
+     *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
+   }
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #else
+@@ -373,7 +373,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ 
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+-#if SANITIZER_FREEBSD || SANITIZER_ANDROID
++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index 396f7c934..5af6f1ed5 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -175,6 +175,13 @@
+ # define SANITIZER_ARM 0
+ #endif
+ 
++
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ // By default we allow to use SizeClassAllocator64 on 64-bit platform.
+ // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
+ // does not work well and we need to fallback to SizeClassAllocator32.
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index 0380cee92..0a39abbd0 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -31,7 +31,7 @@
+ # define SI_POSIX 0
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 83f4fd22f..fa8c1b8bd 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
++// #include <sys/ustat.h>
++#include <sys/statfs.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -251,7 +257,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ustat_sz = sizeof(struct ustat);
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+@@ -309,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -403,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -453,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -821,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -976,7 +982,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1010,6 +1016,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1023,6 +1030,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);
+@@ -1125,7 +1133,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1186,7 +1194,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1236,7 +1244,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1255,7 +1263,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index ead1e5704..2c020e3fe 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -284,7 +284,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.16.2
+
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 4f7a2835cc9..80702f3d8fe 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -77,6 +77,12 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
+    sed -i projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc \
+      -e '1i#define _LINUX_SYSINFO_H'
+    substituteInPlace projects/compiler-rt/lib/interception/interception_linux.h \
+      --replace '!defined(__ANDROID__)' \
+                '!defined(__ANDROID__) && !SANITIZER_NONGNU'
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -112,9 +118,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
-
-    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
-    "-DCOMPILER_RT_BUILD_XRAY=OFF"
   ];
 
   postBuild = ''

From 60bf299e6affada1aec05e6bcbbb44652e417a5d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 12:48:43 -0500
Subject: [PATCH 129/203] llvm6: patch to enable sanitizers w/musl

---
 pkgs/development/compilers/llvm/6/llvm.nix    |   5 -
 .../compilers/llvm/6/sanitizers-nongnu.patch  | 377 ++++++++++++++++++
 2 files changed, 377 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 80702f3d8fe..307b2e3a3f2 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -78,11 +78,6 @@ in stdenv.mkDerivation (rec {
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
     patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
-    sed -i projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc \
-      -e '1i#define _LINUX_SYSINFO_H'
-    substituteInPlace projects/compiler-rt/lib/interception/interception_linux.h \
-      --replace '!defined(__ANDROID__)' \
-                '!defined(__ANDROID__) && !SANITIZER_NONGNU'
   '';
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..39a9bbbd207
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch
@@ -0,0 +1,377 @@
+From 8c74f8274369f527f2ada3772f4a0b406cb481ec Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sat, 9 Sep 2017 08:31:15 -0500
+Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc                             |  4 +--
+ lib/interception/interception_linux.cc             |  2 +-
+ lib/interception/interception_linux.h              |  3 +-
+ lib/msan/msan_linux.cc                             |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc        |  4 +--
+ lib/sanitizer_common/sanitizer_common_syscalls.inc |  2 +-
+ lib/sanitizer_common/sanitizer_linux_libcdep.cc    | 10 +++---
+ lib/sanitizer_common/sanitizer_platform.h          |  6 ++++
+ .../sanitizer_platform_interceptors.h              |  4 +--
+ .../sanitizer_platform_limits_posix.cc             | 40 +++++++++++++---------
+ lib/tsan/rtl/tsan_platform_linux.cc                |  2 +-
+ 11 files changed, 46 insertions(+), 33 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include <link.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index c991550a4..2b706418b 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+ 
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 98fe51b85..c13302b98 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & (func),                                   \
+       (::__interception::uptr) & WRAP(func))
+ 
+-// Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 4e6321fcb..4d50feb82 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+ 
+ #include "msan.h"
+ #include "msan_thread.h"
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 24e7548a5..20259b1d6 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -102,7 +102,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -363,7 +363,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 56fdfc870..a932d5db1 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+ }
+ 
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
+-    !SANITIZER_NETBSD && !SANITIZER_SOLARIS
++    !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -207,7 +207,7 @@ void InitTlsSize() { }
+ 
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
+     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
+-    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
++    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t kThreadDescriptorSize;
+ 
+@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) {
+       *addr = (uptr)tcb->tcb_dtv[1];
+     }
+   }
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
+-    SANITIZER_SOLARIS
++    SANITIZER_SOLARIS || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index 334903c26..fc2afac2c 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -195,6 +195,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ // By default we allow to use SizeClassAllocator64 on 64-bit platform.
+ // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
+ // does not work well and we need to fallback to SizeClassAllocator32.
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index b99ac4480..628d226a1 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -38,7 +38,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -291,7 +291,7 @@
+   (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL                       \
+-  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+                  SANITIZER_WORDSIZE == 64))  // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index f12e8206a..8880197b0 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
++// #include <sys/ustat.h>
++#include <sys/statfs.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -252,7 +258,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ustat_sz = sizeof(struct ustat);
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+@@ -311,7 +317,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -405,7 +411,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -455,7 +461,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -823,7 +829,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -978,7 +984,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1012,6 +1018,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1025,6 +1032,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);
+@@ -1127,7 +1135,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1188,7 +1196,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1238,7 +1246,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1257,7 +1265,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index e14d5f575..389a3bc88 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -285,7 +285,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.16.2
+

From b2e6952f378e2ed17d0d30b4986c6632a652d867 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 14 Mar 2018 11:24:28 -0500
Subject: [PATCH 130/203] llvm4: same treatment

---
 pkgs/development/compilers/llvm/4/llvm.nix    |   4 +-
 .../compilers/llvm/4/sanitizers-nongnu.patch  | 368 ++++++++++++++++++
 2 files changed, 369 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 7fd94316d73..57f76ac5cec 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -83,6 +83,7 @@ in stdenv.mkDerivation (rec {
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../TLI-musl.patch}
     patch -p1 -i ${./dynamiclibrary-musl.patch}
+    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -118,9 +119,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
     "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
     "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
-
-    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
-    "-DCOMPILER_RT_BUILD_XRAY=OFF"
   ];
 
   postBuild = ''
diff --git a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..5bd858f8ae7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch
@@ -0,0 +1,368 @@
+From dac4d3912378069b44340204e5fc6237aa1baf94 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Fri, 5 May 2017 17:47:39 +0000
+Subject: [PATCH] Musl patches
+
+Ported to compiler-rt-sanitizers-4.0.0. Taken from
+
+  https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+---
+ lib/asan/asan_linux.cc                             |  4 +--
+ lib/interception/interception_linux.cc             |  2 +-
+ lib/interception/interception_linux.h              |  2 +-
+ lib/msan/msan_linux.cc                             |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc        |  4 +--
+ lib/sanitizer_common/sanitizer_common_syscalls.inc |  2 +-
+ lib/sanitizer_common/sanitizer_linux_libcdep.cc    | 12 +++----
+ lib/sanitizer_common/sanitizer_platform.h          |  7 ++++
+ .../sanitizer_platform_interceptors.h              |  2 +-
+ .../sanitizer_platform_limits_posix.cc             | 39 +++++++++++++---------
+ lib/tsan/rtl/tsan_platform_linux.cc                |  2 +-
+ 11 files changed, 46 insertions(+), 32 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index c051573dd..e295f6004 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -39,7 +39,7 @@
+ #include <sys/link_elf.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #else
+@@ -80,7 +80,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 6e908ac01..8f23d9adc 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+   return real == wrapper;
+ }
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && !SANITIZER_NONGNU  // android does not have dlvsym
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 27a66c882..3b559a303 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & (func),                                   \
+       (::__interception::uptr) & WRAP(func))
+ 
+-#if !defined(__ANDROID__)  // android does not have dlvsym
++#if !defined(__ANDROID__) && !SANITIZER_NONGNU  // android does not have dlvsym
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 0a687f620..0852d97d7 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX
++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU
+ 
+ #include "msan.h"
+ #include "msan_thread.h"
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 4ed9afedf..64f584e93 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -100,7 +100,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -361,7 +361,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index f99f0b594..3a773a94e 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -152,7 +152,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -180,11 +180,11 @@ void InitTlsSize() {
+ }
+ #else
+ void InitTlsSize() { }
+-#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO
++#endif  // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU
+ 
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
+     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \
+-    && SANITIZER_LINUX && !SANITIZER_ANDROID
++    && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t kThreadDescriptorSize;
+ 
+@@ -338,7 +338,7 @@ uptr ThreadSelf() {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -364,7 +364,7 @@ static void GetTls(uptr *addr, uptr *size) {
+     *addr = (uptr) dtv[2];
+     *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
+   }
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #else
+@@ -375,7 +375,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ 
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+-#if SANITIZER_FREEBSD || SANITIZER_ANDROID
++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index d9a8e8df1..fe01c5744 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -162,6 +162,13 @@
+ # define SANITIZER_PPC64V2 0
+ #endif
+ 
++
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ // By default we allow to use SizeClassAllocator64 on 64-bit platform.
+ // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
+ // does not work well and we need to fallback to SizeClassAllocator32.
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index 62875d11a..212e6e882 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -23,7 +23,7 @@
+ # define SI_NOT_WINDOWS 0
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 683f019d7..fd4880962 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,8 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -139,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -160,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
++// #include <sys/ustat.h>
++#include <sys/statfs.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -252,7 +257,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ustat_sz = sizeof(struct ustat);
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+@@ -310,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -404,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -454,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -822,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -985,7 +990,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1019,6 +1024,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1032,6 +1038,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);
+@@ -1134,7 +1141,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1195,7 +1202,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1245,7 +1252,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1264,7 +1271,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index 3313288a7..103c7b6b9 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -287,7 +287,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   __res_state *statp = (__res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.16.2
+

From 6b2d303b0624619c85377967d30fb00ab1cfc25e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 15 Mar 2018 04:06:19 +0300
Subject: [PATCH 131/203] splix: move to DRVs over PPDs

Also enable JBIG support for newer printers.
---
 pkgs/misc/cups/drivers/splix/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 2cdaca8d783..53e8a662697 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchsvn, fetchurl, cups, zlib }:
+{ stdenv, fetchsvn, cups, zlib, jbigkit }:
+
 let rev = "315"; in
 stdenv.mkDerivation rec {
   name = "splix-svn-${rev}";
+
   src = fetchsvn {
     # We build this from svn, because splix hasn't been in released in several years
     # although the community has been adding some new printer models.
@@ -11,12 +13,17 @@ stdenv.mkDerivation rec {
   };
 
   preBuild = ''
-    makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
+    makeFlags="$makeFlags CUPSFILTER=$out/lib/cups/filter CUPSDRV=$out/share/cups/drv"
   '';
 
-  buildInputs = [cups zlib];
+  buildFlags = [ "drv" "all" ];
+
+  makeFlags = [ "DRV_ONLY=1" ];
+
+  buildInputs = [ cups zlib jbigkit ];
 
   meta = {
+    description = "CUPS drivers for SPL (Samsung Printer Language) printers";
     homepage = http://splix.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.peti ];

From 92a77abd31e6c252390b1baa8a25553909e3f344 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Wed, 14 Mar 2018 18:17:55 -0700
Subject: [PATCH 132/203] xgboost: Enable building on Darwin (#37046)

* xgboost: Enable building on Darwin

* Review feedback: pass `xgboost` to the python package
---
 .../development/libraries/xgboost/default.nix | 11 +++---
 .../python-modules/xgboost/default.nix        | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 ++-----------
 3 files changed, 44 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/xgboost/default.nix

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 0d86c862891..7865724efa4 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -2,6 +2,7 @@
 , avxSupport ? false
 , cudaSupport ? false, cudatoolkit
 , ncclSupport ? false, nccl
+, llvmPackages
 }:
 
 assert ncclSupport -> cudaSupport;
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp;
 
   buildInputs = lib.optional cudaSupport cudatoolkit
                 ++ lib.optional ncclSupport nccl;
@@ -27,10 +28,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ]
                ++ lib.optional ncclSupport "-DUSE_NCCL=ON";
 
-  installPhase = ''
+  installPhase = let
+    libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so";
+  in ''
     mkdir -p $out
     cp -r ../include $out
-    install -Dm755 ../lib/libxgboost.so $out/lib/libxgboost.so
+    install -Dm755 ../lib/${libname} $out/lib/${libname}
     install -Dm755 ../xgboost $out/bin/xgboost
   '';
 
@@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library";
     homepage = https://github.com/dmlc/xgboost;
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
new file mode 100644
index 00000000000..217c823afe5
--- /dev/null
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, lib
+, pkgs
+, buildPythonPackage
+, nose
+, scipy
+, xgboost
+}:
+
+buildPythonPackage rec {
+  name = "xgboost-${version}";
+
+  inherit (xgboost) version src meta;
+
+  propagatedBuildInputs = [ scipy ];
+  checkInputs = [ nose ];
+
+  postPatch = let
+    libname = if stdenv.isDarwin then "libxgboost.dylib" else "libxgboost.so";
+
+  in ''
+    cd python-package
+
+    sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py
+    sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py
+    cat <<EOF >xgboost/libpath.py
+    def find_lib_path():
+      return ["${xgboost}/lib/${libname}"]
+    EOF
+  '';
+
+  postInstall = ''
+    rm -rf $out/xgboost
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 253575fba0b..9220b9e98ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20076,28 +20076,8 @@ EOF
     };
   };
 
-  xgboost = buildPythonPackage rec {
-    name = "xgboost-${version}";
-
-    inherit (pkgs.xgboost) version src meta;
-
-    propagatedBuildInputs = with self; [ scipy ];
-    checkInputs = with self; [ nose ];
-
-    postPatch = ''
-      cd python-package
-
-      sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py
-      sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py
-      cat <<EOF >xgboost/libpath.py
-      def find_lib_path():
-        return ["${pkgs.xgboost}/lib/libxgboost.so"]
-      EOF
-    '';
-
-    postInstall = ''
-      rm -rf $out/xgboost
-    '';
+  xgboost = callPackage ../development/python-modules/xgboost {
+    xgboost = pkgs.xgboost;
   };
 
   xkcdpass = buildPythonPackage rec {

From 92e7762b36e29a2e7b93a0deed4f426f7b939cab Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:09:32 +0100
Subject: [PATCH 133/203] networkmanagerapplet: add updateScript

---
 .../network-manager-applet/default.nix          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 20bab09c2a7..b2640743daf 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -4,14 +4,14 @@
 , udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk
 , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}-${major}.${minor}";
+let
   pname   = "network-manager-applet";
-  major   = "1.8";
-  minor   = "6";
+  version = "1.8.6";
+in stdenv.mkDerivation rec {
+  name    = "${pname}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01";
   };
 
@@ -42,6 +42,13 @@ stdenv.mkDerivation rec {
     installFlagsArray=( "sysconfdir=$out/etc" )
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanagerapplet";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage    = http://projects.gnome.org/NetworkManager/;
     description = "NetworkManager control applet for GNOME";

From 72220061574f4504d87394fa118132a550033513 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:09:48 +0100
Subject: [PATCH 134/203] networkmanager: add updateScript

---
 .../networking/network-manager/default.nix    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index c0471601917..fc7d352757d 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib
+{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib, gnome3
 , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
 , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
 , python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }:
 
-stdenv.mkDerivation rec {
-  name    = "network-manager-${version}";
+let
   pname   = "NetworkManager";
-  major   = "1.10";
-  version = "${major}.2";
+  version = "1.10.2";
+in stdenv.mkDerivation rec {
+  name    = "network-manager-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
   };
 
@@ -104,8 +104,15 @@ stdenv.mkDerivation rec {
     ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager";
+    };
+  };
+
   meta = with stdenv.lib; {
-    homepage    = http://projects.gnome.org/NetworkManager/;
+    homepage    = https://wiki.gnome.org/Projects/NetworkManager;
     description = "Network configuration and management tool";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ];

From 8aa3b5c916526132a093f7794e15b48a47dd9512 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:00 +0100
Subject: [PATCH 135/203] networkmanager-fortisslvpn: add updateScript

---
 .../networking/network-manager/fortisslvpn.nix  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index 5f1e0790b0b..b924a02438f 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig,
 networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-fortisslvpn";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
   };
 
@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
        --replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-fortisslvpn";
+    };
+  };
+
   meta = {
     description = "NetworkManager's FortiSSL plugin";
     inherit (networkmanager.meta) maintainers platforms;

From dcfbe14f0ed91fa64432f69f6217143a4582a19d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:14 +0100
Subject: [PATCH 136/203] networkmanager-iodine: add updateScript

---
 .../tools/networking/network-manager/iodine.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix
index 9e6ba581a94..cbc0e6e6d2d 100644
--- a/pkgs/tools/networking/network-manager/iodine.nix
+++ b/pkgs/tools/networking/network-manager/iodine.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, iodine, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-iodine";
-  major   = "1.2";
-  version = "${major}.0";
+  version = "1.2.0";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh";
   };
 
@@ -32,6 +32,13 @@ stdenv.mkDerivation rec {
        --replace "/usr/bin/iodine" "${iodine}/bin/iodine"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-iodine";
+    };
+  };
+
   meta = {
     description = "NetworkManager's iodine plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 6c4bb91fca42073aa78d948810e9fa519f44baa6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:26 +0100
Subject: [PATCH 137/203] networkmanager-openconnect: add updateScript

---
 .../networking/network-manager/openconnect.nix  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index 5a215529d83..efaa146c72f 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, kmod }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-openconnect";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "15j98wwspv6mcmy91w30as5qc1bzsnhlk060xhjy4qrvd37y0xx1";
   };
 
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
        --replace "/sbin/modprobe" "${kmod}/bin/modprobe"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-openconnect";
+    };
+  };
+
   meta = {
     description = "NetworkManager's OpenConnect plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 348784f8a8ae69f22a89d6498c935b79b2674ed3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:37 +0100
Subject: [PATCH 138/203] networkmanager-openvpn: add updateScript

---
 .../networking/network-manager/openvpn.nix      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 49411f77845..edda84ab43e 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, kmod }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-openvpn";
-  major   = "1.8";
-  version = "${major}.0";
+  version = "1.8.0";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn";
   };
 
@@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
        --replace "/sbin/openvpn" "${openvpn}/bin/openvpn"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-openvpn";
+    };
+  };
+
   meta = {
     description = "NetworkManager's OpenVPN plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 47e033ace475ef0b74625d63f4c92365b31e4b42 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:45 +0100
Subject: [PATCH 139/203] networkmanager-pptp: add updateScript

---
 pkgs/tools/networking/network-manager/pptp.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index 08f591b117e..6844ca53456 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig
 , libsecret, withGnome ? true, gnome3 }:
 
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-pptp";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e";
   };
 
@@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
   configureFlags =
     if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome";
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-pptp";
+    };
+  };
+
   meta = {
     description = "PPtP plugin for NetworkManager";
     inherit (networkmanager.meta) maintainers platforms;

From a50dbfca7971c62b3f3f2a94c85c4d836a00ff98 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:10:57 +0100
Subject: [PATCH 140/203] networkmanager-vpnc: add updateScript

---
 pkgs/tools/networking/network-manager/vpnc.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 8d69415313d..81d899527e7 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, kmod }:
-
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+let
   pname   = "NetworkManager-vpnc";
-  major   = "1.2";
-  version = "${major}.4";
+  version = "1.2.4";
+in stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "39c7516418e90208cb534c19628ce40fd50eba0a08b2ebaef8da85720b10fb05";
   };
 
@@ -31,6 +30,13 @@ stdenv.mkDerivation rec {
        --replace "/sbin/modprobe" "${kmod}/bin/modprobe"
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "networkmanager-vpnc";
+    };
+  };
+
   meta = {
     description = "NetworkManager's VPNC plugin";
     inherit (networkmanager.meta) maintainers platforms;

From 13a8e72b01ff5a6e32000e85bab5fac64cf534c5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:12:34 +0100
Subject: [PATCH 141/203] =?UTF-8?q?networkmanagerapplet:=201.8.6=20?=
 =?UTF-8?q?=E2=86=92=201.8.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/network-manager-applet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index b2640743daf..578505f1e24 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname   = "network-manager-applet";
-  version = "1.8.6";
+  version = "1.8.10";
 in stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01";
+    sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a";
   };
 
   configureFlags = [

From d5d7fa4c03b4064ef15c73a0706bc7b29cce278a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:12:57 +0100
Subject: [PATCH 142/203] =?UTF-8?q?networkmanager:=201.10.2=20=E2=86=92=20?=
 =?UTF-8?q?1.10.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/network-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index fc7d352757d..dc7a29f5267 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname   = "NetworkManager";
-  version = "1.10.2";
+  version = "1.10.4";
 in stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
+    sha256 = "1zimmpmpd84dscdky7zad5zr1gk1bnsk0insjm0s9415gjvsgq3x";
   };
 
   outputs = [ "out" "dev" ];

From 3ebc49c5c02b13636c7eff235cbcbe14632b816b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 7 Mar 2018 06:13:29 +0100
Subject: [PATCH 143/203] =?UTF-8?q?networkmanager-fortisslvpn:=201.2.4=20?=
 =?UTF-8?q?=E2=86=92=201.2.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/network-manager/fortisslvpn.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index b924a02438f..73aaea06c91 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -3,13 +3,13 @@ networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
 
 let
   pname   = "NetworkManager-fortisslvpn";
-  version = "1.2.4";
+  version = "1.2.8";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
+    sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w";
   };
 
   buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]

From 0008b5c2324b7dfc9420bdec9c8068f0755bf54f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 18:24:31 -0700
Subject: [PATCH 144/203] libsolv: 0.6.32 -> 0.6.33

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

- built on NixOS
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv --help` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv -V` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv -v` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv --version` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/mergesolv --help` and found version 0.6.33
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/dumpsolv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/testsolv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/testsolv help` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/rpmdb2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/repomdxml2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/rpmmd2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/updateinfoxml2solv -h` got 0 exit code
- ran `/nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33/bin/deltainfoxml2solv -h` got 0 exit code
- found 0.6.33 with grep in /nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33
- found 0.6.33 in filename of file in /nix/store/qrx54k5d7x10525872inmmqir4f9bxng-libsolv-0.6.33
---
 pkgs/development/libraries/libsolv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index f775316a2a0..396bd09921f 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }:
 
 stdenv.mkDerivation rec {
-  rev  = "0.6.32";
+  rev  = "0.6.33";
   name = "libsolv-${rev}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner  = "openSUSE";
     repo   = "libsolv";
-    sha256 = "0gqvnnc1s5n0yj82ia6w2wjhhn8hpl6wm4lki2kzvjqjgla45fnq";
+    sha256 = "1vf8mwqzjjqkd5ir71h4lifybibs5nhqgfgq5zzlazby02zx2yiz";
   };
 
   cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";

From 8bbd48e40f3b5d06b6c93de6ab795d2554717fd3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 04:49:34 +0000
Subject: [PATCH 145/203] nixos: fix install-grub.pl dependencies

fallback from updates to perl
---
 nixos/modules/system/boot/loader/grub/grub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0d83391de89..1590708dab1 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -538,7 +538,7 @@ in
         in pkgs.writeScript "install-grub.sh" (''
         #!${pkgs.stdenv.shell}
         set -e
-        export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
+        export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare ])}
         ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
       '' + flip concatMapStrings cfg.mirroredBoots (args: ''
         ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@

From ea5b22532472e4ec6a6730587783ba4aea86b361 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 22:40:26 -0700
Subject: [PATCH 146/203] latte-dock: 0.7.3 -> 0.7.4 (#37030)

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.7.4 with grep in /nix/store/n1ad51hdp3jagm7fx91gp3i580ghid4q-latte-dock-0.7.4
- found 0.7.4 in filename of file in /nix/store/n1ad51hdp3jagm7fx91gp3i580ghid4q-latte-dock-0.7.4
---
 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 5c21b404f34..1867ec3a9c6 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub
 , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }:
 
-let version = "0.7.3"; in
+let version = "0.7.4"; in
 
 mkDerivation {
   name = "latte-dock-${version}";
@@ -10,7 +10,7 @@ mkDerivation {
     owner = "psifidotos";
     repo = "Latte-Dock";
     rev = "v${version}";
-    sha256 = "110bal0dairsvgj624n5k0zabh2qfy9dk560a4wy7icxv0cjh7hg";
+    sha256 = "0w4fphgpdvql31wrypxyfahmr4cv5ap96wjc4270yyawnrqrx0y6";
   };
 
   buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];

From 3d509de00b5de65ee75e7c2427fd00b329389493 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 15 Mar 2018 14:24:53 +0800
Subject: [PATCH 147/203] terraform: multiple provider updates

---
 .../cluster/terraform/providers/data.nix      | 95 ++++++++++---------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index af359ed1a4d..ce5e9ac048e 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -4,15 +4,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      version = "1.5.0";
-      sha256  = "14wrp6szg9mh8bxqqjbx0i654lciw09wghm8h3c6x79ayxan5n8x";
+      version = "1.8.1";
+      sha256  = "127070zsy536pdvjpcj0028iwwrcm4s5gbhvhzxb70fhjvi9sj6v";
     };
   archive =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-archive";
-      version = "1.0.0";
-      sha256  = "0z85fpd70m2w59vxp82d8ipylaazf6l890rkjca4dm14rkq352zn";
+      version = "1.0.1";
+      sha256  = "1qxw9c38hsdmxyrrnl7s9iwlzjrwzml2m74bs4iw120gljpqphqz";
     };
   arukas =
     {
@@ -32,8 +32,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.6.0";
-      sha256  = "0x4lrpq00z5ww8awym7p6kwrf17ghai36zj8hr10n4qraf8a9ma6";
+      version = "1.11.0";
+      sha256  = "14r54772qi6c73l50f6gp4j08rd03c2h4v1fwcydfc6kyf23f8k6";
     };
   azure-classic =
     {
@@ -46,8 +46,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.0.0";
-      sha256  = "0grpc7apfn03slkkily8agl8pv6mc0j58ch8fa6jgqcqy6dbd0kh";
+      version = "1.2.0";
+      sha256  = "10j7lk3rrlix04pcnnz25h0bm336nnmf3c2a1760v272sjdph51z";
     };
   bitbucket =
     {
@@ -102,8 +102,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cobbler";
-      version = "1.0.0";
-      sha256  = "0v7j9r2ic3ks2hy80mx5xay05m6r52vclsbbbf9vb0srnrvz21gy";
+      version = "1.0.1";
+      sha256  = "1z0iijfrbbdrgszvc7jlcr4105zragbc0iq8x48vi24yipqgf5a8";
     };
   consul =
     {
@@ -172,15 +172,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-fastly";
-      version = "0.1.3";
-      sha256  = "0q331j91c1kns01yhvbxrq0vf21653ch6fvkzlx61337az7jhky8";
+      version = "0.1.4";
+      sha256  = "0x8s11c30k9a95mafyb2zl3wh9hgbdm7jgajzy5y4xnnr96ca13k";
     };
   github =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-github";
-      version = "0.1.1";
-      sha256  = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0";
+      version = "1.0.0";
+      sha256  = "0nca90s4bangraly1pcn3jfkfksaw0g2chs5ba6m7z6bhkrj2ylb";
     };
   gitlab =
     {
@@ -193,15 +193,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      version = "1.4.0";
-      sha256  = "0nlm02ibp2w4m38pvmw6r29807863h23y8k00ywmkcr7yiy1zilr";
+      version = "1.7.0";
+      sha256  = "1q38z3gihsbxlra1vzgsg1ss8q24f5vkj6k8pvvqjb2rzqpkk5cm";
     };
   grafana =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-grafana";
-      version = "1.0.0";
-      sha256  = "0fsdin1rd7hah6pp3x568db2mmk66q0fhiplsri7vyj03n3z55v2";
+      version = "1.0.1";
+      sha256  = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns";
     };
   heroku =
     {
@@ -235,8 +235,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-influxdb";
-      version = "0.1.0";
-      sha256  = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
+      version = "1.0.0";
+      sha256  = "1w1izzs22b2w2qmpdxbhaj9kvnfyw0wlq3nigrigwwvqav43knh9";
     };
   kubernetes =
     {
@@ -291,8 +291,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-newrelic";
-      version = "0.1.1";
-      sha256  = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051";
+      version = "1.0.0";
+      sha256  = "1bcxq4f50qci54gckx4yax2v2qpazp10n5vcci4cba0bf5l8zx62";
     };
   nomad =
     {
@@ -305,8 +305,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-ns1";
-      version = "0.1.0";
-      sha256  = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj";
+      version = "1.0.0";
+      sha256  = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5";
     };
   null =
     {
@@ -326,15 +326,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opc";
-      version = "1.0.1";
-      sha256  = "0r8xczb1vy1h6ka97x7x025d030m7d01r52bbmf2z9sh81hhsa1x";
+      version = "1.1.0";
+      sha256  = "19yip5v00b57j3h7870hw51nsxcwib7mlhdzzn276z74af6zirsr";
     };
   openstack =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-openstack";
-      version = "1.1.0";
-      sha256  = "1w747qbk24b18v6x7l4n08pxnwak395fq1grajpxf3qw6afchjdj";
+      version = "1.3.0";
+      sha256  = "0pyp95i6z6il2kl28cvilqi81wqs076d6f0zacjyvmn1d0blqrnx";
     };
   opentelekomcloud =
     {
@@ -361,22 +361,29 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-packet";
-      version = "1.1.0";
-      sha256  = "0848y78jri1kzd70xcgv0p62yww46d0kr9zpqwh32m866xx5isfi";
+      version = "1.2.0";
+      sha256  = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4";
     };
   pagerduty =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-pagerduty";
-      version = "0.1.2";
-      sha256  = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
+      version = "1.0.0";
+      sha256  = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa";
+    };
+  panos =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-panos";
+      version = "1.0.0";
+      sha256  = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76";
     };
   postgresql =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-postgresql";
-      version = "0.1.0";
-      sha256  = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
+      version = "0.1.1";
+      sha256  = "0ls5z02vaalcrbaq375qnk0267pb17rpsx4s3plfnr7qclv21pwn";
     };
   powerdns =
     {
@@ -389,8 +396,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-profitbricks";
-      version = "1.0.1";
-      sha256  = "02blr487pbp7myw2l6nib9g1a8vplk9khakxaj9wbg779vp8wvcg";
+      version = "1.1.1";
+      sha256  = "0sn48adgpjw20a6jwagarnh5jasq0v36zsbd204j0vx4iam3vm9m";
     };
   rabbitmq =
     {
@@ -424,8 +431,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.0.0";
-      sha256  = "0zp9hhvlcn6cpnblwrr03icbagzk745b0lrm5bs23crbnddal905";
+      version = "1.1.0";
+      sha256  = "10ghzwss3n95yln7brzwghkc0gv7bkmyml7zlj7hfbkjr3382m1p";
     };
   softlayer =
     {
@@ -466,15 +473,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tls";
-      version = "1.0.1";
-      sha256  = "0mzm1pkqgcslz3j4an1vpx92hnqa53ly0kp3zix8kp2kfnn17qky";
+      version = "1.1.0";
+      sha256  = "1kzq6al9rzpmk98bmxcf5gjx5s28gfjp1xvdsnd4a113pljn0ddb";
     };
   triton =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-triton";
-      version = "0.4.1";
-      sha256  = "09zljia422afm565d3qm57j5y1n12h52bgyqz6s1s8dmcdygd75g";
+      version = "0.4.2";
+      sha256  = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml";
     };
   ultradns =
     {
@@ -501,7 +508,7 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vsphere";
-      version = "1.1.1";
-      sha256  = "1y209bwkk79ycxjl3b6c20n0z2g5d6njna85w68a0w6npk88zva9";
+      version = "1.3.3";
+      sha256  = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7";
     };
 }

From 893b69a54cb6841f4944dd3bf0791e0361184ef7 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 14 Mar 2018 19:14:34 +0100
Subject: [PATCH 148/203] mpv: 0.27.0 -> 0.27.2

---
 pkgs/applications/video/mpv/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index b026da6a632..6723c9dfe1f 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -73,21 +73,21 @@ assert drmSupport         -> available libdrm;
 let
   # Purity: Waf is normally downloaded by bootstrap.py, but
   # for purity reasons this behavior should be avoided.
-  wafVersion = "1.9.8";
+  wafVersion = "1.9.15";
   waf = fetchurl {
     urls = [ "http://waf.io/waf-${wafVersion}"
              "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
-    sha256 = "1gsd3zza1wixv2vhvq3inp4vb71i41a1kbwqnwixhnvdmcmw8z8n";
+    sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5";
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.27.0";
+  version = "0.27.2";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v";
+    sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr";
   };
 
   patches = [
@@ -95,11 +95,6 @@ in stdenv.mkDerivation rec {
       url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
       sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
     })
-    (fetchpatch {
-      name = "CVE-2018-6360.patch";
-      url = https://salsa.debian.org/multimedia-team/mpv/raw/ddface85a1adfdfe02ffb25b5ac7fac715213b97/debian/patches/09_ytdl-hook-whitelist-protocols.patch;
-      sha256 = "1gb1lkjbr8rv4v9ji6w5z97kbxbi16dbwk2255ajbvngjrc7vivv";
-    })
   ];
 
   postPatch = ''

From 488835ec6e8f7c115b2bd6ee37d9eaebe0f86485 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 15 Mar 2018 12:41:11 +0100
Subject: [PATCH 149/203] conan: Locally pin deps, enable tests

---
 pkgs/development/python-modules/distro/11.nix | 26 --------
 .../python-modules/distro/default.nix         |  1 -
 .../python-modules/node-semver/2.nix          | 21 -------
 .../python-modules/node-semver/default.nix    |  1 -
 .../tools/build-managers/conan/default.nix    | 60 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  4 --
 7 files changed, 46 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/python-modules/distro/11.nix
 delete mode 100644 pkgs/development/python-modules/node-semver/2.nix

diff --git a/pkgs/development/python-modules/distro/11.nix b/pkgs/development/python-modules/distro/11.nix
deleted file mode 100644
index bc9158e1545..00000000000
--- a/pkgs/development/python-modules/distro/11.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }:
-
-buildPythonPackage rec {
-  name = "${pname}-${version}";
-  pname = "distro";
-  version = "1.1.0";
-
-  buildInputs = [ pytest pytestcov tox];
-
-  checkPhase = ''
-    touch tox.ini
-    tox
-  '';
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/nir0s/distro;
-    description = "Linux Distribution - a Linux OS platform information API.";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nand0p ];
-  };
-}
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index 36264921f64..da6984c9be9 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "distro";
   version = "1.2.0";
 
diff --git a/pkgs/development/python-modules/node-semver/2.nix b/pkgs/development/python-modules/node-semver/2.nix
deleted file mode 100644
index 0ca61bd1351..00000000000
--- a/pkgs/development/python-modules/node-semver/2.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
-
-buildPythonPackage rec {
-  name = "${pname}-${version}";
-  version = "0.2.0";
-  pname = "node-semver";
-
-  buildInputs = [ pytest tox ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/podhmo/python-semver;
-    description = "A port of node-semver";
-    license = licenses.mit;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 7351d2edfd3..9e4ba35680a 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   version = "0.3.0";
   pname = "node-semver";
 
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 6350798e108..04d7d93455e 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,29 +1,59 @@
-{ lib, buildPythonApplication, fetchPypi
-, requests, fasteners, pyyaml, pyjwt, colorama, patch
-, bottle, pluginbase, six, distro11, pylint, node-semver2
-, future, pygments, mccabe
-, fetchpatch
-}:
+{ lib, fetchpatch, python }:
 
-buildPythonApplication rec {
-  version = "1.1.1";
+let newPython = python.override {
+  packageOverrides = self: super: {
+    distro = super.distro.overridePythonAttrs (oldAttrs: rec {
+      version = "1.1.0";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j";
+      };
+    });
+    node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec {
+      version = "0.2.0";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
+      };
+    });
+  };
+};
+
+in newPython.pkgs.buildPythonApplication rec {
+  version = "1.1.1"; # remove patch below when updating
   pname = "conan";
 
-  src = fetchPypi {
+  src = newPython.pkgs.fetchPypi {
     inherit pname version;
     sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl";
   };
 
-  propagatedBuildInputs = [
+  checkInputs = with newPython.pkgs; [
+    nose
+    parameterized
+    mock
+    webtest
+    codecov
+  ];
+
+  propagatedBuildInputs = with newPython.pkgs; [
     requests fasteners pyyaml pyjwt colorama patch
-    bottle pluginbase six distro11 pylint node-semver2
+    bottle pluginbase six distro pylint node-semver
     future pygments mccabe
   ];
 
-  # enable tests once all of these pythonPackages available:
-  # [ nose nose_parameterized mock webtest codecov ]
-  # update 2018-03-11: only nose_parameterized is missing
-  doCheck = false;
+  patches = [
+    # already merged, remove with the next package update
+    (fetchpatch {
+      url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch";
+      sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7";
+    })
+  ];
+
+  preCheck = ''
+    export HOME="$TMP/conan-home"
+    mkdir -p "$HOME"
+  '';
 
   meta = with lib; {
     homepage = https://conan.io;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dca7d36ae6d..8c4d2277d07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7589,7 +7589,7 @@ with pkgs;
 
   complexity = callPackage ../development/tools/misc/complexity { };
 
-  conan = pythonPackages.callPackage ../development/tools/build-managers/conan { };
+  conan = callPackage ../development/tools/build-managers/conan { };
 
   cookiecutter = pythonPackages.cookiecutter;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9220b9e98ca..669656d1452 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20953,12 +20953,8 @@ EOF
 
   node-semver = callPackage ../development/python-modules/node-semver { };
 
-  node-semver2 = callPackage ../development/python-modules/node-semver/2.nix { };
-
   distro = callPackage ../development/python-modules/distro { };
 
-  distro11 = callPackage ../development/python-modules/distro/11.nix { };
-
   bz2file =  callPackage ../development/python-modules/bz2file { };
 
   smart_open =  callPackage ../development/python-modules/smart_open { };

From e3db2501f9ec3271d8dd0c76ea7938650cee5589 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 05:49:07 -0700
Subject: [PATCH 150/203] s3ql: 2.21 -> 2.26

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

- built on NixOS
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql --version` and found version 2.26
- found 2.26 with grep in /nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26
- found 2.26 in filename of file in /nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26
---
 pkgs/tools/backup/s3ql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 66480a2f13a..1bd8ebfd44b 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -3,11 +3,11 @@
 python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "s3ql";
-  version = "2.21";
+  version = "2.26";
 
   src = fetchurl {
     url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
-    sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d";
+    sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn";
   };
 
   buildInputs = [ which ]; # tests will fail without which

From d081f14580f5559fa7d9b9232f6c39035deb2694 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 15 Mar 2018 12:52:55 +0000
Subject: [PATCH 151/203] kubernetes-helm: 2.8.1 -> 2.8.2

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 082b23afcbd..a49ff486d96 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, kubectl }:
 let
-  arch = if stdenv.isLinux
+  isLinux = stdenv.isLinux;
+  arch = if isLinux
          then "linux-amd64"
          else "darwin-amd64";
-  checksum = if stdenv.isLinux
-             then "07bgny8mfdgv9f6zmk31hxhkwy90wr22js21jz679pkz3gmykxvx"
-             else "1f6h96gyhsdb03am586kdqn619h4niwlj29j4bypf3yg2sar4p6x";
+  checksum = if isLinux
+             then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1"
+             else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50";
   pname = "helm";
-  version = "2.8.1";
+  version = "2.8.2";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From 81f0cf2cd5330c9069bb87ffa4cde6cf22ce1af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:38:41 +0100
Subject: [PATCH 152/203] python36Packages.hbmqtt: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix
index 379aa1c3cf4..ade4111c5a3 100644
--- a/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/pkgs/development/python-modules/hbmqtt/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "hbmqtt";
-  version = "0.9.1";
+  version = "0.9.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04lqqcy84f9gcwqhrlvzp689r3mkdd8ipsnfzw8gryfny4lh8wrx";
+    sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c";
   };
 
   propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];

From cdd2593da1788c3547590b4adb8dcd44885d2a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:43:28 +0100
Subject: [PATCH 153/203] pythonPackages.idna-ssl: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix
index 177e68f6295..b324705a152 100644
--- a/pkgs/development/python-modules/idna-ssl/default.nix
+++ b/pkgs/development/python-modules/idna-ssl/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonPackage, fetchPypi, idna }:
 
 buildPythonPackage rec {
-  pname = "idna_ssl";
-  version = "1.0.0";
+  pname = "idna-ssl";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1227e44039bd31e02adaeafdbba61281596d623d222643fb021f87f2144ea147";
+    sha256 = "1293f030bc608e9aa9cdee72aa93c1521bbb9c7698068c61c9ada6772162b979";
   };
 
   propagatedBuildInputs = [ idna ];

From 7dfbb8c53c778c851083a8ae835720208c082fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:44:39 +0100
Subject: [PATCH 154/203] pythonPackages.aiohttp: 3.0.5 -> 3.0.9

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 5408fb7b2f2..67bf5a11593 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.0.5";
+  version = "3.0.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb873da531401416acb7045a8f0bdf6555e9c6866989cd977166fae3cbbb954b";
+    sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b";
   };
 
   disabled = pythonOlder "3.5";

From 0f95d796cf7a626ec1334ba923c4016f54f3a59c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Thu, 15 Mar 2018 14:20:31 +0100
Subject: [PATCH 155/203] dmenu: 4.7 -> 4.8

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

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 8ef4f3ae897..f8b175eb86a 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.7";
+  name = "dmenu-4.8";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7";
+    sha256 = "0qfvfrj10xlwd9hkvb57wshryan65bl6423h0qhiw1h76rf5lqgy";
   };
 
   buildInputs = [ libX11 libXinerama zlib libXft ];

From cfd37eb349d6cd604891b5d90d18365c866c5f10 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 15 Mar 2018 14:28:29 +0100
Subject: [PATCH 156/203] grafana: 5.0.1 -> 5.0.2

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index b255a153a2b..dbc24e55c20 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.0.1";
+  version = "5.0.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0nvns6ysnl7a4blcq9iyhhn9nxhk8fpwkfzlyvm8dx6y8hwawlq1";
+    sha256 = "0lwv6k8yp1jpp3ghizvrnnb5zpnsbkyd1i9ggy4gbs68mg8xzp19";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "1zjy4h2w8dghqziafn23msl29yds9w4q0ryywv1sdrzkb1331cyk";
+    sha256 = "06qqi5v9s9ni4a380alsc3f53hvmmypqgm3cc25hl3ld5w3zdlkd";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From 607c651b9774163cc3cf87846512ca04c390940f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 06:58:19 -0700
Subject: [PATCH 157/203] seafile-client: 6.1.5 -> 6.1.6

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.1.6 with grep in /nix/store/304wh7gzixm9as2wa2b619jcimn0837k-seafile-client-6.1.6
- found 6.1.6 in filename of file in /nix/store/304wh7gzixm9as2wa2b619jcimn0837k-seafile-client-6.1.6
---
 pkgs/applications/networking/seafile-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 3e637fa0f1c..0d7bdf970f5 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.1.5";
+  version = "6.1.6";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "1ahz55cw2p3s78x5f77drz4h2jhknfzpkk83qd0ggma31q1pnpl9";
+    sha256 = "0r02frlspjq8k0zz1z4wh2sx3jm6b1qby5mxg394sb3rjdxb8jhk";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

From 306ee199a77132ee432c9e14823e2a60c29c58fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 14 Mar 2018 18:48:50 +0100
Subject: [PATCH 158/203] home-assistant: 0.63.3 -> 0.65.5

---
 .../home-assistant/component-packages.nix     | 20 ++++++++++++---
 pkgs/servers/home-assistant/default.nix       | 25 ++++++++-----------
 pkgs/servers/home-assistant/frontend.nix      |  8 +++---
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2b031f33555..6f5843a8167 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.63.3";
+  version = "0.65.5";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -21,6 +21,7 @@
     "arduino" = ps: with ps; [  ];
     "arlo" = ps: with ps; [  ];
     "asterisk_mbox" = ps: with ps; [  ];
+    "august" = ps: with ps; [  ];
     "axis" = ps: with ps; [  ];
     "bbb_gpio" = ps: with ps; [  ];
     "binary_sensor.concord232" = ps: with ps; [  ];
@@ -32,10 +33,12 @@
     "binary_sensor.trend" = ps: with ps; [ numpy ];
     "binary_sensor.workday" = ps: with ps; [  ];
     "blink" = ps: with ps; [  ];
+    "bmw_connected_drive" = ps: with ps; [  ];
     "calendar.caldav" = ps: with ps; [  ];
     "calendar.todoist" = ps: with ps; [ todoist ];
     "camera.foscam" = ps: with ps; [  ];
     "camera.onvif" = ps: with ps; [  ];
+    "camera.proxy" = ps: with ps; [ pillow ];
     "camera.synology" = ps: with ps; [  ];
     "camera.uvc" = ps: with ps; [  ];
     "camera.xeoma" = ps: with ps; [  ];
@@ -56,7 +59,7 @@
     "cloud" = ps: with ps; [  ];
     "coinbase" = ps: with ps; [  ];
     "comfoconnect" = ps: with ps; [  ];
-    "conversation" = ps: with ps; [  ];
+    "config.config_entries" = ps: with ps; [  ];
     "cover.myq" = ps: with ps; [  ];
     "daikin" = ps: with ps; [  ];
     "datadog" = ps: with ps; [ datadog ];
@@ -89,6 +92,7 @@
     "dweet" = ps: with ps; [  ];
     "dyson" = ps: with ps; [  ];
     "ecobee" = ps: with ps; [  ];
+    "egardia" = ps: with ps; [  ];
     "eight_sleep" = ps: with ps; [  ];
     "emulated_hue" = ps: with ps; [ aiohttp-cors ];
     "enocean" = ps: with ps; [  ];
@@ -96,12 +100,13 @@
     "fan.xiaomi_miio" = ps: with ps; [  ];
     "feedreader" = ps: with ps; [ feedparser ];
     "ffmpeg" = ps: with ps; [  ];
-    "frontend" = ps: with ps; [ user-agents ];
+    "frontend" = ps: with ps; [  ];
     "gc100" = ps: with ps; [  ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client oauth2client ];
     "hdmi_cec" = ps: with ps; [  ];
     "hive" = ps: with ps; [  ];
+    "homekit" = ps: with ps; [  ];
     "homematic" = ps: with ps; [ pyhomematic ];
     "http" = ps: with ps; [ aiohttp-cors ];
     "hue" = ps: with ps; [  ];
@@ -159,6 +164,7 @@
     "media_player.bluesound" = ps: with ps; [ xmltodict ];
     "media_player.braviatv" = ps: with ps; [  ];
     "media_player.cast" = ps: with ps; [ PyChromecast ];
+    "media_player.channels" = ps: with ps; [  ];
     "media_player.clementine" = ps: with ps; [  ];
     "media_player.cmus" = ps: with ps; [  ];
     "media_player.denonavr" = ps: with ps; [  ];
@@ -187,12 +193,14 @@
     "media_player.russound_rnet" = ps: with ps; [  ];
     "media_player.samsungtv" = ps: with ps; [ wakeonlan ];
     "media_player.snapcast" = ps: with ps; [  ];
+    "media_player.songpal" = ps: with ps; [  ];
     "media_player.sonos" = ps: with ps; [  ];
     "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
     "media_player.spotify" = ps: with ps; [  ];
     "media_player.vizio" = ps: with ps; [  ];
     "media_player.vlc" = ps: with ps; [  ];
     "media_player.webostv" = ps: with ps; [ websockets ];
+    "media_player.xiaomi_tv" = ps: with ps; [  ];
     "media_player.yamaha" = ps: with ps; [  ];
     "media_player.yamaha_musiccast" = ps: with ps; [  ];
     "media_player.ziggo_mediabox_xl" = ps: with ps; [  ];
@@ -334,6 +342,7 @@
     "sensor.sabnzbd" = ps: with ps; [  ];
     "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
     "sensor.season" = ps: with ps; [ ephem ];
+    "sensor.sense" = ps: with ps; [  ];
     "sensor.sensehat" = ps: with ps; [  ];
     "sensor.serial" = ps: with ps; [  ];
     "sensor.serial_pm" = ps: with ps; [  ];
@@ -342,7 +351,9 @@
     "sensor.snmp" = ps: with ps; [ pysnmp ];
     "sensor.sochain" = ps: with ps; [  ];
     "sensor.speedtest" = ps: with ps; [  ];
+    "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
+    "sensor.startca" = ps: with ps; [ xmltodict ];
     "sensor.steam_online" = ps: with ps; [  ];
     "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
     "sensor.swiss_public_transport" = ps: with ps; [  ];
@@ -366,9 +377,11 @@
     "sensor.yahoo_finance" = ps: with ps; [  ];
     "sensor.yr" = ps: with ps; [ xmltodict ];
     "sensor.yweather" = ps: with ps; [  ];
+    "sensor.zestimate" = ps: with ps; [ xmltodict ];
     "shiftr" = ps: with ps; [ paho-mqtt ];
     "skybell" = ps: with ps; [  ];
     "sleepiq" = ps: with ps; [  ];
+    "smappee" = ps: with ps; [  ];
     "spc" = ps: with ps; [ websockets ];
     "statsd" = ps: with ps; [ statsd ];
     "switch.acer_projector" = ps: with ps; [ pyserial ];
@@ -408,6 +421,7 @@
     "tts.google" = ps: with ps; [  ];
     "tts.microsoft" = ps: with ps; [  ];
     "twilio" = ps: with ps; [ twilio ];
+    "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
     "upnp" = ps: with ps; [  ];
     "usps" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cb9424ad5cf..bfdfd4a1548 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -7,18 +7,11 @@ let
 
   py = python3.override {
     packageOverrides = self: super: {
-      yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
-        version = "1.1.0";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "162630v7f98l27h11msk9416lqwm2mpgxh4s636594nlbfs9by3a";
-        };
-      });
       aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
-        version = "2.3.10";
+        version = "3.0.6";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+          sha256 = "5b588d21b454aaeaf2debf3c4a37f0752fb91a5c15b621deca7e8c49316154fe";
         };
       });
       pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
@@ -29,10 +22,10 @@ let
         };
       });
       voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec {
-        version = "0.10.5";
+        version = "0.11.1";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s";
+          sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";
         };
       });
       hass-frontend = super.callPackage ./frontend.nix { };
@@ -51,12 +44,14 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.63.3";
+  hassVersion = "0.65.5";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
   version = assert (componentPackages.version == hassVersion); hassVersion;
 
+  disabled = pythonOlder "3.5";
+
   inherit availableComponents;
 
   # PyPI tarball is missing tests/ directory
@@ -64,14 +59,14 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1lrdrn0x8i81vbqxziv5fgcc8ldz7x5r62kfz3nyg4g43rk3dqq8";
+    sha256 = "1jd44y3f31926g08h2zykp9hnigh6yms38mqn3i5gcl01n1n368k";
   };
 
   propagatedBuildInputs = [
     # From setup.py
-    requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi attrs
+    requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs
     # From http, frontend and recorder components
-    sqlalchemy aiohttp-cors hass-frontend user-agents
+    sqlalchemy aiohttp-cors hass-frontend
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 018405f578d..b6f8826130f 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchPypi, buildPythonPackage, user-agents }:
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180209.0";
+  version = "20180310.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b85f0e833871408a95619ae38d5344701a6466e8f7b5530e718ccc260b68d3ed";
+    sha256 = "5a7cca7ed461d650859df7d036ff4c579366bbcde5eb6407b1aff6a0dbbae2c2";
   };
+
+  propagatedBuildInputs = [ user-agents ];
 }

From 525dc15c5a43d503854e53e1bd05a9aa766f662a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 10:51:45 -0400
Subject: [PATCH 159/203] linux: 4.14.26 -> 4.14.27

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index cb292092f60..3d950252e1c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.26";
+  version = "4.14.27";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0n3ckh77n81jfgrivhxz17fm2l3mi5yicjg19sc7n0318b2nd94r";
+    sha256 = "1si8l3clpkyhwawrjxz6yzx7xl0v0k6dy1yf5qiwf1hsqx4s8489";
   };
 } // (args.argsOverride or {}))

From 09cb7d73ea9630c545158c711380080df47f6dfe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 10:51:59 -0400
Subject: [PATCH 160/203] linux: 4.15.9 -> 4.15.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index d7034e9c790..933339f5818 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.9";
+  version = "4.15.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14j4dpg1qx3bqw040lc6qkm544nz8qw5bpjnvz8ccw9f0jr1b86x";
+    sha256 = "14i6028l1y8y88sw5cbfihzs3wp66vwy33g1598i0dkyf1sbw5cg";
   };
 } // (args.argsOverride or {}))

From 3369c0da5e3e99714e4b93031d60122dd8084eab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 17:45:47 +0100
Subject: [PATCH 161/203] Revert "splix: move to DRVs over PPDs"

---
 pkgs/misc/cups/drivers/splix/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 53e8a662697..2cdaca8d783 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, fetchsvn, cups, zlib, jbigkit }:
-
+{ stdenv, fetchsvn, fetchurl, cups, zlib }:
 let rev = "315"; in
 stdenv.mkDerivation rec {
   name = "splix-svn-${rev}";
-
   src = fetchsvn {
     # We build this from svn, because splix hasn't been in released in several years
     # although the community has been adding some new printer models.
@@ -13,17 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   preBuild = ''
-    makeFlags="$makeFlags CUPSFILTER=$out/lib/cups/filter CUPSDRV=$out/share/cups/drv"
+    makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
   '';
 
-  buildFlags = [ "drv" "all" ];
-
-  makeFlags = [ "DRV_ONLY=1" ];
-
-  buildInputs = [ cups zlib jbigkit ];
+  buildInputs = [cups zlib];
 
   meta = {
-    description = "CUPS drivers for SPL (Samsung Printer Language) printers";
     homepage = http://splix.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.peti ];

From 7da70b859cca29316e4b08c2d6e076ab22845403 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 00:42:15 +0800
Subject: [PATCH 162/203] firefox-bin: Fix updateScript

`xidel -q` was deprecated in favour of `xidel -q`
---
 pkgs/applications/networking/browsers/firefox-bin/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index ac3f7d1380c..df928f88c38 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -37,7 +37,7 @@ in writeScript "update-${name}" ''
   #    versions or removes release versions if we are looking for beta
   #    versions
   # - this line pick up latest release
-  version=`xidel -q $url --extract "//a" | \
+  version=`xidel -s $url --extract "//a" | \
            sed s"/.$//" | \
            grep "^[0-9]" | \
            sort --version-sort | \

From 88a83f136a7535ae8b82427ae13cc36835365886 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 00:42:22 +0800
Subject: [PATCH 163/203] firefox-devedition-bin: 59.0b13 -> 60.0b3

---
 .../firefox-bin/devedition_sources.nix        | 788 +++++++++---------
 1 file changed, 399 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 1bb7ffd1b09..0ad35ee1c1f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,975 +1,985 @@
 {
-  version = "59.0b13";
+  version = "60.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "b94b5d17bb2bcdf0997e8e0b8d58cb07a7be671fba4c9a6e42c4954fab5bac2c2243b9f57cb2513db319f0a257561aebd837531f134344b1c51486f66f96ce3e";
+      sha512 = "59a2c232a7551d3f75843bd71f5d1cf804098dc7bf3048bdac03c51d7e7da32b52e10aae2499d28d0dbe6cbfc5b2fde87c0624142ffc4026aeb4e790f927e889";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "10b1db6c1abdfcd1cdfa5465447b70413b411cbee9fb33161bac21c3f47a9222243be4267849008d1bd20486c3d6dc752a57cb9003c2bef4566ff4210f37e388";
+      sha512 = "869b80d3f535c5e63ecc3c91150b5739d5f4d27137e11f279b534645660c761ec95155702c852b5bd915d41381e8f8c11f8631902bd0cc13f310b30d31aefda3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "8d94ad871580dc295783c5f3b7f22c88db3f16f0fe3511a505569571082775dec3edd95c472b17fce9353cd07737450df8a9a44a78f4541c26c9dbbb24f1ebfe";
+      sha512 = "b5f850afa0491da07705ef4e3f48a1aa0a4678744a2a19e6c4f52041f91faa9249362f983b6b0dba030644ff67b065e25315b50d1429b9967211b4873d355a80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "9f2cf9ae453fb79dec52c29371af50830b129bd82e190cf93d846042579484adb389ba33690bc5dc5e3a652af3924b70878fc0109d5a6da679d97a48fb3de567";
+      sha512 = "843898c216e1c531151d2e123e1c7b822259915130ac198a7f115dcb11af079f27514fbb2796c00f6059d18d0d7b412ef7758c0a6b9b0e985b5272ef9662cf18";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b97ca2803feb8b9afb1b006ac375111a59a26f67ed54ec0bf285452f2b59999f4c99e40b2cc066314ba761de465a7a893de671b50b575464d6f9f5bfa631368f";
+      sha512 = "f02f956b244ad48b94d0c45307d61b92a70d6cf2acd58789fb453287d0f53c47322dd538a0e1b17627a7e568728abb905a835c29c35add401bade4754d987dc0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "1f92d7ad29a89ac7e27181cb67cc956811ec512f48a9b9bb5e35247e4b03bac680dcc900719d1975d476c8ea7f51ad3d21d01aa9fed8f0f4b9ec81a443354575";
+      sha512 = "ab7fd7a674a7292cbd9f79a72129a212c95c8960c2673de52a3b566efebbaaff316820a5f2613394592c4bbe249876197bf4dafd9e84c6cee35858521358a49b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "43a54e6e62e02f792ce7aaae7fdfb4198320baa34c7e1ae76213e10bfe118f6c49a2d8c85536910e5eee7ea2d48b0e15087a906ef01d100a2978f885d0a04515";
+      sha512 = "c9b7e536ea19b74ad5774e95a2195718692a99c7e59a0fd482cba9d7c62250983d0cd7689771db24b86c909df5e52a009e7d97be76807ad21dc5ab838dcf923b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9baeb1245ffca545d6b0ac79b4bed8398406f411cb4a6b7c2f703d32435709521894ffbcba5d31e063dbd0a1c2ed1639656454ba5f69ef5a53c1c3622b5cff21";
+      sha512 = "33d5175f1df479f85d582c8e95255dd42f004c5e53e5a11e31344db85eb1e49c7c83c2b348db840cfee44aedb17d52bdfeef63cb8f3e9a4530a33d34d05c0e5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "57e9db4705224381034f2c11434bf750fa8addc16773a8aa6e761c2a3bc5e583568531acdab844337948bd5ee2e39101a99a32074862f36738ff9c700087227f";
+      sha512 = "8d1f3c82a6543b8ae7ed19e5c6a34525899ca1219e2206ae2a6bf391fefa37447d611ef6896ea5210c1aa54e65edc23548dd76eb13f42b6939624409540729a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f42d8d243a88bf713b82f3fd284e1dbd3a320db37b43d14a11aa6ec98dd5db4e50ac5b014f00495c11204c4732461c9c24f3d3410aec9f33f9cfda6e97d867f6";
+      sha512 = "f1b2f7dc2ca26c0637a3cbf9d649750e2c8c885a40b0767310ca7624d8947c6ba09e6be9529814524c876fb9fb60390f47ed88c131227a14e5af9369456aa363";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "ddcb486b0909bce3c8e917ec504e0f99c366a83385c36f18ddbc0a0456cad295e689ebc7715bfa82aa62b679387b31334000c92c4c7f7223ffdd9390f039ceb9";
+      sha512 = "5c6c8aade30d76f496cfafaf8c0882e72bc10c733486bcbc315ee5ad41565957f67c9b821b5b77424a67619211d5eb959c731beb28117c8b31ea18f9e4516342";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a271350d8d0f87461479fe4bb5b998535ce5ac673e0c8657b820fc50f805cf282141269bd1cb467b0df3c1139362b33b15b4dda5eccaa297894bb400b0e7c6fe";
+      sha512 = "bc7f71477781a9e9cc50e41fd1507293f48892cb2001bd79360ec4ff65e96fca6f69d6d063c9c6e44c0e982717ecbe6a6af05f14485c13816e415b3104d93456";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "a897577f7c233a4e6d905a9e03dd817cf26636dab68deb8c4db13b0101f7317bc55de40a7570d835de3256803901acbdc10041e8cfd0aa21ced140a80bf7c845";
+      sha512 = "645a7bb1a4b5adbd3d7d9e190fe8ac24cb81d311457f426f8592a8427a263a0b8ded1817b8026241b1f3bed8e2e526158c7f1339d4584c1302822bdf21ebe870";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d032ca82efbaf4207759f8e048c5018400dda9e80078fe13c2cfaec542b1d16bea8ba68bf885a6255793b3724c3f1d1b0a79be8028651ffff6ffb85bfb1856e7";
+      sha512 = "12c3d21eb2c7a121080a645a75966caf757e886222c292b4ead3a23278bf35d4242e1440ed5f7eaedf1cc4a7436b6ca2130fd2accb075714c71a1ec31b1dfd06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d3c6c7fc0b505f0ec8f670b314627061b3f829ee04fbdca6301956cd6ba244de194295aa989badf0cf3a015668945a8311f12ac37b39e1caec653380a719238f";
+      sha512 = "8cb1dbe49d8bf0696b6291452a7e389da21dabfd1bca59667038b2fc9647b588ab1632c5d1a8101c1352807c57f42ee1f909c1e1c926321a8583300f99a0934c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "e636cb9df591f73f0d9b8d596e997893b92fd6db9692be44e6aaf83b7eda66ecd8e4ebcf8a4c3d451358f3ebc510e51c6ba1a79cdb76dacb21bc1a9904e425b0";
+      sha512 = "06bc6712e27514529dc17379d8fba4537440f7cfa7e84d2b4201386a886030f3b4a098b6230577a36cfa9c9968ac8c1432100a0047f86c0aa32d8fc1971d0122";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "8b4252664548625e4b9e007b88fb6dadfbf2ac5592b6721e37f44a86e11e1b429534b321b8582b5b82b17e3819fd94c45e9d03e5f8faa1eb5e318de22a2e6ee8";
+      sha512 = "123a40d291431478f8fbaa13eb2197f3dc885755a1478519ed599b84fbe086c377b6208226e0409f156fb4d90ca1beb25fd255583018ae605d2aa4c5bf84d258";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "5d2d668d74064dabe2f0a074ee6a101706ac76e0e21129a68d201a6eb627948b911dac86746cface983dc077ac44f68519f81b62e8fa07f097c3b5bfecd88739";
+      sha512 = "4b556676ad9fa3bedb4ae49685344cad23da8c47c68efe986d14166308b6de53cb2f0b696d89e55e9ec1a3e7d523016ee7b87f539d4d6b02facae2014e815858";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "8730f4173165b961badf184c7a8e25659e0844eea51c26a7f7bb958ccb43a0b1cb079ce8916a8a58853f7a1489c0464330a8467822c70f6c6b2df510db1460ee";
+      sha512 = "eb53b6c9a000c4b7277d164c39f0d53928fc29527cf35a79c1ad1418f620efc00a16663ca0a59db3ee7a1d51ca9b6652777154827e916fc0346685080ea0bc8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "522459633b1a8638efe961e33c8779eea0c83e51eff1372731389d32c1826ee019c6fbd7e5592a632fb7c07fd85adb3c7ef08200dc087b95568d75d86033dabe";
+      sha512 = "152b9ed4b6674f1f9f83caf6b344d83c8651beec699fdac4a9cca4ee82012bd8c8096b3bd6319a87b8ba3295088d56a2aa8be965940114b2fbbf85e102c63620";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "46ec66ca8cf5a2b299ed1eb21db01b115ca54044adfc74851ac5436ec0d8fdb227fbd9033b14745dcafedea722f63fca3ad1a860efaf9802d717b6f91bb51174";
+      sha512 = "8c498c56a8266389fc43c80971bc379a1c79d6769d8560e2620320f9ca502c420bc5b671be09dd50f67afda11a45b6fc56c17373e562691527190bf8334224d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ac52ba67083f9d411e9e14afe88bb4bfe9850f7509d5ff70812c30ddedd4563e758852dd457fc7c50b285abe0e8423a5b72d8b39dcd9c501e3c692cce3591cca";
+      sha512 = "68a54a00c74b113f2f4c33c92d872c454da2c97e34c81c91e5807d2725415d81a6713b68459dd75a1602f908012d60883f9d483d23fd638dc0d43a75414319d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "c911e4a8b16272d4bc7839b5f13dd4892d68290ed778d72cde95ce110cba5d78df1572868f50222d9adb81df367a564d542c8afb4b1f7ced23e3b9a8a759e4b3";
+      sha512 = "1be7176d5a5708fca376f9146a8ca49debf0e4702365535685d2a3db68628892881b3be3ae3caee972f3839fd48528513131114c5044a31d6468c1e8606a9eeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "67baa5b7bbb55b3732dba842fe6c063a0bac2cefb55f201e6aaab2d11105c50cbba4850cf80c7d99b2e83b32535ad4cb3a95432bb26563592d48ee961cc1ac0c";
+      sha512 = "b9239303030197b776debb5726a25864e54795627f59bfe4c0f24913d56a04b5d4f4f69ae1fd8c56d105e8edb185e64bde96226e043078703c3b5805b507ac4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "3d952efdefd0f8b7886506cbea3359f747854f73d53efe58474a8d31beb396b568849151951c6d0750d116570a8f894c5d6e586b0487e3696cfaf451450ecd3b";
+      sha512 = "4b603bdd4f1b484a87894f3252418753e2f52d6cf298cda6d18bcfaddfae5269ef69ebd0a7e9d85da8ab42ccc4065809ab34a0ee36632c4ee4cc65fe4169cb99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "26ea9b1ddff5518975d49cd851df6951af376d3086b88483e7da9253fc4b427241d77019a8cfc22ba4ffa279af83fbae3c4deca8e43ec085fa366abf44629ba5";
+      sha512 = "e27a814f7408198c200165da2fe6cb40fe0b11626e15d92e8224c12acf1dd133e419bf8f98b09dde3bc505b77750950f568bff295919fd1b38112e879a6694a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "85d260e0dc02a4d3f94c43b4c3425c0ed0c6c9569577faf80f8f7719f368d0c353d59deaad519ccecf9da081b3063721746cdefbef18127ae2eb6d7c9863470a";
+      sha512 = "ef6d2814d1ff70e2799a8a0d5c6aae1f711819db6e816f2e153e84701e93a0a7debe19dd0975a4092d8c179f0ef5fa8f2c53b1d0d046110914634fd3bd2ef301";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "0efb25a3539fce60d2788513ca26f2a2ea48330894fe9468d54e5eac1bce411e72d937eb5997c18f60fc64c9d15ba247664998199655c73f3e9488a84810e4b4";
+      sha512 = "d41bb50097c60e239b539de8b9b08d21552d556e36606078ebe36a48de8e07dbb60b3e2940c0c531f7632efd2206cde2fcc6294a1f3a74a5bed7100c75658c0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "64c1d3945d866649891da16dd16d7d3261d0434e275d44c179d98fabee7eeb35e7fffb6e20b9b6630d60de52559f62d01ab59a5e460a389a17f5d5513296fd5a";
+      sha512 = "d3a2a4aa920c864bbd28dd8cdc091b25d6b8d386f73144d6236ffbe63a99e74af6f6420a82bde6b2f8e35ddeeed0cfc33a1e9aadd425d778878aff3b447aecce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "6b63a9fe3f12f4c270dcebe46d9b13082efdc32e94c8d1937e1e5248eaa84e8e0966092e408475bf20014d116509ee773bc91b06be9cd14fd97e64b8269072e7";
+      sha512 = "f66cc73bfe130295e35c44cc2902c3f1ec7b271d673974e13e0d8be630f671ca548943f13c04a01f45cf5523b3e67147ed28a53794e714409cbe2078bdb0dd55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "221f867cf7384f2d5f79906ac68c53b87ac6d11034698a7f390def2008f1acdb944db748b8019a726ad9eb89debf72b4939034057e48ab0a2642d041e3fa2b14";
+      sha512 = "f377f98e9d3b1774372add885bd45900e9d5a792d3b2c9c96f1ba4db0f7f03a7f693e400888c2d98a5fb67d4199f13f2262e0546f5e53491803872cca5e94ba4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "e513f3f871c444c6dfe4af027b31830e78d0d90ee6f199f26b3dc8fac1dbd3293c1ae74f4df735e15cfb4338330665f94c6d1dc4221e9f30250c7aac33ddddfb";
+      sha512 = "ef1b293fc8569a23c2b60a47f65d672334a5ee8d20470460ea6a2972ae7e6be91ecfed3c3f2acdba614e7895060253444fdd805df00cb08a6a2abd4c0d98127d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "074cb42f7b6cb93ff5583834c8ba1f16d92330d241a166983b26c3311c3254a323ab52badc16e9fd3d13e71a783d5aea55674c04c7ff5bb68f60a5deae446954";
+      sha512 = "774ca258ad68a2a6a5c9943e7b9ffac96a54448217125fe61ff11a0ede25c96498f7153f3406c1322a1f83515147402a8b506aa81732f2617e73e388fdd0950f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "901bbb71c4293a6cd7c79210a64349d65fa91c2c2f0bc00da5ceba0a7906c0cdfe00c72d316cfb39604129070d48dc1a30416ae4d6ea2fbf9c3be3511b1a3a39";
+      sha512 = "e29c6aadb5dbb9d456a11ff66d4b17296d6cb4417e4eda85a2666a79d6d2fca65b93cd7ceb385456e950730fa165462df164ffe17ac7696e359d96d08400257f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b70919cdb4f6798253acee401efc6fe22acdce8e12249c59c618b9d2858ccffd398a51c0c77c82ffa4c5a68dc0ac6a9066466f8bb3cb7bbed621ddbe426072ed";
+      sha512 = "487f9e0a439c2738f1eb2c55fa89e56b7829b8c66dc893ecb23f3705d86e1f8bd5948c2ba0ccf3a7eabeda68385371a49dd74b92e3daa2cc7fe07b958134ee60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b3ce427644dd2997d8f21eb60fa1b94c03ab091e79e5c8c908d938ff73871fec81b288d70cd754e03ff9a3758289bd9886077c01b5e3db0458bb7c6f04b11ea1";
+      sha512 = "0e526712e2f203e1ec806216144abfcb9ef96c769f8f736298053a8ad33d6f9e3bc6e6f6b36c4aa93cd45ee8a6370a15e0da6aa312175e142b574db8f5e628ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "6bc8201b78d85d5e5e2dc226628ce03814cea2c9084e5c4bb332b21d50418fcbb5ba656ca3a592e5304bf9fa10b64b32493daf17f6f3363c154b59ff3aaea828";
+      sha512 = "c21112fda5525ff7ded643407fe2be5c6b660449879a80dfd57b1f713c98679062cccc577a42573bc2bea9adecd660551c7f31c6962905cd51e6cb8eb14a22cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "8167a0e36c2ff85a85c9155a47f5530c581fcec9bea1b535b60b8c9e2bc4a370d002f942c9542787a34c76117356e513822cccdf8c02962d0091acec16724001";
+      sha512 = "ed6d0fc2a82ee3c0e14031d58bc2074dde5160492de7920220ac8e72ca995b553ca8c9899d9d8f256287a302bdfbffd65981d64d8c778fbe7e4f55365b6c317a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "b1d8de0f315199bbcae9ae693a04e038dcd24c73b8795f031a595e70fbbb4c79b9fb93ccb1761319010e99a915e3f71a075b2e368731bc530ba59b48873b5b48";
+      sha512 = "345bac14c394a432fa4ace22a439eaf2d16e6e0dfb6dd97e356c2b623000d14675154e34e4537b0f5bcd1e90c1111a263e7ba52a1ef6e81f6c8d0109a6263690";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "2c64c3db99edca9ae722953a48e4df9f106dd485357ec0bd35bfeaf5d35ca72437f38991e2af7fd46fc3653a9907a2f67f6cd931f8d8cd2f55cc56f9bc3a9b99";
+      sha512 = "702f85952d51286576c729c84e2709b32ffa0a1dd03c2911c1b20de7510e1a006531389c2bdbcbc1fd99fd3568db5a4157daed9c65a4be04648872a8200a808a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "29bead26899e8cc33cf47e7e9248493d80a5ddd82fc35e94836f26b627d7343768d427a7ce4e7ebfc70465fba9a5c81bdb56ca7e0e06c788d179c500ee42b44e";
+      sha512 = "8286e8fb299022028cf17466c199badcebb23a9aa743d4c64b2737d3112a5d964fd0b534bec6892aea9d67877dece66c25b1ddf15e08a745924e815064768891";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e3899e1a3fb97df70a29c0a0b314bc871a9625e736249eb9bc056cf0c56a81d1a2a3364ab964078733f5f3f4cb20229a5fb65a4a481e74b1afe2f1282e41894a";
+      sha512 = "598d84026a03835044c8bb57e5f27ddd131a045c49c779a5813d06b789bb062ea2d4ed92f8d5fafeb1b2ed5dafcaa75e9c06f5c8354cbab80fba1d1db6ce61ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ca96796c00ea4f028d833c7b9720de0ce2d77e72b9de85dc6e77fcf83379992abad22ace9201de0d4e45c4c89f8a77bf997228b9667accbeb774d3035276d1f9";
+      sha512 = "a410f8d101396f727920c4fbb91d1ec6885ea98317a1cbe7557d6ae7b40a9e428c6a6482cbfcf4857dd0b652cea8a6b3953fb76455234b2a6938cd55d9f9ccac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "7ebbf4ee67c475d8abc48212b6be0cac569000f386c54d893c863e329b0459e59d2af70c1a9ec5d5d123edef738c84249bd41538eb876e010776cd8920744997";
+      sha512 = "40fe8d2dd6f232ecfb0f48cb93f837cbb9f731c07c11d6c51c44bd596b050be89aadc610dea9782d42fde6ac8779cf72eb6b459df11d6ee1dde8b9960ec13926";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b1ed1fa049df575cdf5e7ec1e0e5e0d70f3fd235ecb969490e4e6ed694db677fb9d561b6d78e798e684df1a918d1660aa5460494639a525e71c5689d7a0d312a";
+      sha512 = "319fe8680ff501e100ae9b3e5a818d6fc69c1dbfff8e11e6ed55d9e25628b7435da4632e5a6b92758a0f2215d79f49f2aa1c1f98029f146af30e1be36dbd47ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "7f2420f9da6b68a461cd7345755b8968b55e7cccf2d89ee1e5133a11486f35fbe20284e1a083c108806f49f61070550222fd82898d8229baa64d2097f448fbf4";
+      sha512 = "a1826847c504931ab1554cfd4af989ab7046eefd9d1a28692a0b39bca390652d6e30d193076fbd59977460f5570b973bce1d0fec8c1ef6195ec70a836cbc5520";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "15394abfe0ff50a85714a601b250530ac8983bd456e6eab5f1cd6551ac19b283433ca68bed8f05874785eceea4e7eaa3eb442193ccd31c9e611cac43a20655e5";
+      sha512 = "3e7b49261d343eca5fb0828d7a5b6d298222e31066a7395d948f34d597642f1580e93852c2824d40262d142e679dd2169a05626721ed7185b5d0ae31759d2b37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "80281f638231443c959e0f8ba8c40a74bd96dc9d5b95a3d15d6a62b04fd308b9f3c4613685098da85d45d6e1f5b0f813b8e9b7d2b6f3fd655dfec5481d184106";
+      sha512 = "e9eb9c11cec68272ab8bb60f0f099c81e4de395736663f47a1221ea089ce651f844c16e3594b1ff39c8f60d3a6cb40a28b08e8df1ccb2d458f138607c3020aba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "1ebfd95939088082786a667284a30426fa98d490eb0fbb0cab1546b46f8f22d2e2f4e58b862c2f11b1c2f2f12efc76348f435230fbbaad8451bf7896f2fecdab";
+      sha512 = "e94899aacd5cb5d893482e99997262f021a8c4670f5696999d78f657d7f6edf60c4f9373efef9c20bd552d7b55cf335e797a6d0c7a975f7223d40ff7c27ddd65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2bb326166ed2f5ed8cc8c67607b817f9acdc760ff94b7cb5078ce45068ba7bf10aed568b1b6bbd68a5882103f490fa0c6aae1f9d66efe46bdcb606cbf4af6f6d";
+      sha512 = "e118054c8a2673cc771d4b2a3f9e4db4195ad487adc51a9e747545271bea4abb241ad264e474b30a03f88056477d0a26a3efd145a67ae2b5f9eb771d04c946e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f73757b9dd8fbe5b079db6399513a01867e3d910ddc35bfe2f7046bdfcde7687c4e90da67ed9fbe829d4007edd6e9745886a458d81da07ca244eb1cde67d9f8e";
+      sha512 = "fec6a82125d6c6d9c42dc36e18553570717233c5a23535feb8264a1f3c4fe766bb1d21def103aaebd92942d0d957810c3e3cd7dfae9c94432b306783855b182e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "60308c41f841ea80554ec084fcfabe002922aa86d67ffd9bd9ed654bfe94b3a5e216ecf2c05e7b409a21d7b86ef07da72738ee94e7b54a1fcc15c056b156d396";
+      sha512 = "376fd767808b561233b14d65fcb39668d66078e2ec7f77005167f505a7393cbfbfecb7a2b643353b4dcf0c06b736d86100ede42d235cdc1983b31648cb683530";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f18aedeb49d25f3d5e87a1121fd3ff42e70473666c7d6d4ef6006d0f7303c9b64568de36435d4cea9196e92523b5d808a4ebcc7bea94f68d90abcb19bf2d6f2b";
+      sha512 = "335007dbee3221ec42fa2dec5d7bfe4a9b4b614eb02d83ba6cc4c37abc6df1f9b5500ec65b326f06fb4225c65127bec8e3ab5d6824285c2e76e6ba5248d0a8ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "40db6321b4793a823b37214d08f4db718f84d4bd4737cd03351100b417e48cddb36ff550a26d7462cc793ce2aeeadaa0b72391701215873707946384e122e6a0";
+      sha512 = "dc587b11b62269e6fc1b02abc4eaf99ed1121f1089f5c42854fbe55abdba7ae44fad1893df6558313ce0c11377b47937bb3acd496106411291a9b91a51947ab8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "3511fe6537af25878518394f460a946e6013ba1ca56042070a2de96c637d9726a7e6b9ce2db8bab7972bd434037db76abff03fbd2380c893f5cb60b2a68c1640";
+      sha512 = "290d192cc9a46b95494e68e1f36c57d6c790554f3d1f05a66e8737a0ee59e26dbf53381a17c17f85c81a674292a4b7708ab5e0cd9f9f4ed8d21eec3bcdab0039";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "8884ea6d19ebe1091768629698fb7d11e34c9d011f9270a603b4530a0be5e8479abd87c2aca0cb6fbb33e944b22a69d3267b69c665fbb9b41b0e54e4f9a25c19";
+      sha512 = "9ff963c28b5a1452c9e08ae7cb5de82991c282c7e5a6621958ac4d797bd74647b9048dac9e34cfe9558cf16fb1bd84f55373cac7b1b336e2f65b4d9635aad3f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "6ec80a671c71d5995812417c17e6a65dc9188238abaf2fcd15d9494b9c98ca3495c4b9be35e16175dc88d93a32d51ef2ab5c8d58683ba564e063a0931d63c25b";
+      sha512 = "4378e5c31835efc3a7215ca74d85408e583e00c8979d4a3e5026e506765b49448d009e8feb5f2a2ba27d7db734d0ce3c0a1679ef1fc330e1637cb764ae7c8578";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "3c4ee32ef52f915e0a64a28fdbbc1bb19e80405b63a1d574eaf503431165761d8917c972cf5757b1c104c2cfa9f080ee3c4ba550511b51458f9f9f8894cd4abf";
+      sha512 = "da43aa7ba706d780420cda16d409425be026950a7c71c43327c8271fe6ff13cbcefb179cfdf3c1fe79cceae2d6cee6f9171697fb3bddec3b5589b8b1881d7a61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "f5af79d0aa476e21a93a077f94e8408b28f4a1835596aa34caef4176ab37e201e3cff3c13e96e67687146eb2c6b3443744e43e99bb1766d5b49b789980a6545d";
+      sha512 = "e31a35622a83383f00fc9defbd9d8e39e7819273d0698f802960adc094072427799254ac89f2a4de42070abb1efbc93b9298b4c076161a9478064aba44ca6b05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ddb0cf56afae0de194528dfbedc96714e221d43486907cbce6014731650d8a9bfe8bfc639e27aabd5eeef9824004c140511178b89f8ab46550822950e33608e3";
+      sha512 = "df75c385915e6316d8a4f9d04b4092889636e0de116fc2c33439047ab8340c3e17f87ef23dab3206197a2d807123f62efc61421770583e3f48268d67296cc39f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d2489d3e6f46695ef8e3aa12d01528a289fd687c5840e65d2cd4aa01c122b52ffacc139bff635bbb959c80e686dd8ffa1d0cbe585981048ef7b78ab490a53c8c";
+      sha512 = "2ae471d5cd45b4c2c5af47df903eb550d2d68910c4086767238d8df05027e9221a3619f810c816d1079dc1e0012bbb7176b9a690d229c8dea6f7a088b5fe19d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "e5dabfeeaaec8bca3e8265b395b35ab2f4edab143f14461b9bf63fb9e0261c899e7d87ee194e2da0d4695863c9332b6dee6b8f3334af64832664fafb4c6daac4";
+      sha512 = "01c936ecd336a2b29efd4a63c9f168da42a920a140502c3d5f160fa34f14e62b58a934dc5f102091999768bc2c37077acca8094219462dee72a91ce113f44bec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "309d35b7611336dd11933d7cacc78d1c94813ac6343dc522110bd153d6dffc29eb803601958735789233c0f0163a983d6ddf2072d730a2858a8de808db00e3c8";
+      sha512 = "af11baccc3925a2c877e5833aa0ee24673dcad71faa4e25020da1a62ec7fc3106036c46780fb48012358f8198ba6b56b7143e772427327c110a14c78eebc5b83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "de02f9cbb6f47c3fe16e081aba67c45290fef2c420c29399bb4f0e32c3366957d381190b918723660a7bf9425e02bb290841062b4104498af4ebc35bc3bd3323";
+      sha512 = "b84b2ce4420d4ad9e9e2417dd8435645c67a133a9594cb39df81c63e60e64c9cf33faa2b04b63e508696596185dbaf276b7e08dc27581f46afe10564ef31ff49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "079a38be805c8527e1f17e64598e90eb9e464594656785e125f9daab0d3355268d8d18f28c2fe9ab3e8cfa526c2f9010d0a3b8a673e041ad60a8f5b2b6dc3796";
+      sha512 = "3019e9b26b56a82b08046d3430556eda6ef22bfc576f704aba6a4ac9decc2f317c7a3fc0b1681346a7b9df7be335e899e123c50ab2b6ff6f743ef804a34c988f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "05a087a15ce680f8330070e5717cb32bd42fd7530b48917eb0f47f3608a1d08eb6e99834d20a7b51e4382c16e397ce46db166c49650e3d38112676e3d79b83cd";
+      sha512 = "40af56ea7072beec4893bf9134e16bd5693081396e7cd135e2e51c6cdbf0a7e0dbe6a8a02119a822c71258920bd42ffed1d7f32c0a4cb5cb2c4f7b749e645184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "2ab117abe127794aed26e5c50f65b7d32dc2fb8b46ca4766259df8190a33a7cb0630315b5a9d19a36a902f8caa2d33730a4500585ffb3deabffb65ad53ed7bd6";
+      sha512 = "7934f158163a28de2c4922f690c479d95764c36999d5df45afc56589d62c93aa3d0587535489acd0a2ded2c5ef9c084cac6938c20d08fda91e8fcc0b03c057cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "136b17bf57805f1c5523b8a170b6c0cf70b58760d8c3485d5c2d0bf6480acecf98ecb10de0b97cae79d8d5595b43b4289bbca851edf07844121dcc2e74c1e68a";
+      sha512 = "d7c383bd900e3a2910d3ae599a582b5e6ad26cb6c93618a1c4c34cdcaded45873f995c65805b417da425525b912d6e883455641a844aac21a2471b457c7a608d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "4fc566997dc0a55caacd5a2b3a1a8a4d4f691e593da07e19cfc1e47fc6477e32101a5de1d5bfe34741885589eff724c6f2886d18fe208e8e7f6eff5a65fab0eb";
+      sha512 = "48c076fbda7a15e7a36bde08a8036b6987f7450872129506adbd90ae554db50c4d543289dae5260f2358b63192f06e06bfd964a3796caf41a2cac393dbdcb9ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a5bf66f2f9180763534c7d5cfa51fa9d7c9f6b00e01c98245bbc836597f81bf0b07a11baa7ae4e3b5c49864f71f60caea673883d7c93ef3a5b3286b084c00b57";
+      sha512 = "cbd6c317d82a2f19d266381bbaa9ec7d7db0cf9c665d9407c36188f95d4e45a1c97df15b62590be8dbf60347093bef95021c55f584897ade06c3c3cbd111e18e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "900f3975c993fcce0a043989b9dd92d09daca5a0e16f601069ce56183407380685fc3c4106ba38733ad545e4d79487a945ddf192ace54db7c7d97305e7f1f96a";
+      sha512 = "96a88afcf2d3b20b88c3f1550b623dd844d6f6e9d86c4b55af5d857c11dc57b2000de3fa685743e465ce3b89288eb940a3ab8984847566eea27717c8d94385f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-x86_64";
+      sha512 = "f6b77caefeef02b017ee434b256349a0ad954eef10f506ed95d82dc56835c1fda70431617bde9601057928d6c03fd98642cb84a4be81a6c4cd0a0de418f893f9";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "09214aaa9c182013dd12f38b17db33e6b4872dcdb3105db8405bbd068163bb65546620692b5539ccf7bf477929619ddcb438593bd41929489b8842011307cae8";
+      sha512 = "746d3576912f8820fac11335efa1289011aed4681d2725d9f0d1c48001e06d01bdf704503bc5632061786e9360a00c85deabf905dd1a9e48c2fc8ecfbe32d6bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0e09950b757f8af342329c933414a8c8bb26e8759ff47281208f3cf4aebbe6ef8f230e2fae80070649897b52daabc695b4e47a87e4682d3570cd0b12fb4371b7";
+      sha512 = "1fd8b03e844fa4bd010fab41a36769bd3ebe2d09d0b4272d626964e175afb6564b8cc05f7c7c2daf4451edc468276f0d9b69e45d37106895efed75a8284ac288";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "dceeee73fdb4810363feb949792c9fed1e58cd99d64585a8259fd0e0709981de85c174b95317e9fc77667e73bd86faccbcb491cb77b14405553d271092b99989";
+      sha512 = "d48b30585b56ffa8174008dcd8f6c5f82269ca60990bbf5fb327392b4cb56df086f1a87e8027f6e523c36905bb99d9f136450abac6354b13580ebe6d9d13bef1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "111d579b63758bb24995b74e5fac69a299db6caebab05eea1af3b2e86ed12db1a7e7ca4fd3d55e2ee18b7640a316bcd1964df18f8da8753f2b7f089f88bf213d";
+      sha512 = "2ce189f455c839ad1bd701b6faed3dc408a74b463b7282ee09ed01f002b1aa105f158aa25e8b6dd8f26c90801af300961ad025ba4bdd9d1d588ba15cb7fff897";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d62693d19e7463639d0c06a9d07bfc34622f5748b01bf94398fe7195f5d9639344587d81ada0f17ae43f45fa8371f6558b9b468fdddf6677a6ac919e439ac569";
+      sha512 = "be2bda3d0b6017b777b078a0c85c51a77b8400132d65276c65721092f9c3602be0b9c136d630665e063cffcc081246118235181e89e41dff4edeb218fc03954c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ae41b07013bc8908282b6683f5f161dc1e7d90c7373f9b31897c25d7b33da2b7136dc6ff94f9e0b9112de334c3c79c3176dbdedf39f09f0eae1af7809d23b224";
+      sha512 = "0895b75497a40fdcc28663d3dae23913873d01ddc5b0c34192634b0704c7d81512a43306ef8ca25190f7b590cba8d753c59afed151a5761ff18ffca45b6623b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "91b1776539108dc7cf75c6aae2c07153f61ddbaa0a46755dd70e418d0540ff752d6baa29e54cde95aa7bc4c3fc4ad05ac391bb63cd13b8ae8ff54cc4a09e9a2b";
+      sha512 = "dad44023860cd62bb141467ba6eee2624a5184c2a26cd42e3564055548bc074db34ca4aa4f6ed27df02ebd560deecf814e640174101043b1a65f2390b73ff0eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "41b9995ea1002ceff23a785e5e15b8978071554ce65358e68337bd00fb32be101fbf6feab1734f78b665b6f3eb1b25b4fd187a328fbdfe4e70824ee5f8b4800e";
+      sha512 = "7e4a048f64646202b34b19731dd0923f41981b2f1384a7fd2fadda603159d724ba02e1a07d9718a8264a3975c9d778b7ea0c9ad89a8a57032b685489c2bb2b56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e3ef0842002689f2430b8a70e2de709b18690aa8e691494e51c032126302e0c661ac4fdeca11a9249aa6dc94edbeb4276be49c1c30707566d3f5b33737677f3c";
+      sha512 = "f52bb0f7241450beb5b4321554d8d974978ee86913af213246275a44fd2470fe8aa02b1e20cae770298da7381285bf263e3cecce7a59b3b5c4fdec59a03b752e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "92a3ca10270763cc17bbffb9d27286c029a1bbdd02b341748c098161a270b645e07b5939c6cea06d1d9e8c70553e3df887fbc6937f01b336e1676d35e2f15e8f";
+      sha512 = "47b8df4d387f1155944b575cd99a5e3dffdfa241f230c9e76cdfffe0c37390713fa0c64b87f42740c87efbe52fde49f36680f549d953a2977f9db2fef0769980";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "462c88a1112a75404782c189817f52925c11d3e0e46f193b9c3a9446bc01a7675d222881c563a1217971a1d5c7b5f4780b756e6913e2ec96034a0fcfcaf53634";
+      sha512 = "bec6e7592df7cdf1d44b4440a54ce3e7b968dfeccb055952efad14fbc0c40c098cd99b41448fe4d6257cb2f292be0bcc2e3345b851686ce15b5fd1e4be3e1396";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "7d0c93e02f1b71ba5625749c0fa39e3f09349cc2daaf8161248baacdc41794955fef74d5144730972abf0e20d8610795feeb9d47d1419d397a739bf52f3d794c";
+      sha512 = "a26868c2dc5b489a6b6c4085d61d4ac194450f0a987751da1d43fcac4f0a77f4f2feb158730f129d630fc2d3ad09ac2dc7c21a98cfcd7ebfde4f7c1006cbc9cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "dc4271095f23a32c20e1ef7b9356fa5d28feebf6347b31d137744bbb565433b8e0fd6b811a2d0ef024405235f2747875f0457e9d5fbe35467ced4e79852d2087";
+      sha512 = "003c7056023bf71f3bdff0da37f8ae66cb8735598ad6ffe71758cab1dc51f9fbd6abbb82f94b2d783d5298354778690e118977b324f96b7ef4b77870226f6e6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "7e4045f5daca691b38268c721249fd03c43492f1b523465fb5fa9b4652c7d2681f908c71e204916a016683df2423f2f567e8f9f34b836494eeea97e412bae465";
+      sha512 = "1ed62850e036d808e121164a5ccdab32f2c8a25b14b06e6a57a869cb35912a9c64ab61a56820db913612317a3bc0ddc93e2d6a8b1e0b43278aca361742f16406";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "cb2c3763f087f8478abdc8c40e272737e4e3f4bd5a4c9aa39de8a54f950d970479824d32afb21f3d78dd345fe8023045a974d5aa5e4b5169c885da7ce57f668d";
+      sha512 = "2cd3d32932c1243bdf58f1ed138b23f9e954a393f43539e9c01fe4348eb67efc1879d803d1e566dda3317b87c1ed9647c542c45b6c31c9c795fe696cbbc22292";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "34290d4dd472fbd0488882cddc9fc107833a9124d68ae3be554187bc1418c4614d6a3fd0afaeab70d70f29ca588cd6ee3393ec1750590fffbeb1171d110da373";
+      sha512 = "b3e81e97920ca93902e7478ca749f9138b2d8974cb7e7d2496ad29ee82c40cd1d7c2230861d02689ab4ade9525823e52c7c736457cf1c3279dd1ee6ff3876f14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "866b566de668a28e7975e9aabb0122afc58e7fe8ae8b2200af9f1118bd279d03819ab8f8e02ff3182b741e50adac994de33edbe7f611eaa80b81c471ffa0fc75";
+      sha512 = "39779c6af211b751095ffc93c8ddf6402d545ae139ee6f5a492ed8c3b765cdf9ee626045cf189dc908f4599bb3054cbc26e70e24fd66fdc7d44b3e8631f93e7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8dbdd85fdf77c1e8bda711e4400048b42341b34d21b68221e658d03c119f05e78f870121a5f60c354163b797c5fa4213b208a63b73944fbde35eee2728d04a3a";
+      sha512 = "049c3602b06b9fc825e91ab51a7a8e1e8119e88cad178fbe137cbdbc0ca6bace8a3192970172e757bd10e608a030b5f5dda78564fb2269f2468661d95dc8daa1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "e537f0d5843b26f0e16f8c0d2b7930b604a6a2d208ca87cc76bd8b11bb18d38cc8a247c6601c0ce607df0434534e898ca1cb73e062b8b7c4a1cb02c8f41b1ecd";
+      sha512 = "7c4bbdc7edf0d7ab81f3ba959e7ccf9d9df5e6f2f5068e23bd4dd9326aef3124bc95c2f70374853a2ea3816a6d94d6c30db44d81e2647ae5bab8a84bd24e9474";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "8169a900880914dbf76027f3e7a8b7f30a00d729d8178e30c99a108944029640ff9ddfd81a88dc3627c704cfdf2a97daf5cafb6434ff8dd342d27eb72c3d8c1e";
+      sha512 = "67aff8c6cd90d9da7a3ccc84e17f064e57167c7fb253f919a1a64403e6f8e67c6ca1a578a9266f9ecb5b70c6cee22f413df935dd34d2ec349f364a69d843d9b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "8fd7b1f7cc80978f6d0658d265883bc7a4f38462ccebbef8ccd537114b40bd5eacf3195fb193059cd9e1f4a5c926eac5d94bdd611afc1e5a738688461b714ce2";
+      sha512 = "7c2248656469859d2dbf880c94b4bafc62e62a8c84cee589b5837300074ac6cdf95798f4b9d810178abcdb1005d47df6681ed3a414b0b3ba0a3ce90c9ddc53fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "b2a4c15f3b2304ebfb809c3eb654f53c13837feb9ca895c1c8e24a823ba646971df1726ea7c49510a8745f34fc6fbd004fa83b00752bef18cc7ba4f928e34a7e";
+      sha512 = "f2e22d21d78cc09fe834b2e3ecfe33a648340ccf26c76bda307a1842e87d9fbee91fa86a6dab763a477602559fd777078e507445542099885b9aa9859fe56d8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "dd8cd6dc52ff521b70daa4a2b4a67a500fc6149d23da635b453b3f49e79343a64f2cc9206e0ce58fdb2598b3240e36e5180a1ec1f21be5b47251b07eead7b363";
+      sha512 = "e8d45d60913daba14bfd527a6e59fe3b2c028c47425f89928a4933443e3ec608ae744db50326814cbe716a35e632cbaef8573ec523d41fa63cc1133d12227b96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c9c78d72670e5e707bab9d53c38b542e0eeacc9ee4e883f9096881ccccfea339e24aca35ff71c1b2f0bec63396309ad55d65ba42fcd0fbb4f1a3876001412354";
+      sha512 = "c2a32a8dda48dd2e4e01ee23231788188050550c44812460084eb7dd09d042e3af0ae11aa6bacb671046be1effab018fa0a4d601e583910c4d8c5e269963e763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "1427b96d989c898d70c4d8419742a6e647c952951843aaba95668d8e4a02f7972d7e2f1940417a6c605a53f23ce08c52338c1f4ad605256baf4908694281b47a";
+      sha512 = "45e996b79bbc96515b8d2e767a92f25d5814fd035185e34ab1b32d1f319b908663f6334a1d95a0f34550b9416d283d152feecb47f4ee50b40560cde226dbeb3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0a78c8076b21ce6ee385aaf85dec8ca6249eae73e66209003765edea31660f3707cf3ceaea55d75db08746a6a4636ea8bd18ac3a0c0b2265013c501c71166af6";
+      sha512 = "ced9591c578ea8b335b01bf3aee458ae9254e1c744f699789fa54eeea2d8918dba4431ac65369f86e114f2be597395bb34e466fdf5fd291b688a00d99745a41c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "963cdae76d22bc167d5d24f6c6c12705dd095f837cfbac6729cb357bd3a2e348d1841102d969e1446c93b56099087ac26af9454e72126c6d37eae2b1af9d437e";
+      sha512 = "b560c780dbd0776f4833b037f81028ec349681682b6e575229e7149331026356411bc13ee743c0037fd38c15bf86da39756528c432cbdb036487e91ba9eb714a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "5feb546e412702ce7dd12b3d81bf1099499ee8461c4d3ef8d0857b9516b6733902e4c554f43c19bfe36425c55dc98463a2e4f576c5ed692ff23dde051a24f82f";
+      sha512 = "f967733b7fc05009d65387e7bb185f64ad33e8adb659475f4f995f4df686ca47145ee841390834c162c604b27185ecaa225c9ccbb011dfd007355f495403d892";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "55208a195cb846401e1dd6746157d6dd6fea37fa179be33c73af28f4ee2e2a4ae3649ab022dc20c0f678c0741f33cce6cff24bc6383689b804c5c770e648626a";
+      sha512 = "06f27ac999ade5ccbe214052590aead3c7fb07e93348b10632c044c0efa4bffc1524e72c2e96c4d2ab1adcc112900f15f36f1cfd943b52718be6c78ee718c1a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c4e185972857b5e47d6199e89dde4e554c2b636b67cee70be78efd7bd06d6d0efca50309000258f7c499a3dbd5e38f1356c362f3602ee2604d9fa7bdb45e8fad";
+      sha512 = "13a99f40d7062438671c1f1700be98b88b2a612aa88ff546e9c20031e5e3c8d2ed78b801468c63312d82cf91bcafefe48995c57bb2a90c113282b843e0c5c93c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "8e2c8a07665b989389a443539c26017e81f0f88ded862d6293f801989556fcafcc7453d9d6a9d379eaefd7987b7ca3ca365ac26feb672a1bbd1717970b6f9e5a";
+      sha512 = "15427ab80ea609ef48113ae08ffc3e7f43fa375c84d6028b361a38a128a14ace80a974058d1b748f31c308ecdbf08ca9bc3e509db7a1e10ba60421247af26932";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "65fe275638d5b0b4c9d597ea024665ee75570c302296e1b8a4f5b3088ad6f23cc094f9099085ace25814663787bc973339327c1c3ef9b887338f81bafcaebd4a";
+      sha512 = "91a31afcf25deb27bb9ea29c1a859c2b6057f3421ba5cbb971e35b79e76856b5ff76486dc449485fccac13258f004d967886caba10c8531ceaa9b9f867cd0c1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "e822f84cecb6b783e6cb3d5bbde521c03d73ac9597533217173f84a62d4fdebe1cddad7ca537b7982498842d333f9e03a41bbcfaee21a7b6d1a4025518fc47df";
+      sha512 = "527f8f14114648dee8079a066bf5baf07d977ace0f6e7d514f0a494aacc7cb91fa0456f45e43ae167537af5f038ed72e44b5b985fc3ddc01a7f61871074033cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "3f682a589e8701c4247aba7d79b2606ed94627f55ba2d39c4d12b97c2bfea9279844797fc79130da59ec04c9e05a722ac3a3345acc65db0a638329e136812053";
+      sha512 = "791e69665bbe33ce84be02caf6f3b304a2012affe6508426cc4daf944c6616e613062265341a3e78b75a88c4a9d70ea5cdfd829d082189564a8905eb6007e86d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8e9dd34afe39d623e8015eb63d6f78f20aa22cb9c1cf97ce0279260325c86f1999fadac0b4e622a55bef1e994ffc6c3e347a91ec1401105b65e0dcc968c578f3";
+      sha512 = "8121500520000276549b13b1179e817a7adccedfefce8727ad3cd45f3257dc404d5a72208b8393fca56ba2d00d3bd19e569ace9b14abc09faf971211c4ce586a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "eb0cbec48a71db923ca6054ec3fe908a9c60f7a21f74e6e18e85a4d7390f5a48c56c08ebb36f57b36bd517446d62a3ccc7556fb33c9203dff0f90dfa020b79d8";
+      sha512 = "f72b870b007c5b25344f384bebb58a4034895d5d7a3f662a8262660f6d8bd4238bf6bbb9620264895fac6991c7d004375c83d37f5595104eda48c4f2df32924a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "bf4300ef92802f8c635aa543156a2310379d8cc8bd1a1821921e4152ba1134b9c72cefd82597499ff3dee3b19cdb6ed7e264628499161ad07497a3e3912603e1";
+      sha512 = "912cce6d5407107b0c99f44229746207ac901c4a533f887e41214ff46aa41f3618c7acbfb38368c67846bf6be80b9714ffb4dd27d1251e19e538abeb21861956";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "aca08a08d8c9c77da57d5aa0f9313c0bc9dd5dd766381c189c361ef4b311e49e462f70b6350dcd9dddd292d0a3dd295f0180444d607a9d33eb402242e34c9ddf";
+      sha512 = "fd344d214b13dcf70f32438ddf2d4ccc9edd58112ff4cea199300f2d59ebcd6ca3a556f88c5dde4bba9af27cb570c985136fd2aba47ef6d9b8b2455a09a44c08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "56334e40e7175a49b77dc44bc2d915ef1836c1a67d71b2449f75073a113c6f87361e176defd412bce60f8d687aa07b527e5588d164e1177fb139a077527241f5";
+      sha512 = "efb5d9f802448e7d16534a586225f1882d429822a595789ffb01ce92d047777ff541535fa094547a1b8724c61acd5a49ea31f9bd976c1f1d5f637ed08aee0665";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "dadfd68b729ec9d8fceb68dc1ee65fd0f00bd2135e8163c993cee34094110be3cdaf856f48c16a0156da395842503bf52a5438795c56caf9d6ea5f4b36961e1c";
+      sha512 = "c2c42d915ce9087bfa3748c4aa1e2a5481174a8a69b3c7fb675c6e5c528c3ed13b7d85a3aace049c75a434f47f35105cad724a94f0642291372e0dd82fdd4abc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "bde96a0f22c762f7d7a877ecefcf876b6161326052110b3f8efb61a67954b93d456acc854901a9af9857005c622ae9d557a647a10fe4e8df6399ee4bd889bcda";
+      sha512 = "8155b335afc8b377e9a4cc12507e0108e02624850211c46e1d9af13488325c06d14c67c12012d46bcb95d0d5f3642a1ddf93161fb6ab0e87ed8a56a82bcb1aa0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "1174c231b511292e4528f59458f26f4ad601b2b4815c30322dd5e151e2d24e1f2fc244cd512e2bd43a46436180f83b25db61f3e8ca38164de130e76fa3415429";
+      sha512 = "cddf96afa80f6935f018b69bde2368f8d4aab03c2669df1df136419e6f9dd7de7c0662530a696f1ff164837225c41a92ea5224c2aadc21e45db8341544c9d78e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "02eb16c001278e637df52a28c5ffa9fd2565ec71b163cddc1cf0e01bc82895226d746474cea36317a43cb2dda7f0bb1e7ea74c1101602220db850bc8b238576c";
+      sha512 = "b8ccb59dd3723b71cecbb1a3b47083f718f39f3f2aa69d5819f99d58b8a9d42902df04712e7aeef34401721f693e2a30b68353df2cb7f07c0e462708beca176a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "58738db35718350a5eb1ff0ebc1fa6a7c49a4d8604fd60bd5dca6fd4718f49ab4817abcdeb30d99d8a5a0eca5374b17dca28134d554eb608c030eb0d2be59cf7";
+      sha512 = "7b2b6da809040f1d0a7b89134a8a9923ff0e43872e5c49a22866db5344e0021722ad38488f11df51ac19910509f854ed7e316f88cb6b03714668e7c580438271";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "3b2e2f745b61a182a6a1c4b1a236e6e3639cacf0c3034dc5ac510e0595cb636b728e8c6f39d5e183a181f54788a64f19c7f3e8288cd73929e4a7b96e760a714d";
+      sha512 = "c4c90865c7703935675619831db10a1935cdd995a0dde10db022890fd31b02c20387157d080c7724bd1e67d639c434db9a5a53291fe0a3c97b07083b909b8714";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "f05b7d0c56278b2d4644ceb542efe21ca4a548725ba5162f82b13ba9a122f6dbeb71db227a413c37fd05590868a41fd3e77831824753b140a763514c16aee76f";
+      sha512 = "30d3720e3ed73c312e3d0cabe41bc95df6769a1b61bb9eefe8da358bff5fb2906ad7199f989242a2a8ad84cbc30b3ea8b4dcc8cea125142f1588f50ceb9551ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "af7f98c5461b365724b81b99daf054b5308933debc99cf20eb8f4a0862b27b4024934682f780c09810333799ab297750cf59b4f4a709e0387f8f98ef4fb9947b";
+      sha512 = "4fc63a75904ddad55379c7f6c7d6fef3f882e706c4a6d0cf27e990de5ff0fcb5b852fef3777f524e633040137736cfb1548f87f517e52419089c380801183126";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d8339bfff4843038367a6043eac811138a9d0084dd6d0ba92d0cf23575a6d9780e071bccd281440a496d3d8e0f8dc0b25eca685a3012032dba1bb122d4212ad9";
+      sha512 = "52f0251533b86b39f8ac166de96995e94ed1797effbd74cc487cf8fd42191fb98d04ec099ff850f053b9cd4e4c5188cb64673fb116db1bf18f43dcdfc102f102";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "3b6be53409502fbc88498e14129c0ba9d68fed4bdd68833a01fba16d75d61471eabe344a3be487834e6b36205df0584cd09724c650cd2510075a54ea786a4cab";
+      sha512 = "6356befb14fb2a1d244df872912fe339ea0b2dc5148236a71a30b3f4120910fef56abae24e35eb871264db93abf1ea045342881f29e8098902935f7751351754";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "d3fdae13673f4f6c2d6d0e675f2dabbc9880805ffebd03c531fdadd0ccbf7767d434ad8f8cf5c50e385998cfcd0f16433e40fee9b280784eea815ee14c846f70";
+      sha512 = "5522edbd771cf7233e8c805d45610acdc9832a4d76a4c5951f8dc5565810ab8805810e2543a66ca36f454e068411e573f73de3fe21e34e6b32a3349de869c9cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e9d2468d817a93e73a5d547442ca5bd12ee0e7e030b6b63d4d889a8baafa566db6c5a5f8bd2aa4411bda49bf0f8eb0af6f6845ca7297cc0b2b6f5dd25326021c";
+      sha512 = "34a18384fafcd017594b94e8970da2d3521c8d90f3afaab0431a9a0d275630dd64adb892a8609a518217f097a3749ad65db646428cf28bcff5c9d6a03bdbd2a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "173de5049863b8e291fbbfb4cf1d7c04c15bf3b48f9eca1ce3759e1117f6fc64be3e37cd0548e4ad4dc8cf2be8ef6341b7745423a5e39c0d882d040ae9f94623";
+      sha512 = "b518c72b63ebea3d30575548e8ce6f15961d0891918d8e83996bee2fb9dcfd01fff9be4340b67733b356f2b77c0308727b2911317832099561b3e2ad050296dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "bee968fbc414f05b467528c398d8884c0ffe9390fb44c2c9a5d7e9807f63bc58bcd11078ca7db4e98dff470280b066ebbe605f5600d8e43782166b23bfd2a0e3";
+      sha512 = "b1beef1b4049c8b1c828ab1e201161edec47e3e83da40173be576a17d8f269edbc538882f7d5049401cbfeba409c5e668c1781e2a519b88038480993222f01c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "dde6f0790c19fb619dc408eb3a6a9abe8cfb749110fbbc8f408460c3181755d408a7fefe79c8041187891ed45ce374727a54232510ebbae3e9620d207f406b27";
+      sha512 = "e2c4f71b6a8bf6d33dc76217de9215d21f5f1d1712fa981ec8ca8c203895c7ba94190b7be51f89c9fba03148052727cf76449c6130e33ca2d4965ecb5e4194e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "7794d4152d2fdc6d28d6c4607841364fdd5211eb7df56cc0c386a581140d16fb94b5fa26035f9c1b45fbeb3dc02d6fdfcdb51576599717c551416a961ae8e244";
+      sha512 = "136d8600eb4635213d58f7ceb0550d821e937275e849e3f1b7dcc7e7aa4b4d8ad497947187f6ff5979ac5bdd2b677c20a2a3eac7029081436f1c6707010055da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3984aeac5f5d27d0a2e3797b91dfa3b23766fe742fd30b8872bf88010e8852a2bd7390c6180ddceb4685ea3f763ec7acc402eaf11930769c28c8069147fb01c7";
+      sha512 = "8d130eee3db7e528bb6d82870f29fafedf28ef474ddb4a263c41f914997a5e607e048ebe438fd16f687e824ea6917b495563034d4459e1e53c08e613948906c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f4c38298ec6bf715011b631151ae599e94546112e50888d98229818be9551f9c8dbbb4664e99b00d17640406b86ea9496d59fa620fd13be850ca77994d50d9cb";
+      sha512 = "bb484ab3c756bf1c5e591405fa22232f5e0b32cbaf0c0192edd3ff75e80a9f7773edc506c601f8b11593811c14636abff7a50a1cbc0944b664158543b8171052";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "49e5fd356f031bf60952152e4e7fcd0cba651a20178d220d9927089639f783d2b866f79184015074c77606209a1c0a455554a6c9b454c21b46e3a9f083c83777";
+      sha512 = "618668015e76163856467b2603000fed75505bd9e76d1557dd290b7a92da467280ab9ad30fde78f004ab60f883f783faac6293196ed9fd409f9b854e0ddee577";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "29c96f619912254b644b479e60a38f1532b140cfb14b83c09e9b1adabbc95ba0b11b6f67b12668f194164d933e1bc4fa4410ceb33ff2511096765d2b447eb434";
+      sha512 = "1445d4f5750b9100c5340c354c9b6c67dd2be5b73500c70def5c1522d0825ff808da868b39a60ec509684e77bcabbdf0816666f14b2dab7d5f48c4b6282ec1c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "80929d60bf83d81e732f2dc0348cee41f43568c8652d16a96a46ae10107f155fdefbd7755c149b1522083e54b96c1fffa84e21007f27f8164663360d662b0c5b";
+      sha512 = "388da3ca86d5c9ba4adbd3ec90834941e2148c57138e6973628caaaa32d44ac8d18f8f2fc584dc43f0302c4c3568d2b6cadb94db40ab0ff24020e4fc3cb4cc7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "313722edf4b082eae40b4eeb2c5b382606095c84e0e112024d07552e1d9ce3a4ca0fa39679f574b8f41074e7e850a94db034b452624caacd98aa3d837662b409";
+      sha512 = "62423703ead40cc91179eccd15f9b4ffef8072ce4f236d3a1685ce666426f8a0bc670da82f360dc8c2dfef4b927ccd408a4466b7382999604abaea11626f9149";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "2b819cb5bf8e1fb80604a98d134a94de735782b8539a89ec4a542b7bb5b795cfad173b26c66c77c9f518ca1edcd3b3946225a7475253bd948f44939453d20d26";
+      sha512 = "162d7d4ac4baed3c16b119ddc5f3b0d71dcbe7e26a3977ea375776a033a9995be45a2069bd50e8bc378168731c983f36bb8b6b7f5551a1e10bcc1b9b3d471b2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "dacde472539682785a79ae2fc01918ffdcd23e630857bf0dffb13eb53651217dc081b8103eccafe62db7b5aaa36c33268e8378bef51a01111249718251b4215e";
+      sha512 = "3fa114a52582387ba51b04729c1c4895b29c33dc743cb9e4593750389cd9d943f96cd127fd2b49448fed527bb1bb36ddf4579ef78502f66925627277f02e46df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "8ce645014642c907d309b965aec5d568bbaae65805a8331ed4726a9d404a1e8a243763c7a92bb85295a541767305560a2e1b5bea93ba6b2f96341e3587105a29";
+      sha512 = "62d16ba8dbb06fa54e1f4d6a383959740a466bfcceddeddb19dec45ace022ed272913d4096b43050bfef3a53c43329499794d5abfa9a6e911fd35a0f8df31cf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "729da9849d664ed6e2cbaeeb89f8b81d1de29b5f28d599d26e0d14e9d1a2daf1b37c8de769435c2dd7a88d8807f76ce7233fe629b0728ee063b02828edf8b984";
+      sha512 = "02fbb3eb9f13a8f340f5fc5c340de563041bfbcd77bc1f7f701b5b5eab6463bce6f3110e962e4c1a0667f3dbadc234511c3ad35718e3d84ea30952a178f56e7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "f4af9658e7e0074ffcbd38ed9c2a8a131e279bc67c86da47f3322d30c5051c4b41cee8d7b61bb7faf9993d8ba41ad151681621525f92b50b88e4680246eaf2ba";
+      sha512 = "10f64025be270572da5d3e35672b2656f902e896bb3cc7fe24e99b514c4647727308609c9e572f89f836fda677ef00b6a3be4ea4844d966437d53124605144b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "30218d1a8b550130520018af0079e9abdb4e78642fceeee25806f739ec079f88a5df0740c44828678d865a7ab242e6805a7d632c41fbc2c3b84f44fd58fd9cfc";
+      sha512 = "8f3db73e145bb4ddc0606bc8adbd228dec27b20c6bb5227897ece926df2759209966c61a2b67d4e6618fc205616c187dfd9e26e63e09ca761b2c9da3d53c113a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "809baa75d75c1cbea94e9934ed9e445d60f3f0cb37b9ecbae851c342f0477731de0fd5f6170c43863035f5e2633ab8cff960729a9f8594c684b23d5819192ee5";
+      sha512 = "f497c48ed108134f02d977eb7f0f9577eddaebacf3f1d177f95b1e481872b94ce9f6f7c5914d6fc1c0464fe999670dbd3a2935ff76d139b49d529b87adbce5eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "440638f35d07edbc4f854924f60f22cb4115634d55e2847867c11391a950c3c792afaf2e35b3090764acd8512117a1a04e77d060ca2d9aec12638d00c2032245";
+      sha512 = "5a827468b04dcc308384e95017980d87249082e894998c77662b4d455bad5e8f91134e9c88ef159f89af974029302249a898ec932e01b4bd4d62c0b79b31718f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "df6b3ab4c53799b6100722fad4f20403d1a1e659b17d66d21f65e98e3b335b0c7ae8a9a099c44bc8952359dee184f9acff836bfecab6cc09c686a7bb3d9d6599";
+      sha512 = "f1bae26c1699036a832a021f0336ecfb8b61a378cf62ed6c8cf10c3a65e6546703474924b5f7145f30c2e9a458545ab6bcb999320a04bbbb65022731a23881b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c3ffb3eaf9d86a42ce281f97cdfc942081d14bc671e28543603e135bdbbb527a004af13df9e7cfdb1846c9cb42d4f2162b8ab63129eb447433ee5f47baad3ed7";
+      sha512 = "3df882e3542af5a1a82e344cde5f55f852f863ec652eb66f49e6f6145cf2eab3ea3b7f5a2170e4ad87a5dea0264f5002eb8d74e4e6e1662e3aece695ec6e405a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "7b1f231f3add4b70b9f1f2d2801237dcaca17e4d0b0e0ce5934a617dd73550db4b36386b1997f835bd4712313fb9ce1752a3a972d77dd0fe8f1fe51364048ca1";
+      sha512 = "235ad09d75274a5299226a99911596b16b6b3facc19a896865dfda2467d2352446187a1ae6b64259ad41089203313b76d8486c869aced85bf8aeab692b860879";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "2d8d1b61a9609d5e69b031e51428cecfea166b8bad1e2c928cde2aeff0a5a105547954235628f3d67031ee6b150d800a2dd09235e69af8e61a5046a80d74cc38";
+      sha512 = "b038b36b0cc8d0be3bb02b6851e9246bb849ba835cdc160c48c53df9ea5e937e0ed57c1d5e6200b11cf7c751b2f0e5cb69543d2e781852a9ae7e612a88a78b5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "a8045c13e33f28c136923abcd2131deef56fce717eb0be77ce750f80d1f0617b6b86cb3b123eb2da58bdf543209cc6b6c803cb3dc9a53b3cc6e23c98ce6b678b";
+      sha512 = "12184beb0c93718200e11f17ec53f71062c443881482a2406d558f4c76652e81b2c3c3b9b5750a03a06fc1460a31f0146062e94e6a13736d7654649726c2914a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "4e89147ebe166243ef1a551f7943e3fca44d5005f8b8386728c3d9d82352cbdea004467ba7ccdeea5a4710bb34605217ee2577e1f1c534713fb52fe55aa0bbcd";
+      sha512 = "0237960a4cfe37ac6c88b9df34396c19287c9d8fab62ab6668fd5aac1e2277d9c1a8e468379cd8929a5ccdb5e86828ccc0fc4a33e306203989764745256564eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "5a94e9fb47ff68a2f5a07100acf573d974222446bbea110e11729286b64e59d1a1a9df91b93848b47fa9a8e3e3471d5d4973872ec1c6314b3a76b852459574a7";
+      sha512 = "01acb4ca4726ae3ac8daa21aa0acf33fee71777f5dfdf496608afd8bd33dabb3c84bda1fd9c13230bb7b8c956db2409821f89d4122d9fbb29d8678cd8f9607d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c11b004d02096e950c59f77ada04ba557ac37e9d95994a105b0bd76e8a9193a0e66f0a3efbf724fcebe96e77a5940704c284f79d48f8865ca1907fc2bc7adc1f";
+      sha512 = "b2384c56a236420ba479a8a3e24ffed3b4596e8af8e46b868e718412a05317faa6bc7e0c39410931b31cf464f24300aed3e23c66a7cc3871ed88dbdc31c07aa6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "9d98fb24d1c705246d2535a1bcb5ee38d84930ee609d15d350e3eb8bc905d1103e7e1f1cb48642ea6e6b99531e74929497790549e9ee9ef9c597bc8f16a827a1";
+      sha512 = "d6b9e43c73bc9c38e93211abaab22e4f04bb68f31eb8351fdaab6c45bd7b70fa56bdcf3bb87901a569ea9917b59d7054bfeff1776373099268689238136dbadf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "767d109b2e7bfe89a01b923c859d6f3d3f1050922cc84df9aef775cba990a2808bb839ab1b2431b3c6603b41d0e757dbb64b1c766ee150aeb221900bc9e0fedb";
+      sha512 = "d5e303c5182e218e3e9173483e32160e78c9a1ec812142fcaca35f970a043a08d6ecd8e0a4de1ce06fe58569be456d2e44ec5a3ef234d5ebe4fb9c8521d4748c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "3dc103b9a807abf43816db6ee9bcfdeef31dc21b969762a7b1e9f4fa06d5ff6a57cff134382b6d1d578c80d4b902232a7cc79642a68b2e26680887ee172ed11b";
+      sha512 = "2b32e8f2257a4fa7576bafa69ac00b149d30e1114a0a174848deaf4cadbbd6b7073029515ae1b1e5a905bbd2dc53346507e8fb8dbceb625901bb9dc44da3ea85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e7cf35aae82156bdb4dd023e5a7530fa431f41c0e4f270aab89a64a0aa02dda228c92dfc7aa4ff289ccd256c543bfd74622c6d44ccd5b48ceeec880b394d38ec";
+      sha512 = "53a081d779acd8d10e9591c929c5bcdf6122d5a9f53a9b496556d4a4a7efcfad783ace2a99af5cc11ac295b16e1a055658b1b2cabb8385da2a99494f41280b91";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "03afeff083f483b274a8526a4418dda8ce7c3773a60354aea26498c7f006445bd6631357213944ecd6996a5a4508b96797d44f16eadc5f1017b7fbc18d0bf3ae";
+      sha512 = "473130d04c3e559159c9801d55961fe261b8f45c593e7b869c31eea4c96f4cfc517a35c2f505c8a45bbc62405bc04d9b1d941614f6d9b3dff6eb8a05d50ed934";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "a8d2609029d28f8d2b59815bd8149a2473e06227fe710c77e2e72044663ef90e65105a32a7ada47a6d889d6aa761dbbd903b61ce8dff8100b052b54f35f86b28";
+      sha512 = "4f0661375fd0bdf67356c9b742095878e2288324b23da18c0f9c105c6c0f7d0bd8d4920423f4415ba9b164417936ed8def36fa945538599ca6544abafdade820";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "1d073bff96a15bccf6a59e11a28eb0231983a0392069cc785ba8760827ade0e52f511040941b8e142c6de91621bd928e218ef4832a95439102644670b9be3a9d";
+      sha512 = "cd861dcc4e17ea389a42deb66feada2e614e91eaa8f2911de2c7e7fd66257759f937fcd96b2eb976ca7c605d7ad37cc3648bf67ec944fd93407ab9918553a6bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "a69b4ff3b9a452a56e4ecc07c09d6276b26356bf35090cbefe9be419ce4d1a1fd772b7013a13fbe4f39fea495c5191575971db5786d3c1edf1b4ac9acac33323";
+      sha512 = "f1c0a5ecd076df26dc635bf0e6f6f43e4c00135f914b9393462efc6d969dd6ccb662df1c8745478952896950dbd216cb4dc88e0a1fdf4608a926702eefb4d835";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "987863606a8f68fdafc8c61f206db6bd8bc358157f28631fea598872acb5ae0ab6e56259134ef3ea46f5d74d908e49981eb6e8bd80e32a9cf1de77b6086e1ffb";
+      sha512 = "2856270b337da7de6be743e3ec3bd2badafc14920a46d11e2b260daede010588c9634c2badb7b402b0247fb770f8b0c869119a1be8719487689ff48783c35753";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "3466e0bb5ebc426bddc9fa70f4c84b6c07e997119c707a3638b726c335ec8cd58fa9ad038528de4366ac0866b4e535b2a6ba307c0bd42a3590f55ffaf6fe7032";
+      sha512 = "95d8a14c884976c31be1230cc1f08706b8f1032d6727b0a88eddc8d9a2b1941da783d9113dba9963f5a3615d515a7906906779f8dd0d445220ee6aa633c2f6c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "427060dbefd340c2e5e0006b88c40de5a63786afa7dc7449b11493faf66acaa4c17dadccbbe8c44ba4651a4a44d65932a9eb17eb79280e4cbf2d10696077bd0b";
+      sha512 = "c8f5706cb28419c2ed311b37dd4391898e5ea55cc70c3da9018eeb104be696d80e9eb6e22467601e44b3b11d48695479a9448b97b06a37b63d042f22056255f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "d4ad81fa8aa8ab44b63421d16d7cea36d900bf4d374e4c5a167c46e3480b459554672815cc9e54f02aa3a53f1becadf675e730799d57bb4bec4e245a78718aee";
+      sha512 = "db68dedeed06365f5378c91241ba21474fa490234ee2f0e8ce8d5439879bc7e79a6b8a81ba4883c5b6f9eeaa86c8fafb4079681eda5c7c1de13bdb7a6587967e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "c933f92ef6e972c2ede1f67852dcdd47e7f59928a3569c7fb935b538f8145185e2b460242feb6ec58f064c6581e44c046d568ceb1e96b5617821aa1a5cdec7c7";
+      sha512 = "d450c55f00b33546a37cc96b2daad0ff9d9bd74a4c8219fe2e584e683a813e328059851bad48f597c60c0e5afbd15ff5f2547249e9318ed1a4198f8db43ef653";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "49318119e82876c99741b7829946d124db7bcd4833e014996842399bb8cfbd4f2f3374d4910ff208cca558da027dd6a6041c2d66e4026c6f1df4be199e4b9d9e";
+      sha512 = "3da1c044fd4abad499d44fb4e30942f6e92f0bf5b0bc98badf4cd7a4b63a62bf7a6752483964112bbc9fad91ec87ed40cc64fa5cf9c14edebcce22d78600e352";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "2e5e74999bb921e1a78c491f9794ab04efe4f069d2403757797e4aa408c41e6ff3bcaf9d94f786a407fdcd085ce57654a1e7aeb7560192827d6bc01786fde7ee";
+      sha512 = "69090fa168e4acfd16bbf9c0569b2d537570cb798b8d2bc5da26911c1030063ba0f1366b6453810c31038edac5fd6fbd988efec27e923d08ac61a2e2f654be4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "a50843752c15dd9ddaa30f51188a4992bf9624f290f3179a95a93ad09c3b5c0080ecde02005264c7364de1d072a73a40159f3fd3b77c481f5f301604d1042db9";
+      sha512 = "86bdce82f04c68e32e581d32ea1dda301e68f39a93d762d4e40a85def20490d54cb62ac4baaa4770236b098bcada9d9767f5a6bde263968919eeb2063e5a6fa5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "9e03fcbd2e10345eac1483934eddecf6b0469cad4772787b8e01733283bc7655faffe504a424031e3dcd6fd27cf40148dd0ad82a9c06861f64b38fadc9e189c7";
+      sha512 = "e3089af377c2f5faf97934e40e6abd782b4b518abf1bd6dbc9655dac192523051f11b1e7a016465c76005d42cf5382c21ee02ee65b80cffb00384e0b9f0889e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "6c969e22d53d6fb723f5d722e1ac2b3fd6d3970b42a2971eae647a1c1d38a8b5f5456298751ae06e02a17ae619f613459da114ea8d335a29d068aadae30446f3";
+      sha512 = "fa001a1a31036a26dfb3914a24cb882ca3d5065f0687e0bbb4e33814dfa16f5f8f5d9cc44d24e664be7e87a7ef9fe21d2111859150bedc6f30d59e3badf9ad43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "009a49a7cb71bf7876d7c0d52ec1145d0989592a16a560fa76c4223e5d71c3f0523a39202928f00f7499689d030afde1e21808e504291d70ba7cc7e5bc117c91";
+      sha512 = "629a28f9a05c758e1d748206cbd81db22fea7f847b16e42674717ec8ea33c035649d82a9418a691aa31507368fa2ab91590cae207439031703c1a8c8382d6a7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "da95a2bf55806687d77b52cd16d2a03e75d573318eb3a4f8b19720914e13cfcc965975528d21439da87b71bc1ef6aa7506c12afd641100fbd7ab1b58017301c9";
+      sha512 = "5f5065f0bc2a515daf388f70d503743fdd2d55006b4bce58c9c85fdb06644c729eeff3a2ecea9b2a29be1a0f94147838287d9c7624e44df60014a1a99990a050";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-i686";
+      sha512 = "0fcdcd5a965a8cbfdb1d0fab0419588b63b26216f65ca206052c0e36257d6b6d29a4c2639a0f8fe456ff8458e60766670a022c84f18426a60c3f230282206d55";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "b969bdd2d27eb9f5ef28de7537c09d7939534dd6cec2b5a95a32406e6b3c6687f84498f990ad2a353b5e4db38ad7a170649467688dd3fc51cbefbce3253f7a2b";
+      sha512 = "a86b3ed1e28aab56223b1a8ed7d184fb526b75fa27178eedf676909aae0931cbca7948870d50966b08ff7ff3c79efd037ffed31a74f89f25d302c2fbcf8d4952";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "7c020da300a1dbe494180fc8299d42432f32b6f473ce4bf47b30105db39789f2ab07c2a883c1443202f39c4dd47eea8221b0484deacff6a90f4eb6cd4b8f164b";
+      sha512 = "8e844efc0fbaec678092e97594aa4afc57b40ed6f8b38685a680aebfa4344ea6813a2bf2a93452e9b24683713493c5dcfb8414ecd51f9e2c334b1a5aab7b447a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ad50c7a6539ee8b2f36f6420b524055f20880bd01cb118d6bef124ea9f1acb83148078972118fd6628394ee0d22215c26a1f9cb5cfec5713d5265229e0bdf681";
+      sha512 = "a74566955c633d173c9da3c0300e8e8e327fc6fbc063bca00b934a2ef8dc4fb75e993e9ef263f2aa4709ba90c33593e990cf2fdb0d6a9fb944145c31e7cbc667";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "4f915c651bcba9581db961e0b5e66c15db0cb72298c5389183f0442e0ed18c84593235fcaba2274ee62ee7ca7998043ef9fba650a476a4017a8e066825cabde9";
+      sha512 = "e7cb5bc617eeba0977a749d5cd16f0787d588e73e20effc0a755bbc85ad9d3d422fbf0114a290a959202b0238848f7f525de8f58fda0035755acaf405fe5fca2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a5d9f49caa6e20afb8410f7668d0c6a71f06f5dd413e004183b82022db92406f752609ba6be05b27d70a8d68e4071e3a42ba5bebb8bf32e3cc074df4ce083bee";
+      sha512 = "f97c705c1973122181052599a81f44710d0a1a9a7369384993b2636653fbeba2fa77a30e2f13e6dd359c6aab28d55a3a0551180b4934bee35ca79201b90d4f23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "50ef735ca5b2987200978e2df10df33ba9fec6be80cbfba63bdc4a6409c6180080740e5e716cfaf4c536c0dc84727431e16c08d91be93abefb214a4887653492";
+      sha512 = "c4a743e2ef548d26e0aca8392323c63d3a55861e5e9dd35f1b1c7fc4ff8b44aa54c5fb9261ea98b0a7ff4ca21edd3ff46e3b8791fda9927cacb9e75440092047";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9b38d3798a880ea76f6f378c0458cd2aeb7887fa53ec89b9f23c6d5ee98ec2b4aed0f3708b1a4fb17b2a818424479643a3706a812cba3291ba7b584392648d8f";
+      sha512 = "9ee0dfddf90dd63dc1069f83ae2d70fa4ceede0ef535369aeebd2629f35b3c54bcdc05ad337910d5e860c39ddbdbd82d3d6c3ac979ee835b16cbb99705594328";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b772760cfddb791eb57c23ebeb05611b311b30041de8f286f639beceedb6482be36ecc183acfac4aa9f280904c2275c123f3e71302aa3b139f863ea01c7c4966";
+      sha512 = "6ecf4202844494e297bc6232d05e9da34dd11ac2a3a19d7014ea54ad27a2accedda42c31fad1144b22f9cc839109deb90bda9592b4081a5ca731f2a5aa5c0237";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "1934317eef2a5af831d7bb9fa493584956a32e28f7e22b7186ef8258abff504adfd936f473c9f2e2b414a880a2d9b6b2b09c9a77b3fd7060ae8e5254083a3a3f";
+      sha512 = "e772139fc6618a7fad213c710582fc9bbc3d63ef364e83f92ff72e66d361e25ab2af750df7b8f53052ee9be8d5ce10cf9883c64f331a219dc3c4f4a633c53ca9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "fb4c68917e17b472a592474e1370719c102072fb70a97ebd18a5f02e5295a1392afea4936c5f79aec041ee6f9ae0056a74233b660f55162b2d84562ef86e5265";
+      sha512 = "169abcdcb9e67b1a1cdb97398a688f0f432c525480e1cb47f7bb85f0bd9cb5fd2c58d8511e1e5fb44e93ffda3917abb34b5babd9ba4cb3fba76cd962eb6da9c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "0255e54036f6ca78213414c63d40ca1907d597ac4da1a6f7bddd6bf307d536e710bb9cbb8caefb8f08def99f1fe27f28d22e076f1c7e62fae4ef1cb6d093c51f";
+      sha512 = "94ceddceb154f0fa0f70b7febf3a8741d7fbf85c2345220f9f3afc26622118ea23d4085aaaad6c1be92a01ef5e8c507d4035b70dda0363ea1e362666d3aaccbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "43dd5f557382d9ab69f8a087dbe4d06e71ce68416f7a88a84978d1a6a9144938e12e4b9a50c3c42ff77131be16aee474a4a99f092a95671dbcb76e367f95d280";
+      sha512 = "4c59ab3169489e9411ad97b23116232ea9dc63337bb0ab31b36d5051f39c96fcce3c5e5e23e7ad65cceb93f21d2a194f46a2884e639104fba6bd0e2b89e74592";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "55ad59358e6e84204ea33f7a98436283ea7c843de6ecfe7f9feed24e719fb8fadb5f4de4d236a8f0490e56588f2574d3904093b6b3e9c58b2500fa04f302cc3e";
+      sha512 = "31c31241d1b93fc5b4e8a543b248b92e457e4c454c0a9f2c4a36080560600c331ac68baf2c56b0284547bd32082af6a7bcb5e217f2b0e82a696411a8a340b308";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "871214235400256f86321f95ed1a5d2cfc80bfd892eada49987d6e1330901126922439a55ad03be84a97bc92544ab145892eecc3ac54e350876b7a2e7d2773ad";
+      sha512 = "3358555e67ee43160065b0b0a74ac76b0108eef9e5545a00d891c376e1f75520a982534944fe4e0991da4af076aae3f389527b272309e3bc507692b2b01eb1a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "fd98c7c2c7347f36ddfbf3adf1e3b5059cabbce588785bbb522cc0c43ab061f0d776757633ad801efc53b769374f3f71bb810d07648aba98843ddd2b6bd97322";
+      sha512 = "5a84e72b7e84774e56f13a7edfc32ee7718171616ebdb2d1f031965631b79e08e5a5a392bbcb7a13fea22b8aa87a51a3d21d0ba8c471e507d5cc4171de9508cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4346ffc1367a8892c49a42717056d2ac46b5ad6e577a6b018fc08d673dd570a7ef2de6c6db493ab7f6cda899ac9a90b902c7d79a2ad8d5fc9dbffd8bbd5be32c";
+      sha512 = "ff1221835cbdd6da1697a9f915ead88e8b1f0afe2dc33e001079143424ae8d12dc048985a918133b26c17ba7422dcaa9db873af1bbcf1f4add68a3e07d86497e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "7c361450f296ac828068a97d9d936219bfb588d5dfdd79e8ce05839ea2f9a530736386ce4945d1b740f5582abe1a4c61ba0185632a0ced948d110c867e819d6a";
+      sha512 = "34be87c79fd43f8d1e3da76a7f037f7dca411cbfacd3b7a72420abee9dd2863a85ea38c53d58bdd124d2d3510fcab0328ef1195cc332990b22400b90a6061c05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "7cf88ac5b3f8d3e32d337fed29ee88bfdab1df2c733f8f959c5957dd4c3b9b866792fb56e776915398008f1f804544e0b0d1fdb0cf5fbaa8a81fbbf12f386b7e";
+      sha512 = "78a0814b6bca4267d11be6a180836ef275c41c9b7e29e821ca3559835a5451b689c0a4a7c771d51726641d04e1fbc83a415eecf0b72b8b7ef1c41e0c92ea6dc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "f4816172c5979b7b3bc4bf33084f319bf964876356b08a32d2337e7e5c599596f41f4e4efeb5996a53b462635f4d2ac51bd95978fb0f00fd74596f9203f1d94c";
+      sha512 = "1549118be4af02a05465267fe48720dea903e1199c33980dffea6a59bc90d31009c61b4414ea57f03a59e27182b8fa6e8e6c95eeb97a88426d3b6ff67bdea590";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "143e683fcf134dd6062ab87569798d34de1f3bf53ff2d50a73b35e2cc95d83d02654a047c7530cc5c1e34ddc791ce9d455ffba9f1f93d8b782e0968ef41621b9";
+      sha512 = "f8c1c8b9e97d4c09b70d047c2dc81b9f2b9342014b5e928f11d0705f83915597812d6ea71daf8e315e026f127b18f67161f116bb6139ff135181d25b0bd4ca66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "bb82ed997dd8d2b15f3881325b4f879b8eb49cbbd661da99994a54be21ceaedfa3901fa56214936c5ac05430035e41e9a0ac407afe73db289dc656f70a2199de";
+      sha512 = "afb767b85b674d3c592fb7f6175cceb14f917edd68d2f272b3560450f91dcae5a30c84d9869a08418a727ba6e010364752b52a22f3fe2f0a881ca01cb137306d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "d2db8f09274c73d63729fc32fa8dbe3a51f6421e16a741ea39e6cab1bc3d0e833fedd26678e68ac92aeb2caf01cdc7a02bfa518391ce20f9a0855a498297a001";
+      sha512 = "b33fc09c365ea57136dd53cca5a5bc54a8a5675e37716519a419e0e24286863741660af72cbb73809ae2efa0cad9828d523fced2ffe7c25f7b99781bbf74c382";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5b964331ae4567f12e3241eaf30a6d7d13b4da1bc4cd300a86d8a3a4102c6e8d71af5e6cdebe8a6399a2525345fcba06683c06216779aa2a6f375a56b0c71e53";
+      sha512 = "6a03c39d8736dde23d1d9558b7ba371840a95fd5f74948e63ed4f9b404ed478815950c196bb18788d2b883a68cc4760ce329e8b110e12c355655ca8f52c1ad22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "56556a238bc874e931e56f00879953bee1903ad1f1e67e2ae6dcabb8f65c97a74feda0f98d27f3e0a28b2a813d66d956696f001e08b809901e3bffec246f8f66";
+      sha512 = "1b9b9907386e7efc27c28f602a4915e8b9863f5ef64748f44ea7418f7b48eec512e19e906353abbb92e4a360d8216ec93675aa890fcb9de469dc4d800b0e5a37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "cdf97069df00610f1f964de5aff4dc7134e7cb27768b15177c03b96c486b5856816b685a6acd5308c0e334672d39ed094f35a2bbe8046465f8ce6c9ed803baea";
+      sha512 = "7d97a23fccd265da8403fa842458f4fd36c7316dd8720fb2d2a9a3a6ef1ca47eaa007a72348b8582d891ed2c27200ff40f62cd877dbd72ce213dbb10f64e533f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "ad5266e66e06bf5d0dd674e57bb368e66917beda800cf58eeef9b5dafffb2f6272ebfa67e03a3a0ffd2a6d9d273fb3f93e6feee011e8971e760d8af04ec91330";
+      sha512 = "f027e228551efdbe2aebdc1244a4495b31fbe3c713adf4c8078d6cd65997e0701a1813f55208b13a9e51e6e80637c9e6d08571f38f1fa8111b42f6d463e819e6";
     }
     ];
 }

From de08384909bf5204cc4d3ae0faa84e2500f15a2d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 00:42:26 +0800
Subject: [PATCH 164/203] firefox-beta-bin: 59.0b13 -> 60.0b3

---
 .../browsers/firefox-bin/beta_sources.nix     | 788 +++++++++---------
 1 file changed, 399 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 224af61bfa4..463b476f8c3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,975 +1,985 @@
 {
-  version = "59.0b13";
+  version = "60.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3385d1c5540bd0066c90fb63b2f18105085092e1d89ae1a0badc9e00f8392f4dc20b65ac6a04f22239332ca1ccef0995df433d656d6b105be03c0129063e7198";
+      sha512 = "803c819fa3085bc868ab3295ee1a6c7a6f7dba69fd5aaeb54244a561c252ae7fa7b710aaa13b7f8b7810145a737dc6d20e76fa35e85f3dad2535614681980245";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1eaa00e379a4f3dbf162edb4a79b3642b8b16a882e6b106475ccbb962072e6148becde4c068f41cf3061741d30ad1cd72e5b04f587eb9ca9483e248e8366a522";
+      sha512 = "7cb3ce289e989ab70a472c6cedf97f925034d5762e2256d6a01c992c3913836c8f8f7e202a013ff128b8a1db97d8e683bdefab19e618c0c819e7a31643eb75bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0cb52af20dcec4785865a479096d211213257ddf19b033a2d9b078727192be9b44eccbb548248e32f0f4a19348b5e8c5ebf27c8dc94f1872d5ebf3e369b74006";
+      sha512 = "f454d77c05721082b759cb550ab2c0f32d7e788ed5eeae2e3706ffea040d5f181245a2c7e9018a2050139606b460dcdcfca92dc73af99e92deb9021ee6be2839";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "099945735a3fe0470eb67f50fe1e2c92f49d7d34b5ca7a1c35167eee05aadf705dc6a3f4fdbeb78ff609c8892ecadd2cb32cf3a11cea6879f734220895172982";
+      sha512 = "d876e0a98aa1a702850b9ab7a3c3b3954e6f376fe7ffa32e6b4e22f5a8d8cc3568b3c70aa636c2af8ef7abf0d05c5d7895b8320ff41fed2c251e0eea06492480";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "30efe149f3f941a19d47ed8ebf0eac53997397f550f56d79c548054df8e14cccd5b1b3d1728b5d9f347cb2e373eff2f2f9403c1741f70c43c958b7566d70a55a";
+      sha512 = "e2cc66552357ccae9136b42f93db1c6b521e514ccfebaf65d5b635b6f3a1a62e66113c3b56c50806d77aa8c8cae53240b83f5437b3a28b2bdf735713ead45e1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c962aef0f068f3dcc3c9fe82f670b3a2de132ad761144fa009d052622f6578bb42875e39fc311265709e87aac58fcf62e60b0f0d5f98f05193f385be7296b35d";
+      sha512 = "9334167e1b9f236feb5784bf0be7dda40bf7be9162e57691e605cfd9a9e3e499ce6e5ddd1268574a0e637b5e62a5a74078a8bddd27951ac340c8e38ffbc43f81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "994d995198817480b0f4d198f5a6289d4a380a183b2e350054e6efe1d77ca3dad5c48ce8aeccf5e4813047fca9d856bd392614d7adfe49fac52cd950e05e0bdf";
+      sha512 = "e46010f4d7f76f88569728563000a35ec35fbcf48dd26663f93c774b1c321b5e7f8e0c4bb7c9a75919b01ebe70ca4eb211536714fecadbecc8fa2241c2e6f2ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "48a60eb7e794fdb5f060f2bd0e359d22ee14ac5916819fada7bf939d07b31993dbfeaf58ce6906c40890c4b35e7edb47fa3f0b33f5d327d649ae5fe2417c5bcc";
+      sha512 = "fea813a468c20b99d1b817d57161e699f4860ab1e114204398483b609872972dff379d7abdf20d383ac8432e2f0cd703de71bf44607f3baec6ce206f070f6527";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "caa1de35213a8bc492bdec4b003b7b4b072f268f59ff0ccde04e69b64aefd18ee2ef3bc1fca698be4a38251fe76863f8b613279ac060644d3c84e3191977f2dd";
+      sha512 = "38658a9c361b2ebd57bb6da00a30bf7ff1a071e75b481007ae1b9b30b51d78b60b9d459a4b935c964f2625dd83d90e2e392a2fe1b6ed03e3e7139f669b2d07e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "466bf0e7394dffbac4f58736c51dcabfb1d9634baf73d28af3ccd270bc1267a51b5c31802d48fc225918f8b15fc4291eb5e959802804510f5967db298e6054ae";
+      sha512 = "b17cb97ef70a7667a114c2eb8fa4ab88aa2fdaf09055c1e30e6afc245a4d50eb6f2c3f817d176eabb06d297257f468f1326cc4e17c6a1652f501070780c19e2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "034d37ac4aa1fb38b1aa6181e291e16447a270d5c21196469cbba33be773364614e2d2cae415674588c460a107a06f30a8d8ee663a0c797c621f0d4618c1588f";
+      sha512 = "924bc64e77ff15665cada5f9431d5a34fa71ea0fc57e9d7a57879f52b549bcfdf336af0f11b00861d8b4e8d60aa4c8f7cf0b01d05a5c1bbb0ca4a89a6dfc6caa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "f38c6cc0fc8ab0d0c7504b427c88081b5d8d456510aa6c0a8e1a14b013d9a9502008c4397850fefe3dbfe28d0da57175b1d10824f6feabaacbd6c44a03ed283d";
+      sha512 = "5c85992f95f5b975e63eff88b3595effc4ff74d04610a86c5b27184c24435cc2f3f22df06d1a7e84893ea2a823bfaf7da9f534fbd61d2e54e193764e0c24a19f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "e93729b7e94cddc446d035fb35dbfe74a7582bb553095a62b4809c965453a172654aac5268c3238d398a9f46260daf206126782d393938b4863a1efab2a7f78b";
+      sha512 = "66cb534a5d5a770b58da042a92b6536fed714cfde257816e0a4dc611b6ac450ec364df8265e907b7b5482faffc8d5e200a86f40013a7e74f22762170d4c95d35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "fbe2aea772370a83f78bc831d4ad447ba2bfb48b462a085e01aa44aaa517f69002b905523a3ecaf72ad04b41bc0bf0158042ae9d492410e6260bd180e8345699";
+      sha512 = "8486b3d9202fbc4d800cfa33510b645af94b6fb1c6715ec8e18f0cc4d414f87e4902d615b6b46ff0eba5bfb2c2228c05bbf53a927fd9c52ec7f0b1ac4889026f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "f272b29b440ed9dd3f520539537b3822f79ea274c9dd887f0bd7b352fd25d54850f8c3d3de77ba23d7498d789c90659c16b68df139c325c48cb5bd23b9dc6fc8";
+      sha512 = "2c46b7aa34ad5eadc9fbb291fb4ca320676e37991863f72bf4cfe2266a6298ba3157d1a0d2fa6a056661ff8474d988e103e8f5b215cdfc4c457c6b7d279461c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "562a7feb664d7fbd1cf46a611cc47b275f730e35af4a5c6860aaec54a5ef3a9ea25b56152b7a6f8b0a239b6c30ba961d1f6584219659a1a35d3395aa9abeda7a";
+      sha512 = "f9be3db1e0436c3dd4fe30fc3e93e05fbb129fb5f666d912115cea17c208ecdaa0427f4446f38f190165b10c3288573574a6abaf20288ff9d68d6fae200af7dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "811773221c9df7778afe17d31bce17a322247ebab55461b34fe3f984afec96ba44cd941a781915433ae54f5eefbe14c9e6fbaff6b690c69db3504c5fe3c1f678";
+      sha512 = "4091caa77bcb1d4602eb0f191949a88cef0e0fac5ab5b601fb987c1e8dd47442e9b2ca30077308fbf57f71fa6cbdb85f67df3187b71b4680ec2a51d558211e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "6fc0b8a04ee1a03b8aa7647a409274d642827b284c9e19b11281369b6299b9f4e17cff942f297ffbdacf922cb47df35b5c572d1a33a6450d000d4c373ebc7c03";
+      sha512 = "7880561a54333992252b26124a857eebe745bb683ad9a9f2d34e7dca8c480f0fbebcb27562dd62ee0ab525b27e31013a7dbf0cde389cf8834353b6c3c2e96914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "080b44995281ca69a92c039c8734b16b5a57c28df8b7b076f770f2d360d6945b5b9ff1c30c0e226a84a70ef5c76085ddc5b3b2790131e7797508854e261efa4a";
+      sha512 = "440ec2334dc616da063af952c6a0a4e8966fcaed669d22b75be708800c033287bdfd66759d479bd2085bd601aea7a1bda27067341703da3d6a1c1b305d767384";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "0c37fc3850911499130612465980cb1642c4a7914cffd8d857c6b03e75737992f0e181646050057085a52d7d11654e57c0efacc195b3be377b7fbeadaacf77e9";
+      sha512 = "7b9242da1d9b16c66073bf4cc85d438f2f849b3a0641eebc485b55f4ea3ab750c0bc74952ffbaf80b23840ac375e45984e6cecf7fbd6de5f2405f81b22e23f68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e0e10ddd3f24686790d2d78b9509d1d4dd679588f6c0a9349b35c7d58aab0fc3f914cb139212faa993056997cf805ffb75ee334f8dad6a110b6912b199da3bef";
+      sha512 = "9b88838076dfaf6b1f243940e97d02885b17d5ff82466ebc8fbc9664c95a62e59e305cdff3bacb99739d6077fb6d3742ef2a4106dbf423003c0d75bacc296a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "989b1e7590520271a0e16c1fd02c4b0c85edd53d9d0f6c2dc6e2dcc71b24e53e5ddb58d081e41720bcb54dcdaa8c0b2f8183183adddd6e4da2257dfe71d978e3";
+      sha512 = "f685409b69b27efaf703d248ecec25dd89e52f462bda69d509240a9d1f1480abf2a8849efb9e73bc8056378a0c1e4646f2341f7e84112582e3169eaf7300e3c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f8bd79f3a6e6b7439103699111fba9e5c1534ba643227fcfb07106fc7e6aa5ce8004b7fcfc58a825e73dcde769e9d19dbb35ac1169c587b66bed6a6805390b52";
+      sha512 = "e44ecaded4ada349beac0205e659cce7ac962d7d6cd97040af43c7f904909177bdb4ec38ba7ff57f9aadcefa55b3dd09296af49ae97357d96382f45a3872a963";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "b1eb3804b3f25984afc72756388f538c822d0056d6b6955e92f4eddd975bcefb2dfba22fd343171f3ed33f779c86c5f154928a7f2764242d3ce86530e57b8ae4";
+      sha512 = "99d79640df9b80f380438d18ddf668b22df7ce85f99bbb94234ee3f2d7944c590b22b73430d2c73f3c09c05655356c6549ad1cd33bf5bd6dd619ee427c183715";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "1ea4e0fa24012532cbbcce89b22e5c3131248ef72544bce2de97afc1c104c254a630104d4f2117bf01d217072983296718663e1108e96e86101369d6a66619a0";
+      sha512 = "5597c5d5f1959f7a473094b415b3971d4343b9317fb27e6646be99e6ee8e07e9d97e1cc8e51a77fc63c03760713e9644c6d292e33324d6e599270f424262f6a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "151be2980e61df7e96b47f0d48553da52b54007999734322814f4a0fee269d8bba3831411b5731caa23619033ba80a4265eba02acc228db78ef4c1705e1a7615";
+      sha512 = "331097eeeb0356e3c281ad1bf870252f6a3312a0aea9a52158ee45993b7348fb15896f73b174bcaeac4c1b71631952291683ee6bc8a35b7156cfda280cc951be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "c7b46b7c7fd78cb9bdb5b2fc6e5b0ddb0bbc09bb6e28fbda12ca46b0a0fd8e35660c4d66aeb47fc3b70b725c39e6629f2a0f3a27a9d4991458e5952fc08e819c";
+      sha512 = "5e78bca3a931bf8bcb94d33340dccef6289d32c5ccedc75cd347944e56f5c39f0780b1647924bac8faee94be51de39d93f477a959de4304bcac9f41ae51e52a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "2d79c84179d27e2dbf08637d6302c357438790fd3b02805a0722adb978187cbdde53a4a600c224d2c9c207142550efbc4ef5773218580615af31e0bc42e5ae32";
+      sha512 = "5d8aa24b3c859136b833cd0686cffb73541126d4de14e5be5bc5a70eb6e109fc36e6415af0d2a5c680350d34d0ba13afc21b49e65f9e8a210efe82ff0b8e20b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "38a64984e500e18cb21529e23e803fd33de9ef910b367f39ceb416cb284f61d5bb2717d86bdf0ed74e2320fade42dde89b7a8d4de024ea7e9b9ff95474208e9e";
+      sha512 = "8bd6b551833aceb552c52efc4898546b639349c398abe1c62b6476f18e64de7efa63edd844c3902300014415d78466f461d5f37c5d8335d81c86000127f6901c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "940c57ebf1384150a96bc31c9d7bf900f38f020e42cbb4c9a58d563a95a64005aa5244de17acb9834ffb1d2f39cc9acd4b08e976cfe8e48ea9b3584d2ded1db6";
+      sha512 = "bfb399e2e9086550498f0f954cab9bb061694a190375c4f26bb6d414ad6047bdccf21c83e509da10e2f4b18d20a169cf2d3e2d33d76f20ec0278c4f70c5ded19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "770dc127e21e350873ad17a966c438a10a1eab8637adc11a368bfb3397a61d0411f17452a984aa0b7c62012adc75b193d49936de7775e1c380ad0e1d315f479c";
+      sha512 = "e6611dfd935f95604f694aed4d17844d11a8713045ad529e64a62fd77a06b516994fe4eaf487eb629bacb597cdfb13bf9387ff023dac6cd78c1edc9a8e008975";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "483bbed985b9f1987393e288894e41760f2a69ac7f71c38807ee099928d478d7599d86795462d638f83003b4bc5869a32e13df4ab73ad85219228bf2326aab93";
+      sha512 = "a2d1206cf6ebfe5bf07e4525ca21079024eb3f4aed9c7a7b1a3f9eff416b821def976533698bd2f59c53179ec0c2613be7e80701a1c4216eeceadb8c13b30f47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "70e3d235569a976c3f82f10117e2060bc366382f630cb94fdda89f7f30e2dfb1075393dda29a67a6a3e224d8c2baae0d3727132d4391b261b39819eaad7b7a4c";
+      sha512 = "bd3ca95d7e7b66a70f961eff93fcae884edb8a463fd2f98cdfb11e3925eebf7bb6da66cde6ae4a26d23d31c10396d47331895b8200cc5e854a89704cffbed437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "6e72b77d296a2f4b8d404ca1302ff96ea39c846bf3d38b741acd6e327afab6c6e010980f15502fe5f69ddb0bae06041a343d588aa813f24176c34022a5371551";
+      sha512 = "d47b65f5a863d790b5d6249d2b0201ae625303b48cd6327789ed36ba4f36ad12cc7146ebb03e68185928eda63dac3fc4b29131bc224009d571b0efbf9ca145e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "724271904d24b4d412e6246ce8ece8fed71c6fe3e272551d3040dea3e7326f00f2516d742cdff9751222a141a574624fad4d476bfdd942a572ebf590eea4b1d0";
+      sha512 = "28a574d023f84bb5b5224d9c9d9e62292fc86e6a12fe34045397f16917d19d8f4319d1a08742880367b6fc85a62ae7a09ef29b111709ab4a256740adea2f3bff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "73ed1f28ad9c8b5c9a94ed746b48fe5756c323ecfbc35165b1af8f957331564a8a46403b72ad1e7d0c9e955f88bddd75628bd491a20916d769e410fc7d06671f";
+      sha512 = "b01b97325b0265d060fad86f7cc77bcc14975c51da51639991190cba2f6c6935c48cbde0fd78850d579ea320dd2e9c87edaa0750663e5f0ac234932968fb8847";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "da86d4603f6456d62a2668f86d5eb3b5cfb9bc9454fbea11cce135fa0e215713a73976a71e630c93a6f6235880a08ae036bab6026f64e12847dde3996a4e767b";
+      sha512 = "c0791c6f41097142035cc0a32f8d7c3a14c1975c4f4984db778240169aa48c3e4e89ea46d21c5a206278b34477499806346a47151472ee9b47d596da5eeb4664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "34904ec1e30394e06a14d2f5492fb2d08b66af587ee0823d7ddf6dd0c89407e784342c438f9f2fee85e7bb21888f4003c33c90be51a395d3b4d29050290cfd67";
+      sha512 = "091e89df6c761fb0d3629a430d91fe9dde17cb74aead6395d39377ef7b1038ab75a46e2ecc2517605dde3e512d6cc1fd4fea706ca177b03b6fcc1854ebb99c2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "485c67a32819bebca340240a53767ded9a4af9b8e89a9ddd98913ee2702b799551cae47a1be8ffc13cb3c61121ccc25def8527db622eee4f1f762c88e1517f53";
+      sha512 = "e84f09eaaca7f3eb2c4c8ab10f5fa48853b32a9b7eaec022a4f7cad7ed816d795886954aacca935ac4f44410c63c90e0c9c98f162a7afb517fa8063a1a26bf9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "b1e6704fee7cf35bf24e94db3dac411e4627b88eb5b954d017bd69cc03d598058a4f6a649522e8e56c648fd649c0315ca62fcb77304175753dc0e71ede3848ad";
+      sha512 = "82ee016a8ec7c91708bca2ac498378d240ad45e273d6ac5c4bdecdc2a2f3c042ec5f2f77935ffcb9e391f35c8ffe3876b16ad2200db855818fc889568f0929bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "fb2163796be2756d7c3cb6993e2ce295162e1d407e7673989365848c82017280b3da615dcec32ec6170fd39edd7cac87f9998d54e91b365c7fb88431201c7feb";
+      sha512 = "ecbe89381834657d3fb8d395cb58cb5bd28d9e30e160b50c6052ae49a60f1a58d8d79218f0f76814106575e01b063d9560dfd2a4278bac7db60427310414c6aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "f902b115d29654c34f98e1acc15aa173c5881838f42734b5ccbccb388eadbc32167ee35aa07173e62290cd69bab0ec985293e49bcd951b407e9b568e1a126b4a";
+      sha512 = "9cbe123386fe1c15ddb0613f2c2cfc6b0990fa824ffba0bc0c25069c02de1915e82531f5d22253297e97c8362e0fe1e66eaab84387f741b10528838ee2446c29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "5cc246d4807ea49700784c4d4f0995eccac7120c9e3f3c38efa4ddc0835db21f53682ac1921864270079c3dcc39d60ebb5cde7c58dcea9f91f04b81ba2fc41d2";
+      sha512 = "c53e2b950b427a6d2c3ec7ca2c657581f1d4f4bd44b90771475e48f269fc2376ea4cef357e8c4d7d27869766e863b1302a860d4ef104bb664b119971823625aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "3455463f7fad3c893a06b24df9a58a53ffa7f56845dca035b2eff9d98c67f1127ac74492dceb9277c01a47131d95f7b2dbfa23189420c6a3cbfc6c63e8fcd616";
+      sha512 = "4d43bbd65a4c76445a6dd5c35e6cf0013c24dee64289f4074a482d6ede232a86e04f751781dbbd65b18a08a96b4d6f45b5aa72dcf8062a23054755c4c58ce779";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "aba2ea135d6114c0615677193641c91e4b047840e9dfa5d2f9eb461cde5d539aeae34179f50038424f82104bad8d31ff6fc0f39e6ec7092ba8f3526781284a19";
+      sha512 = "d35456acb515a56fb411e3df647fba2d1e2f312a0fccb53dcda3ddf68e839fa8f38f78bd73afd63c1cfb8954f65986fb3a7623217ec8d631e36466b531358866";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "05651119089ebe610586abde15515e9a6886fe546c7b2c1260d5c0c0b778448da5d7ffbe30e46d5f32d49ff0f050a97adddb608cbefdc6f2bdddd593b9e2ad28";
+      sha512 = "1197948644964f77108c95b9eb1b4c8132ac1b7503a9423f2d2cac8b52e7f6c2b30c451fa62573437ef74deb47017797e47f1441d60d40a17898717b95eddfe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "6d3b6f30e9450352dedd933c310a8c8ee6858410a653a75f4851743cbaf5fa9a35e8f9d65eb110afa02f6a7025266127d10db3326443289e235be012e34495e7";
+      sha512 = "309b0d6d3f2da1b6539e6243ef9b44dc27f4205a273f7ad82659c9691d0e86cd99ec388b9469f9d97e11f45f534b06a702656f735cce0fd1c95e09a9c7cb38e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "f14f8f554d18adc261a26c55e0c78af833992fdcb1c8c8bb8e4dcd65d8f731b36a663cf02513d7d12d979751aec62d8484a06d8403001e26b5aea304c34c9a65";
+      sha512 = "ee705fe4393f1f07317dfff0732a671007971eb3f0e5d2348532c3b681455ef7d680c5dd20fc8fa41601cb0164b66371ce685b39812684fa89523a97a6361614";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ca3f9e284afc1836a73d8b6afee674daaf4f930f9128ad2aea052a8f0050b4b741726af21a5843ee8579c03b4b456e57f2f6f983f223aae8e2b7ee69231a82cd";
+      sha512 = "ecf7977f395056f0e346bfbfb81a2d74c5ed544c9bd3989e16b2f0dd6d5e3fc3b6fb48977d0b468f2a869efd6929279982a9eec33318c65a61c282996366735a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3356171a15ee94549cfb41eeb601b2f08e4cf286a0c3bdf02a55882df64b819e3159c2ded9601d2f23fc9b49b58cf4f4c53017c5344e9f246f53a5c3b1ed2799";
+      sha512 = "e51e235f2733c54f0af0ac912250b8eeb4277d29151da7a39c342c33cdbe381ee485aff5c2431cfbb088de8fb94c91b510efa8db614607819832ee8b13d86584";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "b1bc75a9f2a4ab2923127514c4b31b679fb5ee5e58223f02cf4b3aae820ebccdc4d41b1d0bbd45ba5bf1dbccbbb2452e95e651417889e8d9acca3bff065630e2";
+      sha512 = "45cb25937c1c791e3e55e9e70c469e28417048842e2993f917a7e7b340a0aa1afb985a8f1e6719ac26c1329299e2d55fa2cfde49c007b8444a97d16423c3920c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f8a8cd7a69367dbc5d19094c530cf3fa75dc996c2ddb6e91d82d788d778ae2d67e05a8e9371417dd618b62fbd1940ea1dd1231aa7e50e9fa0b633da41f9f9b35";
+      sha512 = "f3dd9601b114a0ec45951d187b1fa1e559e778c3033a5b9bc75b02cf49f6856fe77046f4f1a75149a58920414dd5ee0c98801d9dee7992aaa7ea6204deaf7c4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "6bab5af80f51494e6bb6d1813f05c7defe6170964513438781ea8d72afcc90af90792480c61cbec4cc87909867e47364fcaafcaab9b87f75c845d5022d1d8878";
+      sha512 = "b937202e944242c4a35da64add8e4dcd9fb4354d1ecee9144d1cd1dea5f5ac1989ad8e3376099fe60705cf1486b2ef350aebe5d55e440ffaf6d9aa619ccc4def";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "040e8a53f4f0d3ead182edf37afe9275b0e875c479fd2866f52945824d729c47e6af9162af8e67cc9d7540fed394c09c95b5003d61287a74736336a9a4632118";
+      sha512 = "881062e5e027824b5768db1df6aedef73f93721d5f4e4d1de5a31d02b3ac8a6a87ea5ae7889a6ade614180e15189304d529ba03440fc0b030061e1306ca1a02c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "3c34fc69be05029ac47810ccf2e64c358bea58abf5b8bde5e8af076fb87e7b36327fb4be565adea27b992e6c4bba14e678ddc3c71de127adfe0a048f11d33a70";
+      sha512 = "b3939136fb7efd9712acedc71a0d45cc0129367f5a11a2798c788b693e85cecfdfce2b83a1fad2f8bebdaf7e973d963975bbd67c0ce342ba0a4d0d46ff2d01d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "2e6d71df99893d69c29352d9a69176d7d3f2d5f47e95d95e6d65826c7bcbb4ebe855878fcf0c1a33fe4e3e749868f081ba58dd9265f130712dcac86d87fa5a2e";
+      sha512 = "fdb3026d28c507c947f236ec9b44ee2c74f2e4b2df38d0bd23143d9c56c855a19cb99deb087f2253c1692436c1ac25590b78cc3ea713e890ee5d6b3ce70d2cf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "b37754188e3f79a5968d5b2c64c6ec8ebe0afd3252260e33e1be639445377d4f36c3dd2bf3e278d14255bf5964def6a359aa17eb108e8402e35f47ebac460c93";
+      sha512 = "9ee305e8b77eb8caed2e0ec5251f651d16eb7ddd748a23b4c3f17853dfc6018efb8262958f9843fca62799b8ae952b208dc97a4d51977b0e4a81ceefb2575179";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "1f069f59437cdc924e8eb34ce4af4c9de39e28733589f35f7ba7d1d40347164dc4bb8953160436bc5b2228f9c78d097d2c8c46a5e3295c10dd6585575939a133";
+      sha512 = "17533028af974f7b785ee57fbd04e9ff0cb4f952269ebb9fba89a68a8e4af7790628afc74d87c1a338670bf05781cae5ba7cb8422d64055c54b39030a87a6741";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4d4890e1aac3a606eeaaa4379f983d556643201ed209f67e1cad1a5c9518a362630a79e74805b37af9e7adf59523ed267f45537b890752cd59d7f10e1b07e189";
+      sha512 = "e7691565e57153059b7b635bca91e83ce777083920e18d3ad26af960919a7505fad2e6da3bed3c179df0835225a331ad0e855256e87078cd2d023fbf837969e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8212468dd5c7ecd531bf6bc1f2ec83fe41074b0706f73359cf628312d5959ff04dcd13814f5a54b0c74b050cbd02343099ab654ed8f24bf315036f5da36a6b65";
+      sha512 = "001ffeb0a229e1deb751f7a7ae1b70e42b28cb47e321fbd4f89f948302ee31a5cf0ca513d51f978f6482f175dd2099dca46987ff22f72bbf60dc094146aac1aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "456002cac8a82802af2b9a7277f57094bfa69fe03a511b3ab8aae9e74a4e02c90dba69b64f8e0277ce9b78fe254a5fceef31c4684028384655b97651c123b9d1";
+      sha512 = "a96853819e1bd1fa9eae60e18ab1dc6ed304aefe6d13f8cc21ff500cf2415c7f60a623347d3b3632868446e1769aa0b8b0acfaf036281b3d8e838f849535579e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "5307b74b03e68f95de62512edb1bbacd059b7906582bbca41bae83508ae6de12962ee2b27a7046b6eddd0b0521550ee04d77db07ee0d283e9c1f9fccda1ad1b9";
+      sha512 = "abf878e46f44d1516e3d1a0ad873065ceb6025a93b968b71e532ad98d7c977252b703362778b34743dae0b50d3a88238f09876dffe46ce09ca5f2785d48f7cfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "693c0665ee15d3136b3bc2e10404f1504237b3cae9eb7e3f3869de641bb6a1b15311e94da778396bcde8d91589260eb08cccf4cb59446b343e39c15506183ff1";
+      sha512 = "4f201854676008b06b4e790fb7f0ff39648bb14f7813e733038ca9a8acfd5dc2bcf527eb3bb45fdb58def786b0896adf9660c5adeecc1697bf459bb13b63eaa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "5b57c7756477983f153f650cc0611f9e5d07bd53fc741ef489a32434ee5ba716fc4b1162af2b603e7049b08f737eabb4e91c9f90a3058d83ad1c68608f4713ce";
+      sha512 = "6d5ecffeab534b86728a023c6507929e8dcf124e4f02431bcd40dcb5322ecb5ba38e39a1fbbba096fefbb9b0860c571408d8c7f0f90452baf3df9c4ced4e9efc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "8c1d7c5434f8fd7321a2140a938b3505d929c1469d93a08c0deddd20578269c6f6d13a2ee42803f753d19873150587b75924c708918f340e7925b7457a68b39a";
+      sha512 = "64ecd4446edf856c8249b18246ec2520b999118d4c0c815da472f50c4dc2434cf504059a2d11c8a72fb1ffeb76e7ff6fa62a55e52d478884f516773511465a06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "cc35a754552dfe2e99004f0b72cdda5b82daebd8ec6eedbb00a9cf64a7f6c51d2c6f2b14b4777117d2cd4f8e585c7a3bb5d81b925c359a35f9873d3a9c5e4bd9";
+      sha512 = "0834f04f6c76ec8780d862e550c5e2bcd65acd7dc9b8629d194bb3407178fa3ae6c47d7f1421136f2966c9826b942c74335452a647e86c7b58b6708cc26c445c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "1772df0d4931024a9256e1a2ec465f193d3351019e397a2708a35317d7a08ffadc4516ff6bbd1cf4efc4b03a4230b628ba2e6b0956763bbedda6bb055a810249";
+      sha512 = "c238708effad87e764a8ad86e08a41574d06a5f7985f8370a7067deb0e6d10c97c395186387f18167a70d28521a811617adfb7aa411084a3a1397465f2de8a3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0f1c60c5e1db28d733093840c1823bc6509dd6bc18a6c514d977d59f03c82ad8a88e114f5ae18fc27d4071eebe3145b91e5a00885b666ee7ed8c1617493f0072";
+      sha512 = "7a1fb23ac7ca6c25e385cb27026064d5d17a613da19cd1b21c0710002a5d5473323d05eef05fb21e3fb1aa89630e38c4838cd211297569885c3aee251f7dd0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "17382dd82ed6bd5e4e948c98b494cbd937654bfbfa834c8c8dd8b33d3f7f85fe1d54f4b1e1eb166b4c3e9798063d25abaa89076379ab3283ef73873145db6db5";
+      sha512 = "306bade19239b1120e1fd8a879dcd98b695d966b94c061c10684e3ce3b9a2a6122d63b86f16cce9611306ef297dfd39003b5ba47ef29fbab33b1dbabc2097e7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "45d50122bb98684d3542a3bd015ea906b4d5cd8998f7b1564548d93b567e947f899e554ab8b6bed72077247ca96c8a4df1bf4d85cbaa795a5bd84bed9b6b9af6";
+      sha512 = "30fc79a7bbba6cd5c75d55c3169e91ac41d2259d77ccfeb4569cd5bfa3c0e7164b0e03e5722949e339197a0b82d9eea1f3de622b958ad75e6dc94ce0d10b7c00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "99a97c7b3570e885003e2e93d641574fcb7aa3d9e96555eaf9baa6376bcb22b702d3bc100514c69cb0d9ef8d690d54afea9ad28f996dcb91cbe2a2f29807cf73";
+      sha512 = "b31169a87228bfd44f144c2c36de4c24165bbbea48d5ab93039108d00a34a68dd31bb61371c472e866639b7e6b448b6c95ea2d9fb40b0c333057390269b9af2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-x86_64";
+      sha512 = "115c549157e802ed556dd8eeeff282dc045888a7da767136ab3568ebbe611924a500dec85cb7c5e5ed3b712f1478e9ea825c658cd8565718db7af04f4eea1e17";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "088fc29280127267909b0900db695db6d6ac51a223755c588e2d88703a07ec4ad5cd9c61e9b7c6f2d5456b15859409045a0f7efc869781994aea010522bf96e7";
+      sha512 = "61bf3b3e09f21d9f8cbebe0cd0ea428a04dd8877be004f32c610b8938f17ddc24d49279f98d9701069855d15ce0c0f8359e6448eeb1681d89ed1e1b69f9196d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "6cbb3780012e9e89767bcad23291f9935836904946b71d3c238478ae30f9c72d12a94b68aaee25079118528c1bfb81f58439c72483f57f49174f43556f50cdd7";
+      sha512 = "31f481aaa9db45b26b6d7236eb501e041cbaabbf47b922563f828f2415451ca5dab896027c4963bb22fa3c6dcdb26f0821e78f337c50cf6e8bb94246de86cb68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "b02fd17e4432c75e10018a61c6d24e156658708bc127874c8f1a27a7b6cc3887feeacbba6047d723883f901666e6352127f8ce447651d78120ccba409470abce";
+      sha512 = "d877f2b0f4f082651092cddde4d1eb27ef261774b8e72de6e87a937a13f55676c8a7c1b978d75412235d89af7bb7773ef1f2f6260f3a7e8f63e3a2f8f769c12e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "e65860c40c362c36732d25f2eac9126d9ba5186343f2de91f33bbfab11d907a7c3968dd5f25664d8c5865c7824b5b754717b9f7a03eb231ba0008151ac7c19f7";
+      sha512 = "f63bae9f41368903b9f87f0afcea69e74df57c355803cdabea540d22c001a42c4147a9d9823b8f0e2f9fd89cda4da831f2777a917a031c94203abbd4b2d6b117";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "847f71e52e133ca383cad419021657e5b17275f9c27468fe18dd34913665c770f4c9a059ea997684bf54dfb96a4ca6802f8e19b2c138410e55482b5762f3dd96";
+      sha512 = "a2692f38c092805471d7892657917be266d1b6e319809e1d506deb136bf14f0c3685a9237c07dd5896a1102c809340370cf95741fb8235e0d9a6a791d167a74b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "337005d811d838545cb6d978dc4cf20afd35aeead11e5adee65fbd0b792b11fd857abe9d49ed14d9efafb7e2e27cdf79110be0b61d6367294072378e27b778aa";
+      sha512 = "4b9099f2159cdbf4868d427ed1baeace54666d9459c6c68e362fd83f1f68fdfe053f5eef387bbb5a721019a13cd66d9fb9ca08899eced3c8b48f1b368b407d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "9c6dff63e8cb8892ca5ebf6050ae8a1fc639923442b7bfc52be3496667b6043598a85ea94f51af8dff27b5ebb59352b4a8c6898066de0b7f49ccd600eff967ac";
+      sha512 = "cd38d40e209c18b545a8b9cdf66ae09f87e09f319a7ec5586d45fd20dbae004a031168c10c3ef851f19976b240491cd230e54a1ab16e6c0d7061eb8762c5758e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "6b2fbaa5c4219288ab02cf376bc48393c6514d26a7c3c4d108b483eec6286101ca01f7399dbc62575fbaf21a4750fbd6b851bdf5cb3af1d5144b99f52e04a0b4";
+      sha512 = "9e108970f376dce2f32ac4d337200b0ea0dd784a4543f54cb864682f988f72e1b8e0c99dff170a3684be65ac5736a2606fa9281e622d1c6068054989dd9e3b94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a152768e04c2e7ee4a501a4a50dd72591f19c3d6b20ea1fb64090f61998ff1ef7d65cde0a39d60d4b594e120b8a65d4bde90c501b839c6a1b8fbd268f02750e1";
+      sha512 = "f3ed96c5c411b5cc1a1cf3ac94d5518e741f3ddfbb7ca3c437aa7746b03b7bcac28c7a4252b74ee3205bc0ace7606b1dc50652e216ccac2ae6c398ef397658a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "36a185b703c18e393dc581d494e90f58ebfa1326b434ad0e9e4cb6d0e44e51687d37db219d6000c7777a76372ce5dfc1428d945546887630206f2929508151e6";
+      sha512 = "36003ba95a33c7296e21f2e254c71f328c0f994d6f384a174789624fc527e9a5c94ee80f8784602fecbd6c8d50531032442c080fd657a6493418714daffdda11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1cb63ce3433f109eb9ffa795de2eb1b7c3dd52a66fb50b45e7e33f8150c034c06f928eb829dabdb7ffdf2d3e89f667e1d315aea566027ad51e288dc2d54046aa";
+      sha512 = "eeae7d7bea78aae2530322060524087886bfed6e0eb90ed9c7be77996e17c658aeb758c7af9577f863016b3dee8d83b7dd5e61f3d283d932aa300ae8de2e3c53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "3d18c86a14c46a09669c9db111292006de1dd8ca8f26fbf0733b6478a3e93212301ceb0ef5824a250ed68b45ddb0fdeb29a0459fedcb1f3145f95974a0c0d39c";
+      sha512 = "9405a8746752fa132cb137f7c6d59a9649f31130ad3ae888cdde419c2f016bf45dbb97ebf13392678453d1506f98d451e9fc7ae92eda4d5d64c0ba443a528568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "05d945d5dcd2e8554ad8c8508f468c16cb9573dc3ae3bcb7a0ae01e11aee1bccc40686e96dc51ef64a380d94f391b6984cc1232ebb47f3f0aeb46913fed31446";
+      sha512 = "3e9491a63956451dc0cc7e2fc1e833f8ab2d49b8c5095300db545391a86aa73ea4ee8b9d7419906a19fcfa7927e27ee89b934aa79f90631b0c5dd1a9ebb0a764";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "c9e1ad67ff5e183c9b30f91110e52d8b546585f837dd5fc9c859fc589dee4e49e5da57e4ffa397c3152226217f83e0ab1375a4c36da88a4899b7ebfe99654fa7";
+      sha512 = "a660a0ccf2a47c08834a183c54cd53f134b2421a4a9cef17e59b635c9a8364c007cd5a814c040ff9dbecd2373a31ce551c0df48ef7d8b194b53d5083535161d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8cce3afd623efc0926f75e77f4db3914047755957f7aae01f67215caa1764f047a5af6eab1316d3b6562ad584d152d5cbec32858f9dd2c5403b8069efa555866";
+      sha512 = "cdae561346298b4bb8f85d0dbc6bec471cf755c6c5f89c5a58ef5e15bfd2143729f903b488366f9d9b35c5e3df6f201680e8941db5c0b8d4632efaeb34e93711";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "0311bc2738f4e245f78e8e1abd15d7b480ebd6ada25e79c13e2110cee6c789f11326352eac41d0e1a32954045125888cabddfc811f29351e053d45787054442c";
+      sha512 = "6ba067baed3af7a543188f491864c052fc1434d888245f8ad5378eff52afa9313a7a5add5416c14794b5a27a5bac353a3e798a8176eba62f6289d89bee2f3133";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "8e986b0741df57e59b5f211c7c3342d6cf7b2916b4591415afac7d747eb97c8dbfbdc3fc4b9fd0a834d16af97109476814919b3fbbd220d66db5e4ad01fa308b";
+      sha512 = "829f8e22039e732fba4d480212d3f7bf3dd39cbb0996475c17e29e442d2a5263f33f4c36a4775ad21f984393f8738dbdeb7e33fdebe97eae0dff01a5be7ff22f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "6524b7b5801bedec93d7cd7da2a7b05bbb3352b7d28399507fe21b72d1c2979389c6d1e51dc968bb7f28d1d0f7f723c93e2970fce90d84b6f9bbe4dfd258a94f";
+      sha512 = "62b6b7d49511b28e67b41a192de49b7dd9d4f806f1df488c850a5da14f8ae0c87bfded01852962f9affb112536a9fdce5ab338b8875ca49798f7c78331dadee9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "fad0309059571ac100d92be735fbc307ee1359e1fdb9128166cbd2fddd4caa7543890f85875943d445b71b97d20de6845e7d17336839481ea7624064ef4bed2e";
+      sha512 = "b00eb5696fbc132cffb2053c67ab1456ca394dd2540ed08e4aadb718152ea727f156647e0977ed30ac17701202c184f99e03fab58d7bce03c5030429a733a7fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4769300bb43e9b88314e13a42d0ee760a86bac32fc5e3ada4dd03d33886a8f7c3b572c901a081f017ab0ce46d31f3bb97e8796d4699db0ef582ffc6a6e84fd9d";
+      sha512 = "e81bac0aeb2a5087e252d92fad3aa15d17aed5b818c14c4d32114cb1e2002ef52108aca1e72618ce8b52fd6fcc75bb6a590c78b36a9571caa64956c7d33f7313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "ecbe4eadfd031f28cdcf75443d67f14906d497e18037ab2c78e3ec81fd6e0228495ee725c29bf57b1b5d0abcbceff94e72e765dbf38110fc5ad4ecb9ab1873f0";
+      sha512 = "a3b8dbd4e3fb0813d719416a297ba6416fb6a58ded329ab1ae8ed32c29bd7f0721ce35d550db2e02674449da62dfeddfdddc51b822475cef5d4f1c215b7adfef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "ece335699ca00e0296445187a1a96ef6acf34985b8e8996ed0165f45e7648b9af62a4e242a78881e220d5ff1336833bf8025ae78fe6458fa90992a9a0bdb16ef";
+      sha512 = "e5a243e9a32b8dbf48178e20e6f6df2fa779d2fe7c761c3e8b85641a655e41868b86c794d12fe987be4dbafae4577dbb3e45038bfcd6e22ab0a477e8718170c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "8fd030682e6d3eef3397d340814dae3d58dc0025b575dbc20c1d5d40ae97f48631ade63be12e03e9dfd8e84e5dc1585cc2cfa0d8a1cf958fee50006a7d1bf27c";
+      sha512 = "3ad5d0adcae8346b771056d92255b57f46badb0023597fc16cfbecf6cb8e9a7246ba3b2c7729bba9e43869f3a882b0daa214d2ba5d0c4f913350ff5c5994ce7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "55ebe55c84883ece28fb6b7771eae6ed47b0dcd5b90974110a7018f39d1ad690302be44a67d0d034ef7b77f985d10cba26d3fad714579aa3d293bd6f36fd0880";
+      sha512 = "e380c47484bd56a7edc648b36008f8fdd95729c341e26543239aa3acb7cb56b41108f1685f4b2840b181c612c0235b3c38d815bd5426b6dffbfbec6eb3b94776";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "fb1176a2c711ec34297a5ddf95a797c4dd5823ee9e898e78c804daa44c16ab78fc84addccd9d83f4171af5dff60302f69236fa92cc584e3985770d6bbe369e57";
+      sha512 = "ce9f7c0e9fd901be27572448ebefbab19749f11c49721dba53adccfc390240e4e1420b75c0cabd2e2e73edc34e6104898ec3372fd7f7072623769bf72db53c33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-x86_64/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "226d55ac9bb97fee285ef9fbbe54fee9746cb98a09d1e669761bda08ea6115f2cdd39e1eff0a087f8f46d94139e1906758a8bcdeb74c191c0f453f3705ceaeff";
+      sha512 = "4cb533495ab0fbff75a53b56411ce1c59cc2420dd9c463547f46067577f8b953cc59c3d2f203850f75708f38388591a086335416edbd8787070345bba4af28d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ach/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9cf2e615fcc0014b5c40b4113c3be737f5ef7930515dd84a92b8a0d5d6cb90f29c7fe5cab3252cd895558ffb7a6735591ff6cfb8e8125a09455b2139d2d3cacf";
+      sha512 = "aaa9b8dc909d7e50a65d904d9fd7384a94aa365df8d6c8e3852926533c9407f6a08604205ae94914daa74d251b212a9f3707404f945072198141267540314edf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/af/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "eafd8c098c6092829104ffd870f9803338628cf38cc0525de6beea95d182a8b0a46c9ffc3180798ca06d35bc7822bc18b551b57166d02a53c786299a85c41fcf";
+      sha512 = "2db35215ea1bdc70fdc2c2e8eb576945bb0951b001784ef29fdaf7864c2d00d43122e58b45878e107afa7f0a85bbf332094a8c3cd08c04a5b9ea713fe6e25935";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/an/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "7b82271ede38e63c86d0d805c486183c52f0ef12b181a8cc57315fce353111497896e884f7eac873f140c25695af4a810fe8b7a7a070d9015f8cae3eef0b3a3d";
+      sha512 = "7020efe3d039e4861355cf56feec7dabf183432f49ec8f10792575a8cf33af0d7cbabad627ecaaee3d47988c2a1261ee62d509d664b4a8ba69d1e6d2b68f292e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ar/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "49749432076c90f63697b45fcc8714c6d98a6450ea8ee5d2f850c7a229f65277786784ba00e2ef14622c19a121805a7f07eab7e7dee02a213fd6d44cf10bc783";
+      sha512 = "99939f05878be5a5758f9c45410682761b77fdde6559c31e511139955cfa18811fc0d9e19c2d7da254267b4c3bb6c34378bb26c8ed25f8b957a7e73af10f65fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/as/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b8c3d57dc6cc1c00d8edd37eb7c81eca0c2d8f5df318801b111630511968bcf5fd8afb0549cb3618577c95d121a181d4c8ab523a78857826141621ad5c7d26da";
+      sha512 = "74c2f0e8a9e5f9a1052e011a4af950ebc2bc5298661e7094d3776dfbe9b8ce4efdc6c7e0f6371277e530501a6bdc7fc4b5c36983679567d73db1d0434daaaf87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ast/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a0b482b610d3d569f1a17d166bd86bb37fe57c1f7d8bad6164c40d509811cf706d818be6add0c3277531f0cf5a18e14eb8ae4a652abe9a45207f62de6f4074a3";
+      sha512 = "ddedd7552c4d85a7f3c3eedc80cb4213a67024351a34df41b0a8a6735cccf3c79f350f2a5621f8324dcbdd9fcc93d979829663d7fadca2367414013efc5d5cd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/az/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "c1bc3350bdf7f9c16d9b3370d01661c369156e55bfdc7bce0a4a1c1d1b3e7764a691b257984696b021897d47b206f3b21dc692e4de9ab6aa3a47dc12ac2eb9d9";
+      sha512 = "935c0697a13e020589cfb542ff61e5c67a0ca56f5a040d553b0d92f45efc79d7e5a1686e8981a88a01a307ccfe53284e4362850d95a8ad50aa5eae39e351e808";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/be/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "b228044ff1a1d581b00a25c3c33ae2059622f80900d0106af9da3a2b99722691e795bd83cdefd64f81ba17928fb74c3e9a79370871d7ea3c50c3747c1dd18046";
+      sha512 = "d8d43189178768267a5d4d66a8ae06918d4ab77cb400e1a40863a42f81ca9e75f9cef82a68f99c8e29edf8e9b3fca5af917ddce2c0f5a9ac257d9be02b3a143a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bg/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b60e554d7233d14b6513b815289a81c06a54d9da30dd57f1d595d0210b6229229ae59b3523dc4e3ff4f12693e519898c507c506db65f3f76b3bd475ce6e33d22";
+      sha512 = "31835edca2286977c76544c6885f8b716c67c871276fc9856077d00292eb6130a4d4345ca56e7ae75c392863a598711f69882039145668a95194a65fc33d934c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-BD/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8a0ee21d78875b5ec34a30140fbfbdc9fe9480cf792d73652fa2479c7446115aa501562c4cab873aa3f45f20802941272596ee4edc91c2927cdac22a887915da";
+      sha512 = "0ba71a5ce4a1966845e1ffbc9e7253980d18ff429e7be9a600c9d3ce1f28eac8350b1401f6a43413e86c8d4a552a2ec3f490dddeca9e34569ffb5cd56cb3c5a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bn-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "b38841e3b9d6b5ced6e8ab5dbc3510275f2cf0410fcb75ec86a99d31a06d9524c1b2420045bc71bac7b541ff60dc37a79dd5eccda2483a3e92697ce29594be98";
+      sha512 = "1e42024d4f5dab9a8cf37c6c9070617a5f4c631bff3c5cbf66a4a1d5d9e893fc320888bbefa6747a665b6941ecdc266537b539bdb6e165b30da4f832e38bb09d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/br/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "df014a91481412ec3c950250d37f8ee006055f1504070e01573c479b5e3f157eaf84a6ab41ab5eef96c94b868e526dfe0f884f36263e36437a1e3269e8b33b43";
+      sha512 = "0189234479d4b7da251571860f71c88d7358609208bce5bc698a969f054226a07442864557ae51c4a25955cca4bcef409f6a8aa347b00a1fe438d53325925ce9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/bs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "982567a667735df9fbe86a3c3dedc3103d6b63c81e8e54f70fe9b3d6ba751de1545c1dcf3b902189dbdbbf5bfd5b129186e8f3a09f417a64746c71bb30228c25";
+      sha512 = "03d15323c53d30c52b71a9046370011f39a8a8f2386be45d1bdc014fff1d4ea6efe979a199d3ee63f1fa18b0c7f5ee552e9048863b6454418d89075a70ff9dde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ca/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "c6fb02d7867bd2541d37ac52bc92da0357bad6439fac72fde1883b843a14b6c5bcfe3638bfda989e9169d8282624ea43735a167fe78633601545cd04636d2465";
+      sha512 = "ecb246da96e682d5bd0706adbfb2b6448c16c1bef9643db453d3ca17484b1a929c0eeb8f0a1416cf18fd7eba489d897f29a148a41050cb0603121b2c819e0a70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cak/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "9b6542199a9e02ac62c604543e2ba72e63847482662992a1a1717de78f3d992d7c70c5476559dce147a1756d25dbbe78720118e607668375757bedcfcb3b919f";
+      sha512 = "1ffe32f481faf8c94450bf873b3391db3546f0692b5697ccfd76ac0fdc493a8fd9278c8c196df1b36468b62ea517fa120acee9bb610a66eb27c69641b4f22167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cs/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "912eac4e2b9ea7e48f3270138aedea1847ff7c2998489244beb52125286565423ee287b967d675556204e38cc90b224f88b0830caa03f13fc908649480f8b6a4";
+      sha512 = "9f5754d2cb8ee16cbc901202bb59696bba08848c2ad739fd689b295fc2603ed72803acf344a7756b19fcb046490ad2acb878ad065cfb177e1c5c0df1ddb9d0c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/cy/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9f9ad35c577fd5d8d387861ace87dbcaa46768a6b16b1351314c1eba98a23ab99de3a3670e54c0b6463be38fbbf347868a4915f2827ecef5fc722c19bde82082";
+      sha512 = "d813571e696ce1d4b404c6167016d591148de7d6e02b8fa1df2da5dcefb55ae71649f3a53485024ad90fd33be94c020433efd7911b6c1f6c25c8380f5819e6e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/da/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "53f724c516ebc8d1ac72c8a6f3e21975ccaaf2f7c12382c5483e9755568a1908ddf8448eae34e91c64a1b3d4f73ca7b4f71bd5f3ad36dc14468323599cea1745";
+      sha512 = "1ccc37564d296c42f4b35a2214cc21d1a750e09e0c99555284f769ee7e3da9674377230e9c2467795bcaeccc2745d4ff969c4f5d4dab1bbcb216f7817bd7f100";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/de/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "f4332be64f0a87f7afd98788307fedae93021ab3578c7c193e16e6e3a66c2b7468eef75e7bd8ffad4e23b05b47d04a95d56e0a51428ade99e956f97152b1b2c6";
+      sha512 = "be419aedecd14cd7458eb984ffc040f2f9d0316ca1b078adcf4ab0a1ae6f2acb7c04fbf0b43520aa5492ab3c9551aacc59e9c986434d466eb30b48cbcd4e70d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/dsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "8e6bec92f696e49273b1ba9ef1ee367e7d67db409e2833dc3e76a7cf6de2437f23a7203865262e9e0b355ec8aa09d8ce6a8bccced367108039755fc8bbee5319";
+      sha512 = "41bb68dcc0cee8bbb4050b463648f8f59ed0f1bf4caf701f9c3ab9ba7830caf6655b368798cda6fde6949b4b04ecb1c73637d1db1aff5cfef3bbca7108d9a8c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/el/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "fea0097f647d170f04e239668c4f6d3a31d0c0e0a7fabfef909fafe82cd2ae6cfc08166b6d8c55f2e778781bff98055ecb1393fbc21164b699feb3797131d426";
+      sha512 = "42126ac31e47ff7045f43277b80bfb49cd241fc1a00f652eef3f0c2bc2a5de05c4bea6906287bb72dde52f5ecf58726cb3ce8a42081916d3af06b3b621c88647";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-GB/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "9664ff64be155b308c586b8e170f06004160809c7802674f5c14549a36ad18260e7736f40ce841013a5db9084be83a4e0f44b8c11b69c11f0a34be8bbe7ea11c";
+      sha512 = "3f475233602a09976644ba68472538f85885c54979914dac838be7df912de4818a9afe170e82c8f980555f5da6889db6fc2efacd932eb850bbc4ed6b28a41e2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-US/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "ff65f20d9ef9911ac853dcd830b4fdd60790c9c860fcfa3f57791c3d2615624a8ea837342745c7646c1704c04e145c4c5b68c939d49a1fe05d5835e78d141132";
+      sha512 = "e500aee682c57ebe120a312a127801511adcc54c7e19de33e8f80bea457175f6139a7e306cb1bc43d63f6d150fc4c98ed0709a62ffef885b3ff87a768e09cfdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/en-ZA/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "de76c940a1d3f5ded493455fc979582908368e10035d685fcb2c216dbbe55ca539a3feae8851b6ad97901be6d4a6fce34583ff35c5cc241765ea115ba45b6d8d";
+      sha512 = "850d44141894ca1a5d98fe9e3391a4ce4f8fc3c0db3dff5c1b7eb7b75085add18c03da6984f433597102c77374133b2b4b48262d4ffa3abac8de6424feb6c3dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eo/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "4268e22b96f9195444bca4fbeffc1d47f1ed93c3001115f532f3bec1bbf788fb72c99d5d7f6ee427c19b103602e35e98354784aa13368f0df53b52fc9a8d9c5e";
+      sha512 = "ee8bd8595897d43db06e8c3e3247c33910c4665111f1e2a0101af5eaebda726a44167fae82bae309d391de1901057b97901d1ee6162163bcb565c630b1d72974";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-AR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "143cbedbdb18aeed78a1805591011b2dcd2837ed950aa2579d34d4006aeaaa85a84ceaccefd8b14e1d4695469d0cd8088261927e80eb5bdc6df4ef1ee5e07350";
+      sha512 = "be5d83bf8f06e55bd0a23a9e3338368cd4cb7f2126d88782d4916da3b866a72a6c0da213f3151ea09df4902000db55883aa12aee5e3f5e512507217cc01c5678";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-CL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "6fe0857c8615720b5f268297c1809148943a25b1549f294ac83db6bf3315f7984de7b9b9921fffd0505f2d956fcfcba6b90e0f14d0a25e7e1c52a89f13eb2079";
+      sha512 = "0291d7a79dd44ef0491043da2af90c8caf576ba8cae370d3c69f6c7fe866748ebcb68888da9cb5e144745a97e0b519d46fd2f57cbbcf19d3157ef5c3e2d4b3e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-ES/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "93817b6399e451a99317b1981c033cb9ed46b673ce00fb6014e384be250ec64b5f32625d9e1b79e80e4c38a203a32f4f4716c76bbf2df130a3d7be1604a91106";
+      sha512 = "490ce118948632d6b64d8c4157da8ac3665239ae7db5ed4cf6e176b35812d8a73ae535b93bbc6f4243c4f8ad8f0108162b8bfc0ed89d8f74c85b51aab977897c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/es-MX/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "c6ed809031bb31dfe29a5fa9af201b59eabd59b286d0b7d69063c98682f603a3b6995eed553ae1db2f433b3ccd85e1a9e0ee94e14ec63f2e428e317335137538";
+      sha512 = "ee6b365694b32964e17c15d37a621732185af437750bf6b78297c298931f1fa7e3477fe944dc52da6a8d8f6c2a4ee13340a37a5efd43d6c7d1a7ac4ff7be9502";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/et/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "9e688803943cafff591e9f675a864447964cbb2f0441db212e9152e88edae83331d913094053c2af49db9caf0341c7e6194ff6f54c48ba6931e4b5ef4222399a";
+      sha512 = "f82a8e742f0605326cf4edacf5f3875d9de5aa8b77c67567b42898fd5b86575ca4e34fe11ad3274b53ee951a4fee4ba3a1050b075e105d675175b58169b1a02e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/eu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "47cd9810a14f512857cd6b11cb839800f0335c17cbe6ecd29c22b765f475891bdf07f9756f5a9258233c16389543f4bd662f767636823bc578744323bc56eb37";
+      sha512 = "16e9db59eb9ac08f14c5cf36496ed6425c210e5ab71bc290e72239b7ef6b38070e000d889e5747763e78bc6bcaeed4bce0c45bc0a3f60d5b27a87038ba311035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fa/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "357c1be02050c9871f54b444c7cea4b56a3834779e239aebfacb00feac0960197cee9837ad127cd5e617423b44ab13ca1d1a4aa4d75d52ea59a4d8caec64cdeb";
+      sha512 = "a6ddad3597feae0418e0bae57ecc507372da5a97b71048c2381272dc30e85109880cd56639f2089996cc5f652ca3b97f51c0d3022c1e16ecb3b143865db1d326";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ff/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "5b35389950b1e5913c0a8177348f314235fab8560663abc59ab09c360ac02857e3387e77be119d2c126ef000ee52c9ba1b408d9b760158dab751e03a618863eb";
+      sha512 = "9701cc05e02c4cd1f28f056c5b19ba19bf4ff459df7a8fd185864a4b0d5686280669d4eeba38b20570d01459e5e0080b2faa7118a18bc2da36f99a452f7f12f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d9a0cedad0e8715bb86031797639ffe28ba2b5846531b6712de5b1ad2dda60f1279ecb34570b172091e4e245f09e8cf3bcc62478f7cfb02a38043bbceb7b2d6b";
+      sha512 = "9d00704ac0b02ea27a06c0339b4937aaeb40cf50e3ec6390c3c56270cee589e480a7b7f014fd03d86db970cb70e67b762ad4b728ecfbdaebea1ea2fcb6a25bb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b850891b14e1aeee6779687f558160d21f1618da6e6b8133b5701a2076a8b91a283af711c0107fb9862e4c76dab318c6be9f19c03fd4567c67530f573003bd0d";
+      sha512 = "33b0201e80bcca259edf60618e582b1c0ae0be1527ec105a81d972201a6439c9b8eb39fbcf9498adccfe79193dbcf98b7863c62bb0f230c0fe9912062522cf49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/fy-NL/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "cc37b6614980a31fcc11a5b964a08a900661ca1057ea8ae486ac7dd6ada72adde58ae1839dd9797e6aeda28e657d4d763c94a906f745fbedf8fa9423e3d83061";
+      sha512 = "b8de8b7f0aa9a399e8df81169567df5c3d4d20d40cb913749fe848bdd81e61eb5f0120b9836526c65ef58700120cac28fd43d2d8ea65d6ba28658bfc4b08a954";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ga-IE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "2d078d00cb4fda65ac14abc3ab5e4a4a0c203f12e64f726843751884b51bbb15bafb15cc1dc76cfc587428a7348a6886d3f41a125129235432bed16ea2b53f94";
+      sha512 = "e10cbd32691c5797ecd2894b12d71568108c5ef48792ba8dc620b09b7f4819f6f5ab7ff41928861d7297bf2c72e1269b001afb8bf550ebef3f66a1c9caf7ef0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gd/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "74fc1848fbfc826e18a60b34dfe61b056636561927aa96e2c789d26dd72b9adff32ed445c62fe62b877b28945ea5a0007224deabae1d264dbf3ad61c5b38493b";
+      sha512 = "45a04cf4dd3007cf8976d27be5b318a978e04100b4121a63e9d5feb11d3208fef85cfbff27d71e0f46b7f70bdaad26a9a588aa7c89adac61e8ff87e3db46df64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "9ff0b453c118cd48cb3455690755cba41d39ab81cad52d2f6ae6ce26589f5d09ecc6506acda66b5a0b79e0c53ce51d9875eac646cf31b9643baacc8866dbf50d";
+      sha512 = "77406b8edd59e48099675d3f2c9abe6f53259645f718d465aaa6f11ee12afc88a0577baa5f9e3f0efff54c025510d4ec4b4277f35401d8cd8fad212c1aa7c215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6b4c85b78808d1c28869363a0760aa63bb6aef022734b5c4bd77035e68faaaacb8501d296ae32bdf70e4a0c8c001978be13bf596e6e87c6d209fe0766b40bf33";
+      sha512 = "0978497ed23eacc9e18bd348e115266d4cc2d16ec51255cce2d93f7faa4d335067961e59ff44a7dc3adbf36dc96aa1b8383127d617a82dfb22b374a92e2cadf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/gu-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "860423153134eb53a0ea7cc1e77f3e9ef03fe50ba59bff939b082e41ee015f464ea76ceb93400f91b8cdf2288fa64382f44b735a42ae4b805c3b7ea9d9dd4c40";
+      sha512 = "6458a6352c72db89496426dfcd9fad79cffa357d129fd3fba80a13ca2c903d9846820f453e0f480758bacc1fe0d3254a2e8f29c94db00a139402c83869974602";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/he/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "10eb3db2c96e3c9b157890abd5cc83ee852a530d4f3f11b043049e11458bf52f2d3dc3ea2e8f1a0352f9541177130e07293f1d008f6d89fef734a8bfe65c247c";
+      sha512 = "f60cd6e3fa1d51e4f02044bea5af0a48f6c5a37865fa96238712eca362ab3ee9d5900b421ff2c0b1da30ac221455196940f62a3393a28fcf2f756a6830562797";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hi-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "e55dcd464c1c99613842a3b98d7ea2404f516be7ffa92765021e0fda65a4f961b470af53f672d61b0579d18618dc84d0f851158fa773800163ee8cbbb6cf73cb";
+      sha512 = "4ac19276ff52f8ec8bb939ee87cec2b462e8c9e056bf6b00b2099fba0fdeb23602ba3dba0a4b93e03acfed82e3d6e6e9846d8881efaea61361badd88ad119738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ff166b9bd88bb607eb5e06ace5015a76fba9ff8c70967bb043efc52d6eedec8f1eb2fb720a85e19ef3994ce5a1de081b624fac37fea2ec7d88236aae829cdc8c";
+      sha512 = "a463e9edf4ebeedc1be086d43ce798e0556f852c3e8f10f8b935424fce6e9af3dc7912d4e4a5bf1f3e6d9855588cad9454035cd3b67f303713bdb203379d64ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hsb/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "679258efd864a674a471674ef4cdb241f1ebbd9713c7017c28fb528065b52ab658413269f346415ee14268664bd667f53db618290ad971fcc24d33e957605eba";
+      sha512 = "7f55648abf6547e236551d7409e598702c00bd17a844c46ac53fca70c433983bdcca8728902f8f040e5a8ee456bd339c15daf99eb06e93fa6145e983205e8b77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hu/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "51758c4e4c57495a6a44bafba54b1ee376139258f1451e51cfb68aacc5990253ed7fe1ebd0639d9f8c1fd7ca59c344c330333d5da6b2b992fe9da576fb251aa1";
+      sha512 = "41c3e4981e582c3c2ed24b3e463fad58d6e57d60d5336dad79c568f821d03f5f1183cd16e6886f136ee19d27cf0a2c3e066385f1f653a4de37c82ec9dabb77e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/hy-AM/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "419e445b1d97710047a80e74645fa1504766e4d89d5bd616f98cc4a50c936b60e4c1b32202b13f4703e4edafe13be13a2eef1fa22ae77ebb1432f12463a977b2";
+      sha512 = "1bbbcfce541ebabebbde96b76b9ad20caf5d88f018b8d81be0eb6887d1ac45f278f71032c8e48901ea527bcbb5b97da2e0c30c4ee644cbce3e4f2b913ad623ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ia/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "59084fde1fc58ef1ed14db350281b6c4d3fc0abf08f349c69083e2185b4441dca760e288ec861ff97fb1f4a12942f65f16fd4fc6ad78a7e006def5000ac28cac";
+      sha512 = "6006e946d16d59e584f5bba96c0016ff0f82205b8581d5d43f8e1789a3b3f14a8104019c85847b4c9b13673b47b48dfe7ac572c12e08f7a7593b2ce404bdf75e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/id/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "a97dc85473478c00a35767dc725030fd55a285b707ba0627ec6413c51c64d5f24891b6a9fefb17aa54a4bfa42cc6625e77df8942af66e44de1fccaa7fb4aca9d";
+      sha512 = "3391a9dcd336b26d069c609f1806d0ea98bd9bd85688c006a5ff271a494d33d3d5f969122c12f845348bbe6065ceef5a67516816f307ab7409ee68a282d4fded";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/is/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1ebd9ce8b8285597ce3ec93e30ba3d8564f400c6c1716e8e7e043342cb2c69c391dfca71ffd62ccfb1c9a6719f107d869fb1f4caac18308b0d33a912139297c6";
+      sha512 = "5026484442691f9d5b2c7c22759b8ce43cbcf19b5ce91644341fa18039f851d812fdeae64eb71fa27e016237aab33e3fd0ca6621c723e0c56b9156165d5d88dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/it/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e96beacb71274940a491fe68c3b12e2c65672bc3a3fa45f3e8b1febd72acfd601856c109bf3a1027e9690803ef4112611fc571b7e7e51a01fef1b0a0f2a638fb";
+      sha512 = "64726b0dfd6ef6f2823249d794a1f7fa8bb31dbf54e120f13aeaa7aaf9ac56860b388e2cb6c1f51f33d4dade9d703ca323493570a98cde38adb4ff7d5ce76f8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ja/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f1ba3a7c77da4f4d6ec8c48ce3353356eedb83dd16f342ffbc5df602922c098ad7ac48c6414ac9a0aa029d3d504412c7c614a63b85bc36f172663f2dc65ed66c";
+      sha512 = "08b0c2fa6fcf3caf7174bad1268e1ae8c3ab3273f4d6780c6aafba7ef68b7cf0535010aaa2af2af17b91ab48f979af2d37a57e980c4c6fd0b3bab04b020d8cf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ka/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5a63064d45cdead33f387c3f9f053abc659c02b957d3c7edc9b319defa0c6c5e36aa9134257ded94c102511d382c366cacc3c744280194e7a7c1d920966c692d";
+      sha512 = "f7fa6326c1c10de051727d4c83eac04c633f730a08dbdbad3de228d30b0f57a0b158891c910348083279807bc9ae7eeb43ce0a317fce338c1c84553a3498002f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kab/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1c9d970798a8cd1e7fc302e479e1609d919bf098aacc4ac398e1287e598d33e396f37cdd521e65ac1ce828d1aa690765c1d5b407aff6835f53c725d4cdf29237";
+      sha512 = "1f020762f8b8cdbf35b316ab041f16243d6df19ea84457b68b6a969e5ae504dc58886adb2d28267cbb6b09cf3664db4a8b0d475ab6b0cd382deff5f15e627f96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e9aba1a5ac3a4aaee4623b62abc22e387539041c940b316cabfe89fb0320d30e1a063c72a0247fd364f8f32c5c02ca4431012c74795d4cbadfb96f2f7fd673ea";
+      sha512 = "3859b99a6ad2a14c176d19db4ccd3ca2ec36e57a92661af12636b111f6cb39c64c871066bf5334df90884ef103ff6be5d982e1603dca8feb98bc0ba53b02f9b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/km/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "92547aff76f0d0a124e82c9a6e6b91f66b1126d23f652423333513f618bc674d879cb777447963717663b91e23cabb687de730129fd5af9daca2055ee2dd78f2";
+      sha512 = "c168e337f050b09fb8006b550781a6da6cce79a3fdcb21a51c6d584b45569e872480d6a950e56442e755c9fb5fa7b8a8760525977ad13fe4372f67738e48484f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/kn/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "d3bfcf0ff2b91b3023c30a7cdd0ff568f4b98f36012ec3368f52b4cfd3f6bb5e0295078f2b45f121b251f03c5b9072bd4c742fc5d225d21ce72026012f1abf77";
+      sha512 = "b59318bb6ed70da73f6803319bc606ada26a371c22e561f6460d2968da013bcd976602dc5b30e6b44af8225a44cfb62a121d5c215cf693196e7ccc5b23548b84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ko/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "d651f789418fe39b1611f0e5a24be58d9602209f285d1d0db62d33b93bae34e542fb9b59d09c96b2c14891119bd0ed20500e0cbe0e24e86ed9801af4072bd7fa";
+      sha512 = "35191d28de35f4e37ae8184ecb3c16f2ecf10cd8dc451f8f79471d480c3cc885c48abfe5723cc367625ab9fce570b79ef5898457c98198b1ca34905cf195c7a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lij/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "fa9c21f3c81617a275c8fe15f142707bb4227ae6ccd5895262309e771c221c121d01bc57af39d2b45891e689bc6fd6a34c51ace106a35cbab176f98b60c5ef49";
+      sha512 = "4db053b433dd7adbcfa5794b276c7c107d0601bccc8c85cebca4796b18d0c8001ad1ba413c4c1f755e281c1ea16eacbf722f04e4d600ec77bb9ee13bc5fa12d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lt/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "f934a730d3e22c3b49f7bbd3d4ebec5efae8f637ca39f72276644b7e80d082f87620f58c76c86cf542b3123a88abb58a29fb781c40ae897902bc0854635e0fef";
+      sha512 = "0c32453132f2a220d47337c55ab41211f6b3af64f9c365f7cabb4386399fc877f670193f72157cfb7b9d6cc8410346d33af3546609c00530fafba0c7fc07e480";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/lv/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "afdd6675ba2bfc18eb4fec5c63f9ed394fbaaa3800097843925c2c8c76a29a4de10e3c7c4fbf4897067e73f551d549bbc93550fe8a7f8c78878a61d67c414764";
+      sha512 = "796d5f0459f2cb67e5fd7e763a0b30009097aaf6bc6767c21fd32bb18ec45fbdbe600384dfcf296a6c29bf8347d2e922165a1e3e9853ef59ecfcbf56715d122e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mai/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "a52776efbcedf14f1e3878d3ef06e27eacd39c55ef7ca743c99429f7b8e24000def5535cf082226fe337deb2ebe1ac94f8f42a0b0d855c099b6fea4c4980d971";
+      sha512 = "189620d864ffd79b78942ddc177d9749285cfb9f3c289a1b3c8fdf7cceeef9d3695ef586bc07845476304bebfa8af285bdcb0d150e7d1e5661d2fd4bde46db5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "601500f68a5b9fa8297a0d7cb612f3bdc8f5910d3a76d2adbcdcc468c4f2beac24d7f85701ee20fe98a0d6a024c4ebb8dffde33ecf113da2f833e10d18395528";
+      sha512 = "d17696909f8d3c3016c270d1dbd2c537acbba8846105ec88c46f337cb97ac05372a1acb4ec0120bf9fee35b5e3f72b65235b6f062120d63e61ff20c37e09dde1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ml/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "1163bf2a97011e86401dd429834ac0be699c9dfca2c8a90bcdd79c54537d5f56e6ff8c788e5dcb599a0d094a6405b84f6f0de6fcbeb9210c53fef98220399733";
+      sha512 = "dd0f67d9b205490f1205a6d33eea76c18bea40372f08ad84bf6e8ab4ab9e1abd71ef2ff729d692bed8204ed374c13f191e04f8140acacdc373eb897122ac93e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/mr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "76e48c4b910532d5b94d099994341bced12a9db673af6baabc75cb786b59ec033662873d532ebe7266f1af4cca799fb4d468150551ea875b5f3c78d0155eff60";
+      sha512 = "9da4f47e384a45b976de48967bafdad35b2ba418e2d6e260ba3c6859be2d0b67251099093071f4c0c93b61d877ac1316cbf6a217926c77cc35841ec7a4b9a160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ms/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "1e2d3e00b04fa231b5fd8d52e624dfe6d4bf22474896c68e6c54b61a9c363c72535853a93c5695ded4cd1c1ff56c7f690c5716f22aaf2a2b7f652c31084372ef";
+      sha512 = "5698c5c4f0db7d7b9725bada6951519a87a960aec8424e4c725826fdb7316a0b69c891ca32ce7d53d43a2839f7e523a573bed85892428047c41c4e122e168dda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/my/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "7ee2c4581657472b0747ab4a0e188485ab67d4ce9a14b0a5ad27c45c7f5abc9e021723f4af8aa80ac698ced75cda9043e685cb568c3fc20f34c507cb1f375952";
+      sha512 = "beb075342de69736b207ac5a7e804575843f700b5bd4166885391cc667616ebc11aac255b1a1d897d607f673d0dd4cc0c7cde0b5c3dfb5a3e492373c63a06d70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nb-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "99d0718cd52cbd9483a8d19541dc6ca2d3c6546a08690a30c61d18f71cd9620aa7ec5080925c9115c5f96fde1887bbd1dae6e93e05f461da8c06ffb29841c753";
+      sha512 = "ca5632727eb2f99fe4cb08e151ce270330652ee7ba267c3fddc7ab4213b2b210f3cd4077e528026dde4bcc7e40cfdbcae16bbeb9448942736691c16f37ad302f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ne-NP/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "db9d211a189398ccadabd82d6a51f60e3c5d5c4e3d2581e172681e7313f8fc2783b7488486b0f4b4b3d32acf891ec2e99f32cd995584073a03891db95adcddbb";
+      sha512 = "548f91230ab8d36e60289b6b22a985f1a9d5af286330734add837a1d75e021713316975cb09afd2157133cf702dd32e9e8b4f1fc07e2d92fb64961ea8583b453";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a3fc5b7f6209e348236449b3c66a7fef1b230421f66392c8c149d32d4c7d2d606ed9ecc972d58d132682ae1c415bafe410e218d2dbcf7ef183b658e2b5d54f01";
+      sha512 = "063c0746ba10471a6014413a374768ccad89eddee8d2abf5cf3680fcecaf396676fc9629095d6629fede3e13bf72b7e7a096814771986b2c73ca0084cb767970";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/nn-NO/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "f701240e3c4c5f112ca9076aa83d3d399c0e65be600ea7baf6c4b2b232b90e1c8c56a358c10302986a945256dde3f1f9397a8c0aad3ff35f8582e0dd6972f3a1";
+      sha512 = "6a8e52f2f318ee0d4518dbddc7ef8c80bb4fd2e0f7b5a962571f5f7bda24bd81c04c712b4a0e121ba3084ded4d5320f0258618e5bae333869b8a1e13f6aa6fdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/or/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+      locale = "oc";
+      arch = "linux-i686";
+      sha512 = "ffe5948bdad294311b5e57a417fd47e8c719cb1c918ffc3113a90c922610cad6d1c0ab26fb4c369a89f4968e4781a425fa2de895b39395f84cdc91727cb76ae3";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "b912565bccfd31b9f32742a83353f7d97a3ff272e05cbfeb5153bfb4b26479404ef559b0e0b7c1636c5d41a81d409522c5726a38622f26f3719a076946cef076";
+      sha512 = "c57ea4d7168069797601ecc5f809dfb1af98a197f3a277caedcdcaab93f7e245e7020d8317a60ccd3e5696fa72f13b1a62c51f6eb78e608e943f05614f47d9f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pa-IN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "4fec18f06be41273f84c16213de8e4877dd4dc378ba051a761fbcdd8aebbaf937bed1d547c976b8da3a2b377d3878bfd00c8e3c2ec9fb40b1442e12dc395836a";
+      sha512 = "858b988345519cd645d8b812ab2dc13ad886aa6cd8cfec594369d890d162664871a4728119f257179aeb1b16eaf317db71863fb59120ca51c31d74dd535aaee4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "0fbd127500ceedc19c160764a2a61f3fb788e54b029c2728b50a7a35b1a51d430a67bec739ea623621c05cb64d1e35fc9044da6c5403054d51baf141baeb732c";
+      sha512 = "8154d4883a05426d6ea6956d280d73f5bb9f4be10a95ae0909e74bfc0a82af418fd01d847be2afcf91866b2f26e616d40d5a90f7a483510b16ac611926ea1f24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-BR/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "5b960fe9614152e27da77c659cbc198b8b7eda777e3ae188a80c79f96f775330354f3a76f409b022408905dc4bdfb102acca42227cca1e0e20811644dcf14c34";
+      sha512 = "10dcda386ec18b02d365ef3c0f6659dc18002d1620e7b1e8426d2f128aef983389fda0779b6bc46b47bbe500069ad7331d0180ad2d0d0e539da317a4581f397c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/pt-PT/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "7bca9e76dce8eaa92e9c6836cb07614e0b7cd520ce085d245de8b64499c8972cfd9ef74e3b04744446e5ba5c34be7c1b39fbc1d6828f411ffc2b1a1133bdd993";
+      sha512 = "13ee97b06dac091a7c162353117cb9c4e6761229b015b61c61ea253f6ebf39049cfcabaf297519da4819de478707d79d679578965e4d8c123bfa3d9ac4cac7a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/rm/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9770c6ece4f52557bcb47dabc717b9e422f915feeb5bd4d02debf4b4e2bd9708dc4da81c1e918335b8a9813b567df229eff83cf8dc413e1287dfa6dd57c704db";
+      sha512 = "ff97a465cd036b16960997e367ef1d6705599888e89988007afb17628ff8efd8c312e3cf10570e5796cfbef0576cdb3984ed0228f3601be40cf40433d7fb344c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ro/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "43df1f25801a0bdbf0d47327264b8c4ac6eb8c10e5e48ca5993b9aff92f3c6c97a2d289073cda0a52a81d72c384a62a8f233b7b155a424378f06fb7706eebc04";
+      sha512 = "d6c4e54b0f65b26651cdf1cffdce5945d2b9ab47e1344f18a57ddeadd472287f8bfe3db150ba17ae342fc6ff2cfe70d6f067b9ce69875f20adc86bfae1c82e39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ru/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "9d0ac601df2827191c8ad44d88b5bb5b46dcdda85281ae73090ef735c9e9895e2eabb36aac1d095a0cedac525b315f588ea5f64163b5ec6328412ac29046c0a0";
+      sha512 = "8f0c4ee9a619114cc244872940a6224c29bf1121369ca448ef828e5295def03d483a0e36264cd4c174148a182e60ea561e73761f07172d5c99952f39392988ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/si/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f45e432475757cbfe66a5ef12071a95bf74c1ae6c357165f2caff119c677974a53c66ad92e7c951c4ebe41ca82b7ed25fdc308698b03a6c2aa686df0b173cae4";
+      sha512 = "a963c1f43ee578f078ada5d7a4bbdf104f3de01d910171e44be284ba7c2acb88e101a3f154e344800d38feb2571ec8694dc1c19427e167ffa0fa71656579bb72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a4e0e3db886326d6ce74a2a47d8e9d7b80e2090a425cc7dd3a386835ee4c5ae525c597ec8aae603ca638f4a742f517559b821a58b5396799742481f7f859cdf9";
+      sha512 = "8621b33463145af2390fc4dd08443576070a008ec3119e9a28761ab46cbcdec537ea773f6d0004c5ec6ebd9a823d4ad3f358bddcabbf153b62a0e2c5046495f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sl/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3e83fd71a7620c4d58dca6437fddaffec172405bc10ca7e7df2a7c1f34ca5f3f3dcf139112fa5ca608c911d08b30d08cb55854d2edb84b9f59d14e459d9bdc84";
+      sha512 = "b1e6b26af9101b3f6b6de836fbb618b75f58dd18137c1899847e0b0e59795c94f24f35515e24ef77be25825a3ed1921fe78d230989c71f59a21eaaffaad7d23b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/son/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "eadcba6770e85c50394ce85def8915c7d819521e2ae8025a79a1888280278c23c0a41846705a3450dfe3548b1154a84fd17a1c971478e4746143b2d4d3925749";
+      sha512 = "e56acfc28ea49ec19e93aa36cc470baf7188e9ee2817bee6e57fc37d99c953925123981da0455af7375b7d8d4a2273c9f63a91a03a454d29b96d2964fb5d7616";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sq/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "861148e9080b230884b8cbb415e116da836d367b7c6b8e3edbe55e2275f03697dd0219d2c30d01375abe023e99e0547abb7d47e7bc29dc68af7ea05a2849dc92";
+      sha512 = "76c69116f962c4f41df1e4a0bc8015307f424ef86513f88c972c2d61b533bfa5bbb07e7a540c91bafba7313cc53b0c5002d9be0b2bbd483a4801a3874a7b4229";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "242794c64aeb0f350d83a22e12225e723822b70f79e629c41715d3e47c7c482ac9b089c71d08e9d1674da0eb0f4c122257d4570989c59d5d2d3877385fa95268";
+      sha512 = "bb500d84058a6451158f0cd4cc6c057eb3fdc1d65bd438112f5df8396425d7113ddb96e833ee9ccf5345fa2cb6f089a0a19f46ad264ba5e6d579b943329d5561";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/sv-SE/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ece418ecc310406da2e8bd583468435d0e6cd4eade1f0334b867c71806ccccd2781c22482caca04c8924978907b2fb654660944df4bbd31be8eb13b0bfaa42a7";
+      sha512 = "0e6e5424e797a1c5870fb64aaf5b7d84d26d9bd31d74894efd5c7e326c0582a4ce30e7610c463c313c6cfbfd36f3d518a60577862e56638fcfd0cfb8accf4629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ta/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "8bcb70380c63c5b6363e4b13caf4462031f990455f9e2d2f47b4621ac9cada5f05de4d1e5d1e2c65437aae2533867bb81399768577f9d68c58e300712c96c91d";
+      sha512 = "9d0b3a76660ae382564bc43268341225aa36d3241908fe727550529fea39066ed924ffd59193cac882d8aa0e306b2608a78d6d11d398e6ff81a9059158af3c84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/te/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "40aeec3c324bbde19bf6566532d995706fb9c603222265713133d967735ace95a80af0dbb8401f8589a78332958e0c02745ae5e99030cb5b8e990d87ff441241";
+      sha512 = "556436ce9648c7adf9470495ab8a2ccc33864e92c2e41f4a7af7c476b249035e4e55a43a888ae19e03e6b42fb931767dd1683f7c444a29aff79f931388fb7437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/th/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "1368b907c43cc93387ddf74d86c2e04e1c2e0e867217de11595662921a48abf9660030f54bdc7961df90b50729e9ea0d0d2e634d9f4b9773d9b8da75517b961e";
+      sha512 = "cbbdc94b148fecee3b71bcd23af09354fa4dd453af01167adb8ced16b9499afced409dee7c1a23e02aeda9a452c1a3eb36510ba0b5bd8879cb2f7ed4aaa39bf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/tr/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "a9019b3bc55a87bc20cc06907f2fc24eb7ccbdb397ad39bdbc5bea4bb3a3eeb23cfeba68dec1bfed66fdfa42ab281c41447b2ce848b38410b84f53be7a8ff9b9";
+      sha512 = "b21e8aa88ebf570aef2752a2b186347794df3677c4e3a1248b20b94a43e5eb2961545309f0b47b2445601256cb18f277caaa330c9ab12106fa5ab963c6c15226";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uk/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a09122c768e3c90a4a5278f800c1e41ee566792e5c3a29d8f2d37cd1b647fa5160376564b0f3fee08d93627b8fd5b084fb66ecf34500a73f9a0a726a353758f2";
+      sha512 = "29edf3dcc7194e6fd0d5d27f354705cd25afc1fe53149964d8131844f1b1c3f0a477c0115a291d78a9d5a370e4918d39fd6fb6c5f5b3ef150bae6052b2acc382";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/ur/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "8e4d3bad6652afa436f690ea934cdf5feddf2dea13dad1637b4ce244256d3823afb6e23a511b38e8a467c324539c8cfa0113a3897cec00a475072ba0325c7403";
+      sha512 = "3460c285dbc67cac93b6ab4f477b25b56ab0ffbbad20c302d0901578c045e0f65dd65767de468b5f6b594e69837374405a1338bba7d67e0d8447c76f4b99a704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/uz/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "1e532a744f4969b1d6df7f5d9d958cced92ae996a123aca3de97c35ec5b3d597db62c3da2191bc5b3bea172c6c5d1f1bea93ee2127fa417a43e4550cdb1c3b82";
+      sha512 = "85ef101a19505520b5f0c15c47ab3699b0dbdc65031ed12b000ccead70a0efccd489d8b0a7140d9d3cf93f906136e63cc51b62de160800b2dfd7dd25e035dba0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/vi/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5f9980b4d1fbb7b620021fe1aa80d2aed5cefc4c5be8716ece73697428cb157c79c052aee7a9ebe505a811da5c9a01fd789b27ae1fa8b11292d5a44ec28adb5d";
+      sha512 = "9de749c7e72264b48609d0485790048052394400ccc91dc0dbcddfecef2a6c81ab2035354aa15d3f0293339a086099e68d414f703a32b00a6c50a4f360c665fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/xh/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "e8a9cbc9df298c53b54b6c3ed1b75b87f668ae7feb11a911c4e90b3d925b4e818f7a5f8c50e22cf5ca399324e41aafc436abbe787fc68d0b41fbbd9c0fd99502";
+      sha512 = "d33b836d739967701a95776a7b19c1b0d6ca681ff3e471defbfa1a25c8bfad681dffde12f92d04ad2a47433a245326f0cbd0efa0654b45ae5ad6eec7efe5ba36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-CN/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "e7d0c0a7f8bfcb63a2d3d1164917ee8ecb2a0fe74871437723edf381cd2bb5888c86bc9708ddbf94383569ff5b6703f3dadbc0cbb5afe56e70130dd4df4340c1";
+      sha512 = "5d8754131064ce271f708b30c658cb16c360b083deb62095a3a6639e547ae672cc3554300105fc6a1a947b71e732a612bd208bdb5a5a8da2d59da63c1e9be9c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b13/linux-i686/zh-TW/firefox-59.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "09bacdd45bbe517dfd7c30b20307e1fe50ffd97be349fa778cc977af64a976326f4bbae30baefab714ccbe8160e5ebc375b7f409d8c8e2d18a7615481abee811";
+      sha512 = "e3dfd19dc6fbccaf4b300a44eafd8f9b10ba9838f8650569df5a397204c2374fd797b00b257a6b7e775ee2f9a5ec46ab37e1fdb0008ec35207b17fdb6f407223";
     }
     ];
 }

From 408f6b2843b44109d09f3ad2787fc49c75d99776 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 16 Mar 2018 01:14:12 +0800
Subject: [PATCH 165/203] pythonPackages.pycurl: Move to separate file

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

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
new file mode 100644
index 00000000000..e1d9158a4f7
--- /dev/null
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -0,0 +1,39 @@
+{ buildPythonPackage
+, isPyPy
+, fetchPypi
+, curl
+, openssl
+, bottle
+, pytest
+, nose
+, flaky
+}:
+
+buildPythonPackage rec {
+  pname = "pycurl";
+  version = "7.43.0.1";
+  disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
+  };
+
+  buildInputs = [ curl openssl.out ];
+
+  checkInputs = [ bottle pytest nose flaky ];
+
+  checkPhase = ''
+    py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
+  '';
+
+  preConfigure = ''
+    substituteInPlace setup.py --replace '--static-libs' '--libs'
+    export PYCURL_SSL_LIBRARY=openssl
+  '';
+
+  meta = {
+    homepage = http://pycurl.sourceforge.net/;
+    description = "Python wrapper for libcurl";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6dc0e18cba..305de7c0266 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12943,34 +12943,7 @@ in {
 
   };
 
-  pycurl = buildPythonPackage (rec {
-    pname = "pycurl";
-    version = "7.43.0.1";
-    disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
-    };
-
-    buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
-
-    checkInputs = with self; [ bottle pytest nose flaky ];
-
-    checkPhase = ''
-      py.test -k "not test_ssl_in_static_libs and not ssh_key_cb_test" tests
-    '';
-
-    preConfigure = ''
-      substituteInPlace setup.py --replace '--static-libs' '--libs'
-      export PYCURL_SSL_LIBRARY=openssl
-    '';
-
-    meta = {
-      homepage = http://pycurl.sourceforge.net/;
-      description = "Python wrapper for libcurl";
-    };
-  });
+  pycurl = callPackage ../development/python-modules/pycurl { };
 
   pycurl2 = buildPythonPackage (rec {
     name = "pycurl2-7.20.0";

From f6cdd2f5f7def7c275fa81645509830ac709eb69 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 10:04:45 -0700
Subject: [PATCH 166/203] time: 1.8 -> 1.9

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

- built on NixOS
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time --help` got 0 exit code
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time -V` and found version 1.9
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time --version` and found version 1.9
- ran `/nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9/bin/time --help` and found version 1.9
- found 1.9 with grep in /nix/store/n7qc7s0q7mfaibp8rrwh62dadn4gar7f-time-1.9
---
 pkgs/tools/misc/time/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix
index cce7614b904..892afb4ee1c 100644
--- a/pkgs/tools/misc/time/default.nix
+++ b/pkgs/tools/misc/time/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "time-${version}";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
     url = "mirror://gnu/time/${name}.tar.gz";
-    sha256 = "06rfg8dn0q2r8pdq8i6brrs6rqrsgvkwbbl4kfx3a6lnal0m8bwa";
+    sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v";
   };
 
   meta = {

From 1ad75d0c501fb757c7bceb346efe130bad48db1f Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 13 Mar 2018 19:33:59 +0100
Subject: [PATCH 167/203] gitea: enable and configure postgres service if
 selected as database

---
 nixos/modules/services/misc/gitea.nix | 38 +++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index f0b44b7bede..458d0087dbd 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -4,6 +4,8 @@ with lib;
 
 let
   cfg = config.services.gitea;
+  pg = config.services.postgresql;
+  usePostgresql = cfg.database.type == "postgres";
   configFile = pkgs.writeText "app.ini" ''
     APP_NAME = ${cfg.appName}
     RUN_USER = ${cfg.user}
@@ -16,6 +18,9 @@ let
     USER = ${cfg.database.user}
     PASSWD = #dbpass#
     PATH = ${cfg.database.path}
+    ${optionalString usePostgresql ''
+      SSL_MODE = disable
+    ''}
 
     [repository]
     ROOT = ${cfg.repositoryRoot}
@@ -82,7 +87,7 @@ in
 
         port = mkOption {
           type = types.int;
-          default = 3306;
+          default = (if !usePostgresql then 3306 else pg.port);
           description = "Database host port.";
         };
 
@@ -123,6 +128,15 @@ in
           default = "${cfg.stateDir}/data/gitea.db";
           description = "Path to the sqlite3 database file.";
         };
+
+        createDatabase = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to create a local postgresql database automatically.
+            This only applies if database type "postgres" is selected.
+          '';
+        };
       };
 
       appName = mkOption {
@@ -186,10 +200,11 @@ in
   };
 
   config = mkIf cfg.enable {
+    services.postgresql.enable = mkIf usePostgresql (mkDefault true);
 
     systemd.services.gitea = {
       description = "gitea";
-      after = [ "network.target" ];
+      after = [ "network.target" "postgresql.service" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.gitea.bin ];
 
@@ -231,12 +246,31 @@ in
           mkdir -p ${cfg.stateDir}/conf
           cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
         fi
+      '' + optionalString (usePostgresql && cfg.database.createDatabase) ''
+        if ! test -e "${cfg.stateDir}/db-created"; then
+          echo "CREATE ROLE ${cfg.database.user}
+                  WITH ENCRYPTED PASSWORD '$(head -n1 ${cfg.database.passwordFile})'
+                  NOCREATEDB NOCREATEROLE LOGIN"   |
+            ${pkgs.sudo}/bin/sudo -u ${pg.superUser} ${pg.package}/bin/psql
+          ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
+            ${pg.package}/bin/createdb             \
+            --owner=${cfg.database.user}           \
+            --encoding=UTF8                        \
+            --lc-collate=C                         \
+            --lc-ctype=C                           \
+            --template=template0                   \
+            ${cfg.database.name}
+          touch "${cfg.stateDir}/db-created"
+        fi
+      '' + ''
+        chown ${cfg.user} -R ${cfg.stateDir}
       '';
 
       serviceConfig = {
         Type = "simple";
         User = cfg.user;
         WorkingDirectory = cfg.stateDir;
+        PermissionsStartOnly = true;
         ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
         Restart = "always";
       };

From 732be7d5726bddb1a53306f7be7686c7e90b5985 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 11:52:45 -0700
Subject: [PATCH 168/203] vault: 0.9.4 -> 0.9.5

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

- built on NixOS
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault -h` got 0 exit code
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault --help` got 0 exit code
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault -v` and found version 0.9.5
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault --version` and found version 0.9.5
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault version` and found version 0.9.5
- found 0.9.5 with grep in /nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5
---
 pkgs/tools/security/vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 8118e830675..02c0b27a564 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,13 +9,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1a12pfzln6qdff08j9l1807anrsgn3ggnaqda020p6y9zg1p8xzd";
+    sha256 = "1ddki3bnp6yrajc0cxxjkbdlfp0xqx407nxvvv611lsnlbr2sz5g";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];

From ff9db1ffc478be9e9ff466ae584472903a8491f3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 16:28:09 -0400
Subject: [PATCH 169/203] linux-copperhead: 4.15.9.a -> 4.15.10.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 9b1552fc90f..f59106746fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.9";
+  version = "4.15.10";
   revision = "a";
-  sha256 = "0nnim0ziibrg6ihipnkgmy0ssmwgjy5lyzfj78snvw5fmp5a9k74";
+  sha256 = "02plwrj6d7wzwf6w8q2cxspy2q58i3v46clm2vf8m9x6mm88jrzx";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From da9f52a6e93e66f86802a98bd1779d3a60a3384a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 17:37:50 +0100
Subject: [PATCH 170/203] LTS Haskell 11.0

---
 .../configuration-hackage2nix.yaml            | 970 ++++++------------
 1 file changed, 337 insertions(+), 633 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3139a15039f..05fae616da0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 10.9
+  # LTS Haskell 11.0
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -46,7 +46,6 @@ default-package-overrides:
   - accelerate-arithmetic ==1.0
   - accelerate-bignum ==0.1.0.0
   - accelerate-blas ==0.1.0.1
-  - accelerate-examples ==1.1.0.0
   - accelerate-fft ==1.1.0.0
   - accelerate-fftw ==1.0
   - accelerate-fourier ==1.0.0.4
@@ -60,7 +59,7 @@ default-package-overrides:
   - action-permutations ==0.0.0.1
   - active ==0.2.0.13
   - ad ==4.3.5
-  - adjunctions ==4.3
+  - adjunctions ==4.4
   - adler32 ==0.1.1.0
   - aern2-mp ==0.1.2.0
   - aern2-real ==0.1.1.0
@@ -81,9 +80,9 @@ default-package-overrides:
   - Agda ==2.5.3
   - airship ==0.9.3
   - alarmclock ==0.4.0.3
-  - alerta ==0.1.0.6
   - alerts ==0.1.0.0
   - alex ==3.2.3
+  - algebra ==4.3.1
   - algebraic-graphs ==0.0.5
   - alsa-core ==0.5.0.1
   - alsa-mixer ==0.2.0.3
@@ -92,100 +91,12 @@ default-package-overrides:
   - alternative-vector ==0.0.0
   - alternators ==0.1.2.0
   - ALUT ==2.4.0.2
-  - amazonka ==1.5.0
-  - amazonka-apigateway ==1.5.0
-  - amazonka-application-autoscaling ==1.5.0
-  - amazonka-appstream ==1.5.0
-  - amazonka-autoscaling ==1.5.0
-  - amazonka-budgets ==1.5.0
-  - amazonka-certificatemanager ==1.5.0
-  - amazonka-cloudformation ==1.5.0
-  - amazonka-cloudfront ==1.5.0
-  - amazonka-cloudhsm ==1.5.0
-  - amazonka-cloudsearch ==1.5.0
-  - amazonka-cloudsearch-domains ==1.5.0
-  - amazonka-cloudtrail ==1.5.0
-  - amazonka-cloudwatch ==1.5.0
-  - amazonka-cloudwatch-events ==1.5.0
-  - amazonka-cloudwatch-logs ==1.5.0
-  - amazonka-codebuild ==1.5.0
-  - amazonka-codecommit ==1.5.0
-  - amazonka-codedeploy ==1.5.0
-  - amazonka-codepipeline ==1.5.0
-  - amazonka-cognito-identity ==1.5.0
-  - amazonka-cognito-idp ==1.5.0
-  - amazonka-cognito-sync ==1.5.0
-  - amazonka-config ==1.5.0
-  - amazonka-core ==1.5.0
-  - amazonka-datapipeline ==1.5.0
-  - amazonka-devicefarm ==1.5.0
-  - amazonka-directconnect ==1.5.0
-  - amazonka-discovery ==1.5.0
-  - amazonka-dms ==1.5.0
-  - amazonka-ds ==1.5.0
-  - amazonka-dynamodb ==1.5.0
-  - amazonka-dynamodb-streams ==1.5.0
-  - amazonka-ec2 ==1.5.0
-  - amazonka-ecr ==1.5.0
-  - amazonka-ecs ==1.5.0
-  - amazonka-efs ==1.5.0
-  - amazonka-elasticache ==1.5.0
-  - amazonka-elasticbeanstalk ==1.5.0
-  - amazonka-elasticsearch ==1.5.0
-  - amazonka-elastictranscoder ==1.5.0
-  - amazonka-elb ==1.5.0
-  - amazonka-elbv2 ==1.5.0
-  - amazonka-emr ==1.5.0
-  - amazonka-gamelift ==1.5.0
-  - amazonka-glacier ==1.5.0
-  - amazonka-health ==1.5.0
-  - amazonka-iam ==1.5.0
-  - amazonka-importexport ==1.5.0
-  - amazonka-inspector ==1.5.0
-  - amazonka-iot ==1.5.0
-  - amazonka-iot-dataplane ==1.5.0
-  - amazonka-kinesis ==1.5.0
-  - amazonka-kinesis-analytics ==1.5.0
-  - amazonka-kinesis-firehose ==1.5.0
-  - amazonka-kms ==1.5.0
-  - amazonka-lambda ==1.5.0
-  - amazonka-lightsail ==1.5.0
-  - amazonka-marketplace-analytics ==1.5.0
-  - amazonka-marketplace-metering ==1.5.0
-  - amazonka-ml ==1.5.0
-  - amazonka-opsworks ==1.5.0
-  - amazonka-opsworks-cm ==1.5.0
-  - amazonka-pinpoint ==1.5.0
-  - amazonka-polly ==1.5.0
-  - amazonka-rds ==1.5.0
-  - amazonka-redshift ==1.5.0
-  - amazonka-rekognition ==1.5.0
-  - amazonka-route53 ==1.5.0
-  - amazonka-route53-domains ==1.5.0
-  - amazonka-s3 ==1.5.0
-  - amazonka-sdb ==1.5.0
-  - amazonka-servicecatalog ==1.5.0
-  - amazonka-ses ==1.5.0
-  - amazonka-shield ==1.5.0
-  - amazonka-sms ==1.5.0
-  - amazonka-snowball ==1.5.0
-  - amazonka-sns ==1.5.0
-  - amazonka-sqs ==1.5.0
-  - amazonka-ssm ==1.5.0
-  - amazonka-stepfunctions ==1.5.0
-  - amazonka-storagegateway ==1.5.0
-  - amazonka-sts ==1.5.0
-  - amazonka-support ==1.5.0
-  - amazonka-swf ==1.5.0
-  - amazonka-test ==1.5.0
-  - amazonka-waf ==1.5.0
-  - amazonka-workspaces ==1.5.0
-  - amazonka-xray ==1.5.0
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
-  - ansi-terminal ==0.7.1.1
+  - ansi-terminal ==0.8.0.2
   - ansi-wl-pprint ==0.6.8.2
+  - ANum ==0.2.0.2
   - apecs ==0.2.4.7
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.4
@@ -197,8 +108,6 @@ default-package-overrides:
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
-  - arrowp-qq ==0.2.1.1
-  - arrows ==0.4.4.1
   - asciidiagram ==1.3.3
   - ascii-progress ==0.3.3.0
   - asn1-encoding ==0.9.5
@@ -207,7 +116,6 @@ default-package-overrides:
   - assert-failure ==0.1.2.2
   - astro ==0.4.2.0
   - async ==2.1.1.1
-  - async-dejafu ==0.1.3.0
   - async-extra ==0.2.0.0
   - async-refresh ==0.2.0.2
   - async-refresh-tokens ==0.3.0.1
@@ -222,22 +130,18 @@ default-package-overrides:
   - attoparsec-ip ==0.0.1
   - attoparsec-iso8601 ==1.0.0.0
   - attoparsec-path ==0.0.0.1
-  - attoparsec-uri ==0.0.3
+  - attoparsec-time ==1
+  - attoparsec-uri ==0.0.4
   - audacity ==0.0.1.2
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.3
+  - autoexporter ==1.1.4
   - auto-update ==0.1.4
-  - avers ==0.0.17.1
-  - avers-api ==0.1.0
-  - avers-server ==0.1.0
   - avwx ==0.3.0.2
-  - aws ==0.18
   - axiom ==0.4.6
   - b9 ==0.5.35
-  - backprop ==0.0.3.0
-  - bake ==0.5
+  - backprop ==0.1.3.0
   - bank-holidays-england ==0.1.0.6
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
@@ -246,8 +150,8 @@ default-package-overrides:
   - base64-bytestring ==1.0.0.1
   - base64-string ==0.2
   - base-compat ==0.9.3
-  - basement ==0.0.4
-  - base-orphans ==0.6
+  - basement ==0.0.7
+  - base-orphans ==0.7
   - base-prelude ==1.2.0.1
   - base-unicode-symbols ==0.2.2.4
   - basic-prelude ==0.7.0
@@ -264,7 +168,7 @@ default-package-overrides:
   - bimap ==0.3.3
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
-  - binary-conduit ==1.2.5
+  - binary-conduit ==1.3
   - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
   - binary-orphans ==0.1.8.0
@@ -294,13 +198,11 @@ default-package-overrides:
   - bits ==0.5.1
   - bitset-word8 ==0.1.1.0
   - bit-stream ==0.1.0.2
-  - bitx-bitcoin ==0.11.0.1
+  - bitx-bitcoin ==0.12.0.0
   - blake2 ==0.2.0
-  - blank-canvas ==0.6.2
-  - blas-carray ==0.0
-  - blas-ffi ==0.0
+  - blas-carray ==0.0.1
+  - blas-ffi ==0.0.1
   - blas-hs ==0.1.1.0
-  - BlastHTTP ==1.2.1
   - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.0.2
@@ -309,7 +211,6 @@ default-package-overrides:
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - bloodhound ==0.15.0.2
-  - bloomfilter ==2.0.1.0
   - blosum ==0.1.1.4
   - bmp ==1.2.6.3
   - bno055-haskell ==0.1.0
@@ -325,17 +226,19 @@ default-package-overrides:
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
-  - boxes ==0.1.4
-  - brick ==0.29.1
-  - brittany ==0.9.0.0
+  - boxes ==0.1.5
+  - brick ==0.34.1
+  - brittany ==0.9.0.1
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
+  - buchhaltung ==0.0.7
   - buffer-builder ==0.2.4.4
   - buffer-pipe ==0.0
-  - butcher ==1.2.1.0
-  - bv ==0.4.1
+  - butcher ==1.3.0.0
+  - bv ==0.5
+  - bv-little ==0.1.0.0
   - byteable ==0.1.1
   - bytedump ==1.0
   - byteorder ==1.0.4
@@ -348,7 +251,7 @@ default-package-overrides:
   - bytestring-tree-builder ==0.2.7.1
   - bytestring-trie ==0.2.4.1
   - bzlib ==0.5.0.5
-  - bzlib-conduit ==0.2.1.5
+  - bzlib-conduit ==0.3.0
   - c2hs ==0.28.3
   - Cabal ==2.0.1.1
   - cabal-doctest ==1.0.6
@@ -359,6 +262,7 @@ default-package-overrides:
   - cairo ==0.13.4.2
   - calendar-recycling ==0.0
   - call-stack ==0.1.0
+  - capataz ==0.1.0.1
   - carray ==0.1.6.8
   - cartel ==0.18.0.2
   - cased ==0.1.0.0
@@ -366,22 +270,21 @@ default-package-overrides:
   - cases ==0.1.3.2
   - casing ==0.1.2.1
   - cassava ==0.5.1.0
-  - cassava-conduit ==0.4.0.1
+  - cassava-conduit ==0.4.0.2
+  - cassava-records ==0.1.0.4
   - cassette ==0.1.0
   - cast ==0.1.0.2
   - cayley-client ==0.4.4
   - cereal ==0.5.5.0
-  - cereal-conduit ==0.7.3
+  - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
   - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
-  - ChannelT ==0.0.0.4
+  - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.3
   - Chart ==1.8.3
   - Chart-cairo ==1.8.3
-  - Chart-diagrams ==1.8.3
-  - chart-unit ==0.5.5.0
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
   - chatwork ==0.1.3.1
@@ -399,11 +302,11 @@ 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.0
   - clang-compilation-database ==0.1.0.1
-  - classy-prelude ==1.3.1
-  - classy-prelude-conduit ==1.3.1
-  - classy-prelude-yesod ==1.3.1
+  - classyplate ==0.3.0.2
+  - classy-prelude ==1.4.0
+  - classy-prelude-conduit ==1.4.0
+  - classy-prelude-yesod ==1.4.0
   - clay ==0.12.2
   - cli ==0.1.2
   - clientsession ==0.9.1.2
@@ -411,7 +314,6 @@ default-package-overrides:
   - clock ==0.7.2
   - clock-extras ==0.1.0.2
   - clr-host ==0.2.0.1
-  - clr-inline ==0.2.0.1
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.2
@@ -428,12 +330,10 @@ default-package-overrides:
   - colorize-haskell ==1.0.1
   - colour ==2.3.4
   - colour-accelerate ==0.2.0.0
-  - combinatorial ==0.0
+  - combinatorial ==0.1
   - comfort-graph ==0.0.3
   - commutative ==0.0.1.4
   - comonad ==5.0.3
-  - comonads-fd ==4.0
-  - comonad-transformers ==4.0
   - compact ==0.1.0.1
   - compactmap ==0.1.4.2.1
   - compensated ==0.7.2
@@ -442,20 +342,19 @@ default-package-overrides:
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
+  - compressed ==3.11
   - concise ==0.1.0.1
-  - concurrency ==1.2.3.0
+  - concurrency ==1.4.0.2
   - concurrent-extra ==0.7.0.11
   - concurrent-output ==1.10.4
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.2.13.1
-  - conduit-algorithms ==0.0.7.2
-  - conduit-combinators ==1.1.2
+  - conduit ==1.3.0
+  - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
-  - conduit-extra ==1.2.3.2
+  - conduit-extra ==1.3.0
   - conduit-iconv ==0.1.1.3
-  - conduit-parse ==0.1.2.2
   - conduit-throttle ==0.3.1.0
   - ConfigFile ==1.1.4
   - config-ini ==0.2.2.0
@@ -465,17 +364,16 @@ default-package-overrides:
   - connection ==0.2.8
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
-  - constraints ==0.9.1
+  - constraints ==0.10
   - consul-haskell ==0.4.2
   - containers-unicode-symbols ==0.3.1.1
   - contravariant ==1.4.1
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
   - control-monad-free ==0.6.1
-  - control-monad-loop ==0.1
   - control-monad-omega ==0.3.1
   - convertible ==1.1.1.0
-  - cookie ==0.4.3
+  - cookie ==0.4.4
   - countable ==1.0
   - country ==0.1.4
   - courier ==0.1.1.5
@@ -486,13 +384,15 @@ default-package-overrides:
   - cql ==3.1.1
   - cql-io ==0.16.0
   - crackNum ==1.9
-  - criterion ==1.2.6.0
+  - credential-store ==0.1.2
+  - criterion ==1.3.0.0
   - cron ==0.6.1
   - crypto-api ==0.13.3
   - crypto-api-tests ==0.3
   - cryptocipher ==0.6.2
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
+  - cryptocompare ==0.1.1
   - crypto-enigma ==0.0.2.10
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
@@ -500,11 +400,9 @@ default-package-overrides:
   - cryptohash-sha1 ==0.11.100.1
   - cryptohash-sha256 ==0.11.101.0
   - cryptohash-sha512 ==0.11.100.1
-  - cryptonite ==0.24
+  - cryptonite ==0.25
   - cryptonite-conduit ==0.2.2
   - cryptonite-openssl ==0.6
-  - crypto-numbers ==0.2.7
-  - crypto-pubkey ==0.2.8
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
@@ -515,13 +413,13 @@ default-package-overrides:
   - csv ==0.1.2
   - csv-conduit ==0.6.8.1
   - ctrie ==0.2
-  - cubicbezier ==0.6.0.5
   - cubicspline ==0.1.2
   - cublas ==0.4.0.0
   - cuda ==0.9.0.2
   - cue-sheet ==1.0.1
   - cufft ==0.8.0.0
   - curl ==1.3.8
+  - curl-runnings ==0.2.0
   - currencies ==0.1.1.1
   - cusolver ==0.1.0.0
   - cusparse ==0.1.0.0
@@ -533,17 +431,16 @@ default-package-overrides:
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
-  - data-check ==0.1.1
   - data-checked ==0.3
   - data-clist ==0.1.2.0
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
-  - data-default-instances-base ==0.1.0.1
   - data-default-instances-containers ==0.0.1
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==2.0.1.0
-  - data-diverse-lens ==1.0.0.1
+  - data-diverse-lens ==2.1.0.0
+  - datadog ==0.2.0.0
   - data-dword ==0.3.1.2
   - data-endian ==0.1.1
   - data-fix ==0.2.0
@@ -568,40 +465,23 @@ default-package-overrides:
   - dbcleaner ==0.1.3
   - dbus ==0.10.15
   - debian-build ==0.10.1.0
-  - debug ==0.0.2
-  - Decimal ==0.4.2
-  - declarative ==0.5.1
+  - debug ==0.1
+  - Decimal ==0.5.1
   - deepseq-generics ==0.2.0.0
-  - dejafu ==0.9.1.2
+  - dejafu ==1.3.1.0
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2
-  - derive ==2.6.3
-  - deriving-compat ==0.3.6
+  - deriving-compat ==0.4.1
   - descriptive ==0.9.4
-  - dhall ==1.8.2
-  - dhall-bash ==1.0.6
-  - dhall-json ==1.0.9
-  - dhall-nix ==1.0.9
-  - dhall-text ==1.0.5
-  - diagrams ==1.4
-  - diagrams-builder ==0.8.0.2
-  - diagrams-cairo ==1.4
-  - diagrams-canvas ==1.4
-  - diagrams-contrib ==1.4.1
-  - diagrams-core ==1.4.0.1
-  - diagrams-lib ==1.4.2
-  - diagrams-postscript ==1.4
-  - diagrams-solve ==0.1.1
-  - diagrams-svg ==1.4.1.1
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
   - diff3 ==0.3.0
   - digest ==0.0.1.2
   - digits ==0.3.1
-  - dimensional ==1.0.1.3
+  - dimensional ==1.1
   - directory-tree ==0.12.1
   - direct-rocksdb ==0.0.3
   - direct-sqlite ==2.3.22
@@ -610,8 +490,10 @@ default-package-overrides:
   - disk-free-space ==0.1.0.1
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
-  - distributed-closure ==0.3.5
+  - distributed-closure ==0.4.0
   - distributed-process ==0.7.3
+  - distributed-process-lifted ==0.3.0.1
+  - distributed-process-monad-control ==0.5.1.3
   - distributed-process-simplelocalnet ==0.2.4
   - distributed-process-tests ==0.4.11
   - distributed-static ==0.3.8
@@ -624,27 +506,25 @@ default-package-overrides:
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==3.0.2
-  - docker ==0.4.1.1
-  - docker-build-cacher ==1.8.2
+  - docker ==0.5.1.0
+  - docker-build-cacher ==1.9.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
-  - doctemplates ==0.2.1
+  - doctemplates ==0.2.2
   - doctest ==0.13.0
-  - doctest-discover ==0.1.0.9
-  - doctest-driver-gen ==0.1.0.1
+  - doctest-discover ==0.1.0.7
+  - doctest-driver-gen ==0.2.0.0
   - do-list ==1.0.1
   - dom-parser ==3.0.0
   - dotenv ==0.5.2.3
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
-  - dpor ==0.2.0.0
   - drawille ==0.1.2.0
   - DRBG ==0.5.5
   - drifter ==0.2.3
   - drifter-postgresql ==0.2.1
   - dsp ==0.2.4
-  - dual-tree ==0.2.1
   - dublincore-xml-conduit ==0.1.0.2
   - dvorak ==0.1.0.0
   - dynamic-state ==0.3
@@ -654,17 +534,14 @@ default-package-overrides:
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
   - ed25519 ==0.0.5.0
-  - ede ==0.2.8.7
   - EdisonAPI ==1.3.1
-  - EdisonCore ==1.3.1.1
+  - EdisonCore ==1.3.2.1
   - edit-distance ==0.2.2.1
   - edit-distance-vector ==1.0.0.4
   - editor-open ==0.6.0.0
-  - effect-handlers ==0.1.0.8
-  - either ==4.5
+  - either ==5
   - either-unwrap ==1.1
   - ekg ==0.4.0.14
-  - ekg-cloudwatch ==0.0.1.6
   - ekg-core ==0.1.1.4
   - ekg-json ==0.1.0.6
   - ekg-statsd ==0.2.2.0
@@ -673,19 +550,17 @@ default-package-overrides:
   - eliminators ==0.3
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - elm-export-persistent ==0.1.2
   - emailaddress ==0.2.0.0
   - email-validate ==2.3.2.3
   - enclosed-exceptions ==1.0.2
-  - EntrezHTTP ==1.0.4
   - entropy ==0.3.8
   - enummapset ==0.5.2.1
   - enumset ==0.0.4.1
   - envelope ==0.2.2.0
   - envparse ==0.4
-  - envy ==1.3.0.2
+  - envy ==1.5.0.0
   - epub-metadata ==4.5
-  - eq ==4.0.4
+  - eq ==4.1
   - equal-files ==0.0.5.3
   - equivalence ==0.3.2
   - erf ==2.0.0.0
@@ -693,23 +568,21 @@ default-package-overrides:
   - errors-ext ==0.4.1
   - error-util ==0.0.1.2
   - ersatz ==0.4.2
-  - esqueleto ==2.5.3
-  - etcd ==1.0.5
   - ether ==0.5.1.0
+  - euler-tour-tree ==0.1.0.1
   - event ==0.1.4
   - eventful-core ==0.2.0
-  - eventful-dynamodb ==0.2.0
   - eventful-memory ==0.2.0
   - eventful-postgresql ==0.2.0
   - eventful-sql-common ==0.2.0
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventsource-api ==1.1.1
-  - eventsource-geteventstore-store ==1.0.4
-  - eventsource-store-specs ==1.0.1
-  - eventsource-stub-store ==1.0.2
-  - eventstore ==0.15.0.2
+  - eventsource-api ==1.3.0
+  - eventsource-geteventstore-store ==1.1.0
+  - eventsource-store-specs ==1.1.1
+  - eventsource-stub-store ==1.0.3
+  - eventstore ==1.1.2
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
@@ -724,7 +597,7 @@ default-package-overrides:
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.1.5.2
   - extensible ==0.4.8
-  - extensible-effects ==2.1.0.0
+  - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.6.4
   - extractable-singleton ==0.0.1
@@ -735,17 +608,15 @@ default-package-overrides:
   - fast-builder ==0.0.1.0
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.11
-  - fast-math ==1.0.2
-  - fb ==1.1.1
+  - fb ==1.2.0
   - fclabels ==2.0.3.3
-  - fdo-notify ==0.3.1
   - feature-flags ==0.1.0.1
-  - fedora-haskell-tools ==0.4
+  - fedora-haskell-tools ==0.5.1
   - feed ==1.0.0.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
-  - fgl ==5.5.4.0
-  - filecache ==0.2.9
+  - fgl ==5.6.0.0
+  - filecache ==0.3.1
   - file-embed ==0.0.10.1
   - filelock ==0.1.1.2
   - filemanip ==0.3.6.3
@@ -760,11 +631,10 @@ default-package-overrides:
   - fitspec ==0.4.4
   - fixed ==0.2.1.1
   - fixed-length ==0.2
-  - fixed-vector ==1.0.0.0
+  - fixed-vector ==1.1.0.0
   - fixed-vector-hetero ==0.4.0.0
   - flac ==0.1.2
   - flac-picture ==0.1.1
-  - flat ==0.3
   - flat-mcmc ==1.5.0
   - flexible-defaults ==0.0.1.2
   - FloatingHex ==0.4
@@ -775,7 +645,7 @@ default-package-overrides:
   - fn ==0.3.0.2
   - focus ==0.1.5.2
   - fold-debounce ==0.2.0.6
-  - fold-debounce-conduit ==0.1.0.5
+  - fold-debounce-conduit ==0.2.0.0
   - foldl ==1.3.7
   - folds ==0.7.4
   - follow-file ==0.0.2
@@ -785,38 +655,39 @@ default-package-overrides:
   - ForestStructures ==0.0.0.2
   - forma ==0.2.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.2.5
-  - foundation ==0.0.17
+  - formatting ==6.3.0
+  - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
-  - free ==4.12.4
+  - free ==5.0.1
   - freenect ==1.2.1
-  - freer-simple ==1.0.1.1
+  - freer-simple ==1.1.0.0
   - freetype2 ==0.1.2
   - free-vl ==0.1.4
   - friday ==0.2.3.1
+  - friday-juicypixels ==0.1.2.3
   - friendly-time ==0.4.1
   - frisby ==0.2.2
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.2.1.1
   - fsnotify-conduit ==0.1.0.0
-  - fswatch ==0.1.0.2
-  - funcmp ==1.8
+  - funcmp ==1.9
   - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
   - fuzzyset ==0.1.0.6
-  - gauge ==0.1.3
+  - gauge ==0.2.1
+  - gc ==0.0.2
   - gd ==3000.7.3
   - gdax ==0.6.0.0
   - Genbank ==1.0.3
-  - general-games ==1.0.5
+  - general-games ==1.1.1
   - generic-aeson ==0.2.0.9
   - generic-arbitrary ==0.1.0
   - generic-deriving ==1.12.1
   - generic-lens ==0.5.1.0
-  - GenericPretty ==1.2.1
-  - generic-random ==1.0.0.0
+  - GenericPretty ==1.2.2
+  - generic-random ==1.1.0.2
   - generics-eot ==0.2.1.1
   - generics-sop ==0.3.2.0
   - generics-sop-lens ==0.1.2.1
@@ -843,13 +714,12 @@ default-package-overrides:
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
   - ghc-events ==0.7.1
-  - ghc-exactprint ==0.5.6.0
+  - ghc-exactprint ==0.5.6.1
   - ghcid ==0.6.10
   - ghcjs-base-stub ==0.1.0.4
   - ghcjs-codemirror ==0.0.0.1
-  - ghcjs-dom ==0.9.2.0
-  - ghcjs-dom-jsaddle ==0.9.2.0
   - ghcjs-perch ==0.3.3.2
+  - ghc-parser ==0.2.0.1
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.4.1
   - ghc-syb-utils ==0.2.3.3
@@ -858,22 +728,19 @@ default-package-overrides:
   - ghc-typelits-knownnat ==0.4
   - ghc-typelits-natnormalise ==0.5.8
   - ghost-buster ==0.1.1.0
-  - gi-atk ==2.0.14
-  - gi-cairo ==1.0.14
-  - gi-glib ==2.0.15
-  - gi-gobject ==2.0.15
-  - gi-javascriptcore ==4.0.14
+  - gi-atk ==2.0.15
+  - gi-cairo ==1.0.15
+  - gi-glib ==2.0.16
+  - gi-gobject ==2.0.16
+  - gi-javascriptcore ==4.0.15
   - ginger ==0.7.3.0
-  - giphy-api ==0.5.2.0
   - git ==0.2.1
-  - github ==0.18
-  - github-release ==1.1.4
+  - github ==0.19
+  - github-release ==1.1.5
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
-  - gitlib ==3.1.1
-  - gitlib-libgit2 ==3.1.1
-  - gitlib-test ==3.1.0.3
+  - github-webhooks ==0.9.1
   - gitrev ==1.3.1
   - gl ==0.8.0
   - glabrous ==0.3.4
@@ -894,112 +761,13 @@ default-package-overrides:
   - GLUT ==2.7.0.12
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.5.1
-  - goggles ==0.1.0.3
-  - gogol ==0.3.0
-  - gogol-adexchange-buyer ==0.3.0
-  - gogol-adexchange-seller ==0.3.0
-  - gogol-admin-datatransfer ==0.3.0
-  - gogol-admin-directory ==0.3.0
-  - gogol-admin-emailmigration ==0.3.0
-  - gogol-admin-reports ==0.3.0
-  - gogol-adsense ==0.3.0
-  - gogol-adsense-host ==0.3.0
-  - gogol-affiliates ==0.3.0
-  - gogol-analytics ==0.3.0
-  - gogol-android-enterprise ==0.3.0
-  - gogol-android-publisher ==0.3.0
-  - gogol-appengine ==0.3.0
-  - gogol-apps-activity ==0.3.0
-  - gogol-apps-calendar ==0.3.0
-  - gogol-apps-licensing ==0.3.0
-  - gogol-apps-reseller ==0.3.0
-  - gogol-apps-tasks ==0.3.0
-  - gogol-appstate ==0.3.0
-  - gogol-autoscaler ==0.3.0
-  - gogol-bigquery ==0.3.0
-  - gogol-billing ==0.3.0
-  - gogol-blogger ==0.3.0
-  - gogol-books ==0.3.0
-  - gogol-civicinfo ==0.3.0
-  - gogol-classroom ==0.3.0
-  - gogol-cloudmonitoring ==0.3.0
-  - gogol-cloudtrace ==0.3.0
-  - gogol-compute ==0.3.0
-  - gogol-container ==0.3.0
-  - gogol-core ==0.3.0
-  - gogol-customsearch ==0.3.0
-  - gogol-dataflow ==0.3.0
-  - gogol-dataproc ==0.3.0
-  - gogol-datastore ==0.3.0
-  - gogol-debugger ==0.3.0
-  - gogol-deploymentmanager ==0.3.0
-  - gogol-dfareporting ==0.3.0
-  - gogol-discovery ==0.3.0
-  - gogol-dns ==0.3.0
-  - gogol-doubleclick-bids ==0.3.0
-  - gogol-doubleclick-search ==0.3.0
-  - gogol-drive ==0.3.0
-  - gogol-firebase-rules ==0.3.0
-  - gogol-fitness ==0.3.0
-  - gogol-fonts ==0.3.0
-  - gogol-freebasesearch ==0.3.0
-  - gogol-fusiontables ==0.3.0
-  - gogol-games ==0.3.0
-  - gogol-games-configuration ==0.3.0
-  - gogol-games-management ==0.3.0
-  - gogol-genomics ==0.3.0
-  - gogol-gmail ==0.3.0
-  - gogol-groups-migration ==0.3.0
-  - gogol-groups-settings ==0.3.0
-  - gogol-identity-toolkit ==0.3.0
-  - gogol-kgsearch ==0.3.0
-  - gogol-latencytest ==0.3.0
-  - gogol-logging ==0.3.0
-  - gogol-maps-coordinate ==0.3.0
-  - gogol-maps-engine ==0.3.0
-  - gogol-mirror ==0.3.0
-  - gogol-monitoring ==0.3.0
-  - gogol-oauth2 ==0.3.0
-  - gogol-pagespeed ==0.3.0
-  - gogol-partners ==0.3.0
-  - gogol-people ==0.3.0
-  - gogol-play-moviespartner ==0.3.0
-  - gogol-plus ==0.3.0
-  - gogol-plus-domains ==0.3.0
-  - gogol-prediction ==0.3.0
-  - gogol-proximitybeacon ==0.3.0
-  - gogol-pubsub ==0.3.0
-  - gogol-qpxexpress ==0.3.0
-  - gogol-replicapool ==0.3.0
-  - gogol-replicapool-updater ==0.3.0
-  - gogol-resourcemanager ==0.3.0
-  - gogol-resourceviews ==0.3.0
-  - gogol-script ==0.3.0
-  - gogol-sheets ==0.3.0
-  - gogol-shopping-content ==0.3.0
-  - gogol-siteverification ==0.3.0
-  - gogol-spectrum ==0.3.0
-  - gogol-sqladmin ==0.3.0
-  - gogol-storage ==0.3.0
-  - gogol-storage-transfer ==0.3.0
-  - gogol-tagmanager ==0.3.0
-  - gogol-taskqueue ==0.3.0
-  - gogol-translate ==0.3.0
-  - gogol-urlshortener ==0.3.0
-  - gogol-useraccounts ==0.3.0
-  - gogol-vision ==0.3.0
-  - gogol-webmaster-tools ==0.3.0
-  - gogol-youtube ==0.3.0
-  - gogol-youtube-analytics ==0.3.0
-  - gogol-youtube-reporting ==0.3.0
+  - goggles ==0.3.2
   - google-cloud ==0.0.4
   - google-oauth2-jwt ==0.2.2
-  - google-translate ==0.4.1
   - GPipe ==2.2.3
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphs ==0.7.1
-  - graphviz ==2999.19.0.0
   - graph-wrapper ==0.2.5.1
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
@@ -1012,31 +780,24 @@ default-package-overrides:
   - groundhog-th ==0.8.0.2
   - group-by-date ==0.1.0.2
   - grouped-list ==0.2.1.5
-  - groupoids ==4.0
   - groups ==0.4.1.0
   - gtk2hs-buildtools ==0.13.3.1
-  - gym-http-api ==0.1.0.0
   - H ==0.9.0.1
   - h2c ==1.0.0
   - hackage-db ==2.0
   - hackage-security ==0.5.2.2
-  - hackernews ==1.3.0.0
-  - haddock-library ==1.4.3
+  - haddock-library ==1.4.5
   - hailgun ==0.4.1.6
   - hailgun-simple ==0.1.0.0
-  - hakyll ==4.10.0.0
   - half ==0.2.2.3
   - hamilton ==0.1.0.2
-  - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
   - hapistrano ==0.3.5.3
-  - happstack-hsp ==7.3.7.3
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.0.1
   - happstack-server-tls ==7.1.6.5
   - happy ==1.19.9
-  - harp ==0.4.3
   - hasbolt ==0.1.3.0
   - hashable ==1.2.7.0
   - hashable-time ==0.2.0.1
@@ -1044,45 +805,36 @@ default-package-overrides:
   - hashmap ==1.3.3
   - hashtables ==1.2.2.1
   - haskeline ==0.7.4.2
-  - haskell-gi ==0.20.3
-  - haskell-gi-base ==0.20.8
-  - haskell-gi-overloading ==1.0
-  - haskell-import-graph ==1.0.3
+  - haskell-gi ==0.21.0
+  - haskell-gi-base ==0.21.0
+  - haskell-gi-overloading ==0.0
   - haskell-lexer ==1.0.1
   - haskell-lsp ==0.2.0.1
   - haskell-lsp-client ==1.0.0.1
-  - haskell-names ==0.9.0
+  - haskell-names ==0.9.1
   - haskell-neo4j-client ==0.3.2.4
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.4.0
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.2.0
-  - haskell-src-exts ==1.19.1
-  - haskell-src-exts-simple ==1.19.0.0
+  - haskell-src-exts ==1.20.2
   - haskell-src-exts-util ==0.2.2
   - haskell-src-meta ==0.8.0.2
-  - haskell-tools-ast ==1.0.0.4
-  - haskell-tools-backend-ghc ==1.0.0.4
-  - haskell-tools-builtin-refactorings ==1.0.0.4
-  - haskell-tools-cli ==1.0.0.4
-  - haskell-tools-daemon ==1.0.0.4
-  - haskell-tools-debug ==1.0.0.4
-  - haskell-tools-demo ==1.0.0.4
-  - haskell-tools-prettyprint ==1.0.0.4
-  - haskell-tools-refactor ==1.0.0.4
-  - haskell-tools-rewrite ==1.0.0.4
+  - haskell-tools-ast ==1.0.1.1
+  - haskell-tools-backend-ghc ==1.0.1.1
+  - haskell-tools-prettyprint ==1.0.1.1
+  - haskell-tools-refactor ==1.0.1.1
+  - haskell-tools-rewrite ==1.0.1.1
   - haskintex ==0.8.0.0
   - hasmin ==1.0.1
   - hasql ==1.1.1
   - hasql-migration ==0.1.3
-  - hasql-optparse-applicative ==0.2.4
+  - hasql-optparse-applicative ==0.3
   - hasql-pool ==0.4.3
-  - hasql-transaction ==0.5.2
+  - hasql-transaction ==0.6
   - hastache ==0.6.1
-  - hasty-hamiltonian ==1.3.0
-  - HaTeX ==3.17.3.1
+  - HaTeX ==3.18.0.0
   - haxl ==0.5.1.0
-  - haxl-amazonka ==0.1.1
   - HaXml ==1.25.4
   - haxr ==3000.11.2
   - hbeanstalk ==0.2.4
@@ -1099,9 +851,11 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.5.2
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.9.12
+  - hedis ==0.10.0
+  - heist ==1.0.1.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
+  - herms ==1.8.1.4
   - heterocephalus ==1.0.5.1
   - hex ==0.1.2
   - hexml ==0.3.3
@@ -1114,14 +868,13 @@ default-package-overrides:
   - hidapi ==0.1.4
   - hidden-char ==0.1.0.2
   - hierarchical-clustering ==0.4.6
-  - higher-leveldb ==0.4.0.1
+  - higher-leveldb ==0.5.0.1
   - highjson ==0.4.0.0
   - highjson-swagger ==0.4.0.0
   - highjson-th ==0.4.0.0
   - highlighting-kate ==0.6.4
   - hinotify ==0.3.9
   - hint ==0.7.0
-  - hip ==1.5.3.0
   - histogram-fill ==0.8.5.0
   - hit ==0.6.3
   - hjsmin ==0.2.0.2
@@ -1130,19 +883,17 @@ default-package-overrides:
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.6.1
   - hmatrix ==0.18.2.0
+  - hmatrix-backprop ==0.1.0.0
   - hmatrix-gsl ==0.18.2.0
   - hmatrix-gsl-stats ==0.4.1.7
   - hmatrix-morpheus ==0.1.1.1
   - hmatrix-repa ==0.1.2.2
   - hmatrix-special ==0.4.0.1
+  - hmatrix-vector-sized ==0.1.1.0
   - hmpfr ==0.4.4
-  - hnix ==0.3.4
-  - hoauth2 ==1.5.1
   - hocilib ==0.2.0
-  - Hoed ==0.4.1
-  - holy-project ==0.2.0.1
-  - hOpenPGP ==2.5.5
-  - hopenpgp-tools ==0.19.5
+  - Hoed ==0.5.0
+  - hOpenPGP ==2.6
   - hopfli ==0.2.2.1
   - hosc ==0.16
   - hostname ==1.0
@@ -1150,13 +901,12 @@ default-package-overrides:
   - hourglass ==0.2.11
   - hourglass-orphans ==0.1.0.0
   - hp2pretty ==0.8.0.2
-  - hpack ==0.21.2
+  - hpack ==0.27.0
   - hpc-coveralls ==1.0.10
   - HPDF ==1.4.10
   - hpio ==0.9.0.5
   - hpp ==0.5.1
   - hpqtypes ==1.5.1.1
-  - hprotoc ==2.4.8
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
@@ -1164,17 +914,17 @@ default-package-overrides:
   - hsass ==0.5.0
   - hsb2hs ==0.3.1
   - hs-bibutils ==6.2.0.1
-  - hscolour ==1.24.2
+  - hscolour ==1.24.4
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
-  - hse-cpp ==0.2
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
   - hsinstall ==1.6
+  - HSlippyMap ==3.0
   - hslogger ==1.2.10
   - hslua ==0.9.5.1
   - hslua-aeson ==0.3.0.1
@@ -1184,20 +934,20 @@ default-package-overrides:
   - HsOpenSSL ==0.11.4.13
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.4.4
+  - hspec ==2.4.8
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.4.0
-  - hspec-core ==2.4.4
-  - hspec-discover ==2.4.4
+  - hspec-core ==2.4.8
+  - hspec-discover ==2.4.8
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.4
-  - hspec-golden-aeson ==0.4.0.0
+  - hspec-golden-aeson ==0.5.1.0
   - hspec-megaparsec ==1.0.0
   - hspec-meta ==2.4.6
   - hspec-pg-transact ==0.1.0.2
-  - hspec-smallcheck ==0.4.2
+  - hspec-smallcheck ==0.5.0
   - hspec-wai ==0.9.0
   - hspec-wai-json ==0.9.0
   - hspec-webdriver ==1.2.0
@@ -1206,14 +956,13 @@ default-package-overrides:
   - hstatsd ==0.1
   - HStringTemplate ==0.8.6
   - HSvm ==0.1.0.3.22
-  - hsx2hs ==0.14.1.2
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
   - hsyslog-udp ==0.2.1
   - htaglib ==1.1.1
   - HTF ==0.13.2.2
   - html ==1.0.1.2
-  - html-conduit ==1.2.1.2
+  - html-conduit ==1.3.0
   - html-email-validate ==0.2.0.0
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
@@ -1224,17 +973,17 @@ default-package-overrides:
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
-  - http-conduit ==2.2.4
+  - http-conduit ==2.3.0
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
-  - http-reverse-proxy ==0.4.5
+  - http-reverse-proxy ==0.5.0
   - http-streams ==0.8.5.5
-  - http-types ==0.9.1
+  - http-types ==0.12.1
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
-  - hunit-dejafu ==0.7.1.1
+  - hunit-dejafu ==1.1.0.2
   - hvect ==0.4.0.0
   - hw-balancedparens ==0.2.0.1
   - hw-bits ==0.7.0.2
@@ -1242,6 +991,8 @@ default-package-overrides:
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
+  - hw-fingertree ==0.1.0.0
+  - hw-fingertree-strict ==0.1.0.0
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.2
   - hw-int ==0.0.0.3
@@ -1268,42 +1019,40 @@ default-package-overrides:
   - hybrid-vectors ==0.2.2
   - hyperloglog ==0.4.2
   - hyphenation ==0.7.1
-  - ical ==0.0.1
   - iconv ==0.4.1.3
   - identicon ==0.2.2
-  - idris ==1.2.0
   - ieee754 ==0.8.0
   - if ==0.1.0.0
-  - IfElse ==0.85
   - iff ==0.0.6
   - ignore ==0.1.1.0
+  - ihaskell ==0.9.0.2
   - ihs ==0.1.0.2
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
   - Imlib ==0.1.2
   - immortal ==0.2.2.1
-  - importify ==1.0.1
+  - imprint ==0.0.1.0
   - include-file ==0.1.0.3
   - incremental-parser ==0.2.5.3
   - indentation-core ==0.0.0.1
   - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.1
+  - indexed-list-literals ==0.1.0.1
   - inflections ==0.4.0.1
-  - influxdb ==1.2.2.3
+  - influxdb ==1.3.0.1
   - ini ==0.3.5
   - inline-c ==0.6.0.5
   - inline-c-cpp ==0.2.1.0
-  - inline-java ==0.7.2
+  - inline-java ==0.8.2
   - inline-r ==0.9.1
   - insert-ordered-containers ==0.2.1.0
-  - inspection-testing ==0.1.2
+  - inspection-testing ==0.2.0.1
   - instance-control ==0.1.2.0
   - integer-logarithms ==1.0.2.1
   - integration ==0.2.1
   - intern ==0.9.2
-  - interpolate ==0.1.1
+  - interpolate ==0.2.0
   - interpolatedstring-perl6 ==1.0.0
-  - Interpolation ==0.3.0
   - interpolation ==0.1.0.2
   - IntervalMap ==0.5.3.1
   - intervals ==0.8.1
@@ -1325,8 +1074,8 @@ default-package-overrides:
   - IPv6DB ==0.2.5
   - ipython-kernel ==0.9.0.1
   - irc ==0.6.1.0
-  - irc-client ==1.0.1.1
-  - irc-conduit ==0.2.2.5
+  - irc-client ==1.1.0.2
+  - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
   - islink ==0.1.0.0
@@ -1343,65 +1092,63 @@ default-package-overrides:
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
-  - jni ==0.5.1
+  - jni ==0.6.0
   - jose ==0.6.0.3
   - jose-jwt ==0.7.8
-  - jsaddle ==0.9.4.0
-  - jsaddle-dom ==0.9.2.0
   - js-flot ==0.8.3
-  - js-jquery ==3.2.1
+  - js-jquery ==3.3.1
   - json ==0.9.1
   - json-autotype ==1.0.18
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.3
   - json-schema ==0.7.4.1
-  - json-stream ==0.4.1.5
+  - json-stream ==0.4.2.0
   - JuicyPixels ==3.2.9.4
-  - JuicyPixels-extra ==0.2.2
+  - JuicyPixels-extra ==0.3.0
   - JuicyPixels-scale-dct ==0.1.1.2
-  - justified-containers ==0.2.0.1
+  - justified-containers ==0.3.0.0
   - jvm ==0.4.2
+  - jvm-batching ==0.1.1
+  - jvm-streaming ==0.3.1
   - jwt ==0.7.2
-  - kan-extensions ==5.0.2
-  - kanji ==3.0.2
-  - kansas-comet ==0.4
-  - katip ==0.5.3.0
-  - katip-elasticsearch ==0.4.1.0
+  - kan-extensions ==5.1
+  - kanji ==3.1.0
   - katydid ==0.1.1.0
   - kawhi ==0.3.0
   - kdt ==0.2.4
   - keycode ==0.2.2
-  - keys ==3.11
+  - keys ==3.12
   - kmeans ==0.1.3
   - knob ==0.1.1
   - koofr-client ==1.0.0.3
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==0.4.7
+  - lackey ==1.0.1
+  - lambdabot-core ==5.1.0.1
+  - lambdabot-irc-plugins ==5.1.0.1
   - lame ==0.1.1
   - language-c ==0.7.2
   - language-c-quote ==0.12.1
-  - language-docker ==1.0.0
+  - language-docker ==2.0.1
+  - language-ecmascript ==0.17.2.0
   - language-fortran ==0.5.1
   - language-glsl ==0.2.1
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.10
-  - language-puppet ==1.3.16
-  - lapack-carray ==0.0
-  - lapack-ffi ==0.0
-  - lapack-ffi-tools ==0.0.0.1
+  - lapack-carray ==0.0.1
+  - lapack-ffi ==0.0.1
+  - lapack-ffi-tools ==0.1
   - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - latex ==0.1.0.3
-  - lattices ==1.7
+  - lattices ==1.7.1
   - lazyio ==0.1.0.4
-  - lazysmallcheck ==0.6
   - lca ==0.3.1
   - leancheck ==0.7.0
   - leapseconds-announced ==2017.1.0.1
-  - lens ==4.15.4
+  - lens ==4.16
   - lens-accelerate ==0.1.0.0
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
@@ -1410,16 +1157,17 @@ default-package-overrides:
   - lens-family-core ==1.2.2
   - lens-family-th ==0.5.0.1
   - lens-labels ==0.1.0.2
+  - lens-properties ==4.11.1
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
-  - lentil ==1.0.9.1
+  - lentil ==1.0.10.0
   - leveldb-haskell ==0.6.5
   - lexer-applicative ==2.1.0.1
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
   - libinfluxdb ==0.0.4
-  - libmpd ==0.9.0.7
+  - libmpd ==0.9.0.8
   - liboath-hs ==0.0.1.0
   - libsystemd-journal ==1.4.2
   - libxml-sax ==0.7.5
@@ -1435,7 +1183,7 @@ default-package-overrides:
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.2.0
   - List ==0.6.2
-  - ListLike ==4.5.1
+  - ListLike ==4.6
   - listsafe ==0.1.0.1
   - list-t ==1.0.0.1
   - llvm-hs ==5.1.3
@@ -1458,7 +1206,7 @@ default-package-overrides:
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
   - log-postgres ==0.7.0.2
-  - log-warper ==1.8.3
+  - log-warper ==1.8.10.1
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.3
@@ -1471,19 +1219,19 @@ default-package-overrides:
   - machines-binary ==0.3.0.3
   - machines-directory ==0.2.1.0
   - machines-io ==0.2.0.13
-  - magic ==1.1
-  - magicbane ==0.1.4
   - mainland-pretty ==0.6.1
   - makefile ==1.1.0.0
-  - mallard ==0.6.1.1
   - managed ==1.0.6
-  - mandrill ==0.5.3.2
+  - mandrill ==0.5.3.3
+  - mapquest-api ==0.3.1
+  - map-syntax ==0.2.0.2
   - markdown ==0.1.16
-  - markdown-unlit ==0.4.1
+  - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - markup ==4.0.3
-  - marvin ==0.2.5
+  - markup ==4.0.4
   - marvin-interpolate ==1.1.2
+  - massiv ==0.1.1.0
+  - massiv-io ==0.1.1.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
   - matplotlib ==0.6.0
@@ -1497,9 +1245,8 @@ default-package-overrides:
   - mcmc-types ==1.0.3
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
-  - megaparsec ==6.3.0
-  - mega-sdist ==0.3.0.6
-  - memory ==0.14.11
+  - megaparsec ==6.4.1
+  - memory ==0.14.16
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
   - mersenne-random-pure64 ==0.2.2.0
@@ -1507,52 +1254,47 @@ default-package-overrides:
   - messagepack-rpc ==0.5.1
   - metrics ==0.4.1.1
   - MFlow ==0.4.6.0
-  - mfsolve ==0.3.2.0
   - microformats2-parser ==1.0.1.7
   - microlens ==0.4.8.3
-  - microlens-aeson ==2.2.0.2
+  - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.8.0
   - microlens-mtl ==0.1.11.1
   - microlens-platform ==0.3.9.0
   - microlens-th ==0.4.1.3
-  - microsoft-translator ==0.1.1
   - microspec ==0.1.0.0
   - microstache ==1.0.1.1
   - midi ==0.2.2.2
-  - midi-music-box ==0.0.0.4
   - mighty-metropolis ==1.2.0
   - milena ==0.5.2.1
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.0.0
   - mime-types ==0.1.0.7
   - minimorph ==0.1.6.1
-  - minio-hs ==0.3.2
   - miniutter ==0.4.6.0
   - mintty ==0.1.1
   - misfortune ==0.1.1.2
-  - miso ==0.10.0.0
+  - miso ==0.14.0.0
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
   - mixed-types-num ==0.3.1.4
   - mltool ==0.1.0.2
   - mmap ==0.5.9
-  - mmark ==0.0.4.0
-  - mmark-ext ==0.0.1.2
+  - mmark ==0.0.5.6
+  - mmark-cli ==0.0.3.0
+  - mmark-ext ==0.2.0.0
   - mmorph ==1.1.1
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
   - model ==0.4.4
-  - modern-uri ==0.1.2.1
+  - modern-uri ==0.2.1.0
   - modify-fasta ==0.8.2.3
   - moesocks ==1.0.0.44
   - mole ==0.0.6
   - monad-control ==1.0.2.3
   - monad-control-aligned ==0.0.1
   - monad-coroutine ==0.9.0.4
-  - monadcryptorandom ==0.7.2
   - monad-extras ==0.6.0
-  - monad-http ==0.1.0.0
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
   - monadloc ==0.7.1
@@ -1581,7 +1323,7 @@ default-package-overrides:
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
   - mongoDB ==2.3.0.4
-  - monoidal-containers ==0.3.0.2
+  - monoidal-containers ==0.3.1.0
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.4
   - monoid-transformer ==0.0.4
@@ -1599,10 +1341,9 @@ default-package-overrides:
   - multiset ==0.3.3
   - multistate ==0.7.1.2
   - murmur-hash ==0.1.0.9
-  - MusicBrainz ==0.3.1
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
-  - mwc-probability ==1.3.0
+  - mwc-probability ==2.0.2
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
   - mysql ==0.1.4
@@ -1611,7 +1352,6 @@ default-package-overrides:
   - mysql-haskell-openssl ==0.8.3.0
   - mysql-simple ==0.4.4
   - nagios-check ==0.3.2
-  - nakadi-client ==0.3.0.0
   - names-th ==0.2.0.3
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
@@ -1621,8 +1361,8 @@ default-package-overrides:
   - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
   - neat-interpolation ==0.3.2.1
-  - netlib-carray ==0.0
-  - netlib-ffi ==0.0
+  - netlib-carray ==0.0.1
+  - netlib-ffi ==0.0.1
   - netpbm ==1.0.2
   - nettle ==0.2.0
   - netwire ==5.0.2
@@ -1633,11 +1373,10 @@ default-package-overrides:
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
   - network-carbon ==1.0.11
-  - network-conduit-tls ==1.2.2
+  - network-conduit-tls ==1.3.0
   - network-house ==0.1.0.2
   - network-info ==0.2.0.9
   - network-ip ==0.3.0.2
-  - network-msgpack-rpc ==0.0.4
   - network-multicast ==0.2.0
   - Network-NineP ==0.4.2
   - network-simple ==0.4.0.5
@@ -1655,12 +1394,11 @@ default-package-overrides:
   - NineP ==0.0.2.1
   - nix-paths ==1.0.1
   - NoHoed ==0.1.1
-  - nonce ==1.0.5
+  - nonce ==1.0.7
   - nondeterminism ==1.4
   - non-empty ==0.3
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
-  - normaldistribution ==1.1.0.3
   - normalization-insensitive ==2.0.1
   - NoTrace ==0.3.0.2
   - nsis ==0.3.2
@@ -1672,25 +1410,24 @@ default-package-overrides:
   - numhask-range ==0.1.3.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
-  - nvim-hs ==0.2.5
-  - nvim-hs-contrib ==0.2.0
-  - nvim-hs-ghcid ==0.2.0
   - nvvm ==0.8.0.2
+  - oauthenticated ==0.2.1.0
   - objective ==1.1.2
   - ObjectName ==1.1.0.1
   - ochintin-daicho ==0.1.0.1
+  - o-clock ==0.1.1
   - oeis ==0.3.9
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
   - once ==0.2
   - one-liner ==0.9.2
+  - one-liner-instances ==0.1.1.0
   - OneTuple ==0.2.1
   - online ==0.2.1.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.6.0.0
-  - opaleye-trans ==0.4.2
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.1
@@ -1706,17 +1443,18 @@ default-package-overrides:
   - optional-args ==1.0.2
   - options ==1.2.1.1
   - optparse-applicative ==0.14.2.0
-  - optparse-generic ==1.2.3
+  - optparse-generic ==1.3.0
   - optparse-simple ==0.1.0
   - optparse-text ==0.1.1.0
+  - overhang ==1.0.0
   - package-description-remote ==0.2.0.0
   - packdeps ==0.4.4
   - pager ==0.1.1.0
   - pagerduty ==0.0.8
   - pagination ==0.2.1
   - palette ==0.1.0.5
-  - pandoc ==2.0.6
-  - pandoc-citeproc ==0.12.2.5
+  - pandoc ==2.1.2
+  - pandoc-citeproc ==0.14.1.5
   - pandoc-types ==1.17.3.1
   - pango ==0.13.4.0
   - papillon ==0.1.0.5
@@ -1752,16 +1490,18 @@ default-package-overrides:
   - pdf-toolbox-document ==0.0.7.1
   - pell ==0.1.1.0
   - pem ==0.2.4
-  - perf ==0.3.0
+  - perf ==0.3.1.1
+  - perfect-hash-generator ==0.2.0.6
   - persistable-record ==0.6.0.1
   - persistable-types-HDBC-pg ==0.0.1.5
-  - persistent ==2.7.1
-  - persistent-mongoDB ==2.6.0
-  - persistent-mysql ==2.6.2.1
-  - persistent-mysql-haskell ==0.3.6
-  - persistent-postgresql ==2.6.3
+  - persistent ==2.8.1
+  - persistent-mongoDB ==2.8.0
+  - persistent-mysql ==2.8.1
+  - persistent-mysql-haskell ==0.4.0
+  - persistent-postgresql ==2.8.2.0
+  - persistent-redis ==2.5.2.2
   - persistent-refs ==0.4
-  - persistent-sqlite ==2.6.4
+  - persistent-sqlite ==2.8.1.2
   - persistent-template ==2.5.4
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
@@ -1770,7 +1510,7 @@ default-package-overrides:
   - picoparsec ==0.1.2.3
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.8
+  - pinboard ==0.9.12.9
   - pinch ==0.3.2.0
   - pipes ==4.3.8
   - pipes-aeson ==0.4.1.8
@@ -1779,10 +1519,10 @@ default-package-overrides:
   - pipes-category ==0.3.0.0
   - pipes-concurrency ==2.0.9
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.12
+  - pipes-extras ==1.0.13
   - pipes-fastx ==0.3.0.0
   - pipes-fluid ==0.6.0.0
-  - pipes-group ==1.0.8
+  - pipes-group ==1.0.9
   - pipes-misc ==0.4.0.1
   - pipes-mongodb ==0.1.0.0
   - pipes-network ==0.6.4.1
@@ -1794,11 +1534,10 @@ default-package-overrides:
   - pixelated-avatar-generator ==0.1.3
   - pkcs10 ==0.2.0.0
   - placeholders ==0.1
-  - plan-b ==0.2.1
   - plot ==0.2.3.9
+  - plot-light ==0.2.9
   - pointed ==5.0.1
   - pointedlist ==0.6.1
-  - pointful ==1.0.9
   - pointless-fun ==1.1.0.6
   - poll ==0.0.0.1
   - poly-arity ==0.1.0
@@ -1809,8 +1548,7 @@ default-package-overrides:
   - PortMidi ==0.1.6.1
   - posix-paths ==0.2.1.3
   - postgresql-binary ==0.12.1
-  - postgresql-libpq ==0.9.4.0
-  - postgresql-query ==3.3.0
+  - postgresql-libpq ==0.9.4.1
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.5.3.0
   - postgresql-simple-migration ==0.1.11.0
@@ -1819,7 +1557,8 @@ default-package-overrides:
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.2
   - post-mess-age ==0.2.1.0
-  - pqueue ==1.3.2.3
+  - pptable ==0.2.0.0
+  - pqueue ==1.4.1.1
   - pred-set ==0.0.1
   - pred-trie ==0.5.1.2
   - prefix-units ==0.2.0
@@ -1831,25 +1570,23 @@ default-package-overrides:
   - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
-  - prettyprinter ==1.1.1
+  - prettyprinter ==1.2.0.1
   - prettyprinter-ansi-terminal ==1.1.1.2
   - 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.6.16
-  - pretty-simple ==2.0.2.1
+  - pretty-simple ==2.1.0.0
   - pretty-types ==0.2.3.1
   - prim-array ==0.2.1
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
-  - printcess ==0.1.0.3
+  - prim-uniq ==0.1.0.1
   - probability ==0.2.5.1
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.1
-  - product-profunctors ==0.8.0.3
+  - product-profunctors ==0.9.0.0
   - profiterole ==0.1
-  - profiteur ==0.4.4.0
-  - profunctor-extras ==4.0
   - profunctors ==5.2.2
   - projectroot ==0.2.0.1
   - project-template ==0.2.0.1
@@ -1861,31 +1598,31 @@ default-package-overrides:
   - protobuf-simple ==0.1.0.5
   - protocol-buffers ==2.4.8
   - protocol-buffers-descriptor ==2.4.8
+  - protocol-radius ==0.0.1.0
+  - protocol-radius-test ==0.0.1.0
   - proto-lens ==0.2.2.0
   - proto-lens-arbitrary ==0.1.1.1
-  - proto-lens-combinators ==0.1.0.8
   - proto-lens-descriptors ==0.2.2.0
   - proto-lens-optparse ==0.1.0.4
-  - proto-lens-protobuf-types ==0.2.2.0
-  - proto-lens-protoc ==0.2.2.3
   - protolude ==0.2.1
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
   - psqueues ==0.2.5.0
   - pthread ==0.2.0
-  - publicsuffix ==0.20170802
+  - publicsuffix ==0.20171229
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.11.1.2
+  - pushbullet-types ==0.4.0.2
   - pusher-http-haskell ==1.5.1.2
   - pwstore-fast ==2.4.4
-  - qchas ==1.0.1.0
-  - qm-interpolated-string ==0.2.1.0
+  - qchas ==1.1.0.0
+  - qm-interpolated-string ==0.3.0.0
   - QuasiText ==0.1.2.6
   - quickbench ==1.0
   - QuickCheck ==2.10.1
-  - quickcheck-arbitrary-adt ==0.2.0.0
+  - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
   - quickcheck-classes ==0.3.3
   - quickcheck-combinators ==0.0.2
@@ -1908,27 +1645,25 @@ default-package-overrides:
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
   - random-tree ==0.6.0.5
-  - range ==0.1.2.0
   - range-set-list ==0.1.2.0
   - rank1dynamic ==0.4.0
+  - rank2classes ==1.0.1
   - rank-product ==0.2.0.1
   - Rasterific ==0.7.2.1
   - rasterific-svg ==0.3.3
-  - ratel ==0.3.10
-  - ratel-wai ==0.3.2
+  - ratel ==1.0.2
+  - ratel-wai ==1.0.1
   - ratio-int ==0.1.2
-  - rattletrap ==3.1.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
+  - rcu ==0.2.2
   - rdf ==0.1.0.2
   - rdtsc ==1.3.0.1
   - re2 ==0.2
-  - reactive-banana ==1.1.0.1
   - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - rebase ==1.1.1
   - recursion-schemes ==5.0.2
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
@@ -1942,9 +1677,7 @@ default-package-overrides:
   - reform-blaze ==0.2.4.3
   - reform-hamlet ==0.0.5.3
   - reform-happstack ==0.2.5.2
-  - reform-hsp ==0.2.7.1
   - RefSerialize ==0.4.0
-  - ref-tf ==0.4.0.1
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1954,7 +1687,7 @@ default-package-overrides:
   - regex-pcre-builtin ==0.94.4.8.8.35
   - regex-pcre-text ==0.94.0.1
   - regex-posix ==0.95.2
-  - regex-tdfa ==1.2.2
+  - regex-tdfa ==1.2.3
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.11.0.0
@@ -1968,18 +1701,14 @@ default-package-overrides:
   - repa-io ==3.4.1.1
   - repline ==0.1.7.0
   - req ==1.0.0
-  - req-conduit ==1.0.0
+  - req-url-extra ==0.1.0.0
   - reroute ==0.4.1.0
   - resource-pool ==0.2.3.2
-  - resourcet ==1.1.11
-  - rest-client ==0.5.1.1
+  - resourcet ==1.2.0
   - rest-core ==0.39
-  - rest-gen ==0.20.0.1
-  - rest-happstack ==0.3.1.1
   - rest-snap ==0.3.0.0
   - rest-stringmap ==0.2.0.6
   - rest-types ==1.14.1.1
-  - rest-wai ==0.2.0.1
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.7.6.1
@@ -1987,31 +1716,31 @@ default-package-overrides:
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.4
   - riak-protobuf ==0.23.0.0
-  - RNAlien ==1.3.7
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
+  - rollbar-hs ==0.2.0.0
   - rose-trees ==0.0.4.4
   - rot13 ==0.2.0.1
   - RSA ==2.3.0
+  - rss-conduit ==0.4.2.1
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
-  - safe ==0.3.15
-  - safecopy ==0.9.3.3
-  - safe-exceptions ==0.1.6.0
+  - safe ==0.3.17
+  - safecopy ==0.9.4
+  - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safeio ==0.0.5.0
   - SafeSemaphore ==0.10.1
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.2
-  - sandi ==0.4.1
   - sandman ==0.2.0.1
   - say ==0.1.0.0
   - sbp ==2.3.9
-  - sbv ==7.4
-  - SCalendar ==1.1.0
+  - sbv ==7.5
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -2019,10 +1748,10 @@ default-package-overrides:
   - scientific ==0.3.5.2
   - scotty ==0.11.0
   - scrypt ==0.5.0
-  - sdl2 ==2.3.0.1
+  - sdl2 ==2.4.0.1
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
-  - sdl2-mixer ==0.1
+  - sdl2-mixer ==1.1.0
   - sdl2-ttf ==2.0.2
   - search-algorithms ==0.3.0
   - securemem ==0.1.10
@@ -2031,7 +1760,7 @@ default-package-overrides:
   - selda-postgresql ==0.1.7.2
   - selda-sqlite ==0.1.6.0
   - semigroupoid-extras ==5
-  - semigroupoids ==5.2.1
+  - semigroupoids ==5.2.2
   - semigroups ==0.18.4
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
@@ -2039,39 +1768,38 @@ default-package-overrides:
   - sensu-run ==0.4.0.4
   - seqalign ==0.2.0.4
   - seqloc ==0.6.1.1
+  - sequence ==0.9.8
   - serf ==0.1.1.0
-  - servant ==0.11
-  - servant-auth-cookie ==0.5.0.5
-  - servant-blaze ==0.7.1
+  - servant ==0.13
+  - servant-blaze ==0.8
   - servant-cassava ==0.10
-  - servant-checked-exceptions ==0.4.1.0
-  - servant-client ==0.11
-  - servant-docs ==0.11
+  - servant-client ==0.13
+  - servant-client-core ==0.13
+  - servant-docs ==0.11.2
   - servant-elm ==0.4.0.1
   - servant-exceptions ==0.1.1
-  - servant-foreign ==0.10.1
+  - servant-foreign ==0.11
   - servant-generic ==0.1.0.1
+  - servant-github-webhook ==0.4.0.0
   - servant-js ==0.9.3.2
   - servant-JuicyPixels ==0.3.0.3
   - servant-kotlin ==0.1.1.0
-  - servant-lucid ==0.7.1
-  - servant-mock ==0.8.3
-  - servant-pandoc ==0.4.1.4
+  - servant-lucid ==0.8
+  - servant-mock ==0.8.4
+  - servant-pandoc ==0.5.0.0
   - servant-purescript ==0.9.0.2
-  - servant-rawm ==0.2.0.2
-  - servant-ruby ==0.5.1.0
-  - servant-server ==0.11.0.1
-  - servant-static-th ==0.1.0.6
+  - servant-ruby ==0.7.0.0
+  - servant-server ==0.13
+  - servant-static-th ==0.2.0.1
   - servant-subscriber ==0.6.0.1
-  - servant-swagger ==1.1.4
+  - servant-swagger ==1.1.5
   - servant-swagger-ui ==0.2.5.3.9.1
-  - servant-websockets ==1.0.0
+  - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.0
   - serversession ==1.0.1
   - serversession-backend-persistent ==1.0.4
   - serversession-backend-redis ==1.0.3
   - serversession-frontend-wai ==1.0
-  - serversession-frontend-yesod ==1.0
   - servius ==1.2.0.3
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
@@ -2083,13 +1811,13 @@ default-package-overrides:
   - shake ==0.16.3
   - shake-language-c ==0.11.0
   - shakespeare ==2.0.15
-  - shell-conduit ==4.6.1
-  - shell-escape ==0.2.0
+  - shelltestrunner ==1.9
   - shelly ==1.7.1
   - shikensu ==0.3.8
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
-  - show-prettyprint ==0.2.0.1
+  - show-combinators ==0.1.0.0
+  - show-prettyprint ==0.2.0.2
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple ==0.11.2
@@ -2104,18 +1832,18 @@ default-package-overrides:
   - siphash ==1.0.3
   - skein ==1.0.9.4
   - skeletons ==0.4.0
-  - skylighting ==0.5.1
-  - slack-web ==0.2.0.1
+  - skylighting ==0.6
+  - slack-web ==0.2.0.3
   - slave-thread ==1.0.2
   - slug ==0.1.7
   - smallcheck ==1.1.3.1
   - smoothie ==0.4.2.8
   - smtp-mail ==0.1.4.6
+  - snap ==1.1.0.0
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.3.1
   - snap-server ==1.0.3.3
   - snowflake ==0.1.1.1
-  - snowtify ==0.1.0.3
   - soap ==0.2.3.5
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.2
@@ -2127,6 +1855,7 @@ default-package-overrides:
   - sourcemap ==0.1.6
   - sox ==0.2.3
   - soxlib ==0.0.3
+  - sparkle ==0.7.4
   - sparse-linear-algebra ==0.2.9.9
   - spdx ==0.2.2.0
   - special-values ==0.1.0.0
@@ -2146,22 +1875,24 @@ default-package-overrides:
   - Spock-worker ==0.3.1.0
   - spreadsheet ==0.1.3.7
   - sqlite-simple ==0.4.14.0
-  - sqlite-simple-errors ==0.6.0.0
   - sql-words ==0.1.5.1
   - squeal-postgresql ==0.1.1.4
   - srcloc ==0.5.1.1
   - stache ==1.2.1
-  - stackage-curator ==0.15.1.0
   - stack-type ==0.1.0.0
+  - starter ==0.2.1
   - state-codes ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
   - stateWriter ==0.2.10
+  - static-text ==0.2
   - statistics ==0.14.0.2
+  - stb-image-redux ==0.2.1.2
+  - stitch ==0.5.0.0
   - stm ==2.4.5.0
   - stm-chans ==3.0.0.4
-  - stm-conduit ==3.0.0
+  - stm-conduit ==4.0.0
   - stm-containers ==0.2.16
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.3
@@ -2177,9 +1908,8 @@ default-package-overrides:
   - storablevector ==0.2.13
   - store ==0.4.3.2
   - store-core ==0.4.1
-  - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.14.0
-  - Stream ==0.4.7.2
+  - Strafunski-StrategyLib ==5.0.1.0
+  - stratosphere ==0.19.0
   - streaming ==0.2.1.0
   - streaming-bytestring ==0.1.5
   - streaming-commons ==0.1.19
@@ -2187,7 +1917,7 @@ default-package-overrides:
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
-  - strict-base-types ==0.5.0
+  - strict-base-types ==0.6.1
   - strict-concurrency ==0.2.4.2
   - strict-types ==0.1.2
   - stringable ==0.1.3
@@ -2198,23 +1928,17 @@ default-package-overrides:
   - string-conversions ==0.4.0.1
   - string-qq ==0.0.2
   - stringsearch ==0.3.6.6
-  - string-transform ==0.1.1
-  - stripe-core ==2.2.3
-  - stripe-haskell ==2.2.3
-  - stripe-http-streams ==2.2.3
-  - stripe-tests ==2.2.3
-  - strive ==4.0.3
-  - structured-haskell-mode ==1.1.0
-  - stylish-haskell ==0.8.1.0
+  - string-transform ==1.0.0
+  - stripe-core ==2.3.0
+  - strive ==5.0.3
+  - structs ==0.1.1
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
   - svg-builder ==0.1.0.2
-  - SVGFonts ==1.6.0.3
   - svg-tree ==0.6.2.1
   - swagger ==0.3.0
   - swagger2 ==2.2
-  - swagger-petstore ==0.0.1.8
   - swish ==0.9.2.0
   - syb ==0.7
   - syb-with-class ==0.6.1.8
@@ -2224,39 +1948,36 @@ default-package-overrides:
   - system-argv0 ==0.1.1
   - system-fileio ==0.3.16.3
   - system-filepath ==0.4.14
-  - system-posix-redirect ==1.1.0.1
   - tabular ==0.2.2.7
   - tagchup ==0.4.1
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.1
   - tagged-identity ==0.1.2
+  - tagshare ==0.0
   - tagsoup ==0.14.6
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.1.0
-  - tar-conduit ==0.1.1
+  - tar-conduit ==0.2.3
   - tardis ==0.4.1.0
-  - tasty ==0.11.3
+  - tasty ==1.0.1.1
   - tasty-ant-xml ==1.1.3
   - tasty-auto ==0.2.0.0
-  - tasty-dejafu ==0.7.1.1
-  - tasty-discover ==4.1.5
+  - tasty-dejafu ==1.1.0.1
+  - tasty-discover ==4.2.0
   - tasty-expected-failure ==0.11.1
-  - tasty-fail-fast ==0.0.3
-  - tasty-golden ==2.3.1.2
+  - tasty-golden ==2.3.1.3
   - tasty-hedgehog ==0.1.0.2
   - tasty-hspec ==1.1.3.3
   - tasty-html ==0.4.1.1
-  - tasty-hunit ==0.9.2
+  - tasty-hunit ==0.10.0.1
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
-  - tasty-quickcheck ==0.9.1
+  - tasty-quickcheck ==0.9.2
   - tasty-rerun ==1.1.10
   - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.3
-  - tasty-tap ==0.0.4
   - tasty-th ==0.1.7
-  - Taxonomy ==1.0.3
   - TCache ==0.12.1
   - tce-conf ==1.3
   - tcp-streams ==1.0.1.0
@@ -2268,17 +1989,17 @@ default-package-overrides:
   - temporary-rc ==1.2.0.3
   - tensorflow-test ==0.1.0.0
   - termcolor ==0.2.0.0
-  - terminal-progress-bar ==0.1.1.1
+  - terminal-progress-bar ==0.2
   - terminal-size ==0.3.2.1
   - test-fixture ==0.5.1.0
-  - test-framework ==0.8.1.1
+  - test-framework ==0.8.2.0
   - test-framework-hunit ==0.3.0.2
   - test-framework-quickcheck2 ==0.3.0.4
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
+  - testing-feat ==0.4.0.3
   - texmath ==0.10.1.1
-  - text ==1.2.2.2
-  - text-all ==0.4.1.1
+  - text ==1.2.3.0
   - text-binary ==0.2.1.1
   - text-conversions ==0.3.0
   - text-format ==0.3.1.1
@@ -2321,15 +2042,13 @@ default-package-overrides:
   - throwable-exceptions ==0.1.0.9
   - th-strict-compat ==0.1.0.1
   - th-to-exp ==0.0.1.1
-  - thumbnail-plus ==1.0.5
   - th-utilities ==0.2.0.1
-  - thyme ==0.3.5.5
   - tibetan-utils ==0.1.1.4
   - tidal ==0.9.6
   - tidal-midi ==0.9.5.2
   - tile ==0.3.0.0
   - time-compat ==0.1.0.3
-  - timeit ==1.0.0.0
+  - timeit ==2.0
   - timelens ==0.2.0.2
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.3
@@ -2343,7 +2062,7 @@ default-package-overrides:
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
   - titlecase ==1.0.1
-  - tldr ==0.2.5
+  - tldr ==0.3.0
   - tls ==1.4.1
   - tls-debug ==0.4.5
   - tls-session-manager ==0.0.0.2
@@ -2351,11 +2070,12 @@ default-package-overrides:
   - tmapmvar ==0.0.3
   - tmp-postgres ==0.1.1.1
   - token-bucket ==0.1.0.1
-  - torrent ==10000.1.1
   - tostring ==0.2.1.1
   - transformers-base ==0.4.4
   - transformers-bifunctors ==0.1
   - transformers-compat ==0.5.1.4
+  - transformers-either ==0.0.2
+  - transformers-fix ==1.0
   - transformers-lift ==0.2.0.1
   - transient ==0.5.9.2
   - transient-universe ==0.4.6.1
@@ -2371,15 +2091,11 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.4.6
+  - turtle ==1.5.5
   - turtle-options ==0.1.0.4
-  - twitter-conduit ==0.2.3
-  - twitter-types ==0.7.2.2
-  - twitter-types-lens ==0.7.2
-  - type-aligned ==0.9.6
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
-  - type-combinators-singletons ==0.1.0.0
+  - type-combinators-singletons ==0.2.1.0
   - TypeCompose ==0.9.12
   - typed-process ==0.2.1.0
   - type-fun ==0.1.1
@@ -2387,7 +2103,7 @@ default-package-overrides:
   - type-level-integers ==0.0.1
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
-  - typelits-witnesses ==0.2.3.0
+  - typelits-witnesses ==0.3.0.1
   - type-of-html ==1.3.3.0
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
@@ -2396,13 +2112,12 @@ default-package-overrides:
   - tzdata ==0.1.20180122.0
   - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
-  - unagi-chan ==0.4.1.0
   - unbounded-delays ==0.1.1.0
   - unbound-generics ==0.3.2
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
-  - unfoldable ==0.9.5
+  - unfoldable ==0.9.6
   - unfoldable-restricted ==0.0.3
   - unicode ==0.0.1
   - unicode-show ==0.1.0.2
@@ -2412,8 +2127,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - unique ==0
   - Unique ==0.4.7.2
+  - unique ==0
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2422,25 +2137,23 @@ default-package-overrides:
   - universe-instances-extended ==1.0.0.1
   - universe-instances-trans ==1.0.0.1
   - universe-reverse-instances ==1.0
-  - universum ==1.0.0
+  - universum ==1.1.0
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
   - unliftio ==0.2.4.0
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
-  - unordered-containers ==0.2.8.0
+  - unordered-containers ==0.2.9.0
   - unordered-intmap ==0.1.0.0
   - unsafe ==0.0
   - uri-bytestring ==0.3.1.1
   - uri-bytestring-aeson ==0.1.0.5
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
-  - url ==2.1.3
-  - urlpath ==7.0.2
+  - urlpath ==8.0.1
   - userid ==0.1.3.1
   - users ==0.5.0.0
-  - users-persistent ==0.5.0.2
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
   - utf8-light ==0.4.2
@@ -2449,8 +2162,7 @@ default-package-overrides:
   - uuid ==1.3.13
   - uuid-types ==1.0.3
   - vado ==0.0.9
-  - validate-input ==0.4.0.0
-  - validation ==0.6.3
+  - validation ==1
   - validationt ==0.2.0.0
   - validity ==0.4.0.4
   - validity-aeson ==0.1.0.0
@@ -2475,21 +2187,20 @@ default-package-overrides:
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
   - vector-sized ==0.6.1.0
-  - vector-space ==0.12
+  - vector-space ==0.13
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.2.0.6
+  - vectortiles ==1.3.0
   - verbosity ==0.2.3.0
   - versions ==3.3.1
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.14
   - vinyl ==0.7.0
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
   - vivid-supercollider ==0.3.0.0
   - void ==0.7.2
-  - vty ==5.19.2
+  - vty ==5.20
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-cli ==0.1.1
@@ -2498,8 +2209,7 @@ default-package-overrides:
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.22.0
   - wai-handler-launch ==3.0.2.3
-  - wai-logger ==2.3.1
-  - wai-middleware-auth ==0.1.2.1
+  - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
@@ -2507,7 +2217,7 @@ default-package-overrides:
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.4
   - wai-middleware-prometheus ==0.3.0
-  - wai-middleware-rollbar ==0.8.4
+  - wai-middleware-rollbar ==0.10.0
   - wai-middleware-static ==0.8.1
   - wai-middleware-throttle ==0.2.2.0
   - wai-predicates ==0.10.0
@@ -2518,8 +2228,8 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
-  - warp ==3.2.18
-  - warp-tls ==3.2.4
+  - warp ==3.2.18.1
+  - warp-tls ==3.2.4.2
   - wave ==0.1.5
   - wavefront ==0.7.1.1
   - webdriver ==0.8.5
@@ -2541,7 +2251,7 @@ default-package-overrides:
   - wide-word ==0.1.0.5
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.1.0
-  - wild-bind-x11 ==0.1.0.7
+  - wild-bind-x11 ==0.2.0.1
   - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
@@ -2561,9 +2271,10 @@ default-package-overrides:
   - word-trie ==0.3.0
   - word-wrap ==0.4.1
   - Workflow ==0.8.3
+  - world-peace ==0.1.0.0
   - wrap ==0.0.0
-  - wrecker ==1.2.4.0
-  - wreq ==0.5.2.0
+  - wrecker ==1.3.1.0
+  - wreq ==0.5.2.1
   - wreq-stringless ==0.5.9.1
   - writer-cps-full ==0.1.0.0
   - writer-cps-lens ==0.1.0.1
@@ -2584,15 +2295,14 @@ default-package-overrides:
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
   - xls ==0.1.1
-  - xlsx ==0.6.0
-  - xlsx-tabular ==0.2.2
+  - xlsx ==0.7.0
+  - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3
-  - xml-conduit ==1.7.1.2
-  - xml-conduit-parse ==0.3.1.2
+  - xml-conduit ==1.8.0
   - xml-conduit-writer ==0.1.1.2
   - xmlgen ==0.6.2.1
-  - xml-hamlet ==0.4.1.1
+  - xml-hamlet ==0.5.0
   - xmlhtml ==0.2.5.2
   - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
@@ -2613,31 +2323,27 @@ default-package-overrides:
   - Yampa ==0.10.7
   - YampaSynth ==0.2
   - yeshql ==3.0.1.3
-  - yesod ==1.4.5
+  - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
-  - yesod-auth ==1.4.21
-  - yesod-auth-basic ==0.1.0.2
-  - yesod-auth-fb ==1.8.1
-  - yesod-auth-hashdb ==1.6.2
-  - yesod-bin ==1.5.3
-  - yesod-core ==1.4.37.3
+  - yesod-auth ==1.6.2
+  - yesod-auth-fb ==1.9.0
+  - yesod-auth-hashdb ==1.7
+  - yesod-bin ==1.6.0
+  - yesod-core ==1.6.2
   - yesod-csp ==0.2.4.0
-  - yesod-eventsource ==1.4.1
-  - yesod-fb ==0.4.0
-  - yesod-form ==1.4.16
+  - yesod-eventsource ==1.6.0
+  - yesod-fb ==0.5.0
+  - yesod-form ==1.6.1
   - yesod-form-bootstrap4 ==0.1.0.2
-  - yesod-form-richtext ==0.1.0.2
-  - yesod-gitrepo ==0.2.1.0
-  - yesod-gitrev ==0.1.0.0
-  - yesod-newsfeed ==1.6
-  - yesod-persistent ==1.4.3
-  - yesod-recaptcha2 ==0.2.3
-  - yesod-sitemap ==1.4.0.1
-  - yesod-static ==1.5.3.1
-  - yesod-static-angular ==0.1.8
+  - yesod-gitrepo ==0.3.0
+  - yesod-newsfeed ==1.6.1.0
+  - yesod-paginator ==0.11.0
+  - yesod-persistent ==1.6.0
+  - yesod-sitemap ==1.6.0
+  - yesod-static ==1.6.0
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.9.1
-  - yesod-websockets ==0.2.6
+  - yesod-test ==1.6.2
+  - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
   - yi-core ==0.17.1
   - yi-frontend-vty ==0.17.1
@@ -2659,16 +2365,14 @@ default-package-overrides:
   - zero ==0.1.4
   - zeromq4-haskell ==0.7.0
   - zim-parser ==0.2.1.0
-  - zip ==0.2.0
+  - zip ==1.0.0
   - zip-archive ==0.3.2.4
   - zippers ==0.2.5
-  - ziptastic-client ==0.3.0.3
-  - ziptastic-core ==0.2.0.3
   - zlib ==0.6.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
-  - zm ==0.3.2
   - zot ==0.0.3
+  - zstd ==0.1.0.0
   - ztail ==1.2
 
 extra-packages:

From e4d49bcabc8389c34d43f6d4f6bde4be3b5d6ba3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 19:45:56 +0100
Subject: [PATCH 171/203] hackage2nix: keep old package versions around so that
 we can build git-annex

---
 .../configuration-hackage2nix.yaml                | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 05fae616da0..cb673f76bf6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2379,12 +2379,15 @@ extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier
   - aeson-pretty < 0.8                  # required by elm compiler
   - apply-refact < 0.4                  # newer versions don't work with GHC 8.0.x
+  - aws ^>= 0.18                        # pre-lts-11.x versions neeed by git-annex 6.20180227
   - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.24.*                     # required for jailbreak-cabal etc.
   - colour < 2.3.4                      # newer versions don't support GHC 7.10.x
+  - conduit >=1.1 && <1.3               # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - conduit-extra >=1.1 && <1.3         # pre-lts-11.x versions neeed by git-annex 6.20180227
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
@@ -2401,20 +2404,32 @@ extra-packages:
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode
   - hoogle == 5.0.14                    # required by hie-hoogle
+  - html-conduit ^>= 1.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - http-conduit ^>= 2.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - inline-c < 0.6                      # required on GHC 8.0.x
   - inline-c-cpp < 0.2                  # required on GHC 8.0.x
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
+  - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
+  - resourcet ==1.1.*                   # pre-lts-11.x versions neeed by git-annex 6.20180227
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
   - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
+  - xml-conduit ^>= 1.7                 # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod ^>= 1.4                       # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-core < 1.5                    # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-form < 1.5                    # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-persistent < 1.5              # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-static ^>= 1.5                # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - yesod-test ^>= 1.5                  # pre-lts-11.x versions neeed by git-annex 6.20180227
 
 package-maintainers:
   peti:

From b79f68ae7a83d3aea2110c5b73057602ea2cda09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 02:31:40 +0100
Subject: [PATCH 172/203] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9-6-g7017487 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/97c9f84bf59e626d3a55971111659b6cd01e06d6.
---
 .../haskell-modules/hackage-packages.nix      | 8216 ++++-------------
 1 file changed, 1903 insertions(+), 6313 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8e495e3ea58..ecc14528d63 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1774,23 +1774,6 @@ self: {
      }) {};
 
   "BlastHTTP" = callPackage
-    ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring
-     , conduit, HTTP, http-conduit, hxt, mtl, network, transformers
-     }:
-     mkDerivation {
-       pname = "BlastHTTP";
-       version = "1.2.1";
-       sha256 = "1mav6nyrqyjfl0qs9r7pqdijpd8dh0ddkcq9fbssyc05p87mxs6f";
-       libraryHaskellDepends = [
-         base biocore biofasta blastxml bytestring conduit HTTP http-conduit
-         hxt mtl network transformers
-       ];
-       homepage = "https://github.com/eggzilla/BlastHTTP";
-       description = "Libary to interface with the NCBI blast REST interface";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "BlastHTTP_1_3_0" = callPackage
     ({ mkDerivation, base, BiobaseBlast, biocore, biofasta, blastxml
      , bytestring, conduit, either-unwrap, HTTP, http-conduit, hxt, mtl
      , network, transformers
@@ -1806,7 +1789,6 @@ self: {
        homepage = "https://github.com/eggzilla/BlastHTTP";
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Blobs" = callPackage
@@ -2703,18 +2685,6 @@ self: {
      }) {};
 
   "ChannelT" = callPackage
-    ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
-     mkDerivation {
-       pname = "ChannelT";
-       version = "0.0.0.4";
-       sha256 = "06yr40kpi4jr65r76vlbf68ybh17n4b2k8claj0czgs4igspyhvn";
-       libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
-       homepage = "https://github.com/pthariensflame/ChannelT";
-       description = "Generalized stream processors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ChannelT_0_0_0_7" = callPackage
     ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
      mkDerivation {
        pname = "ChannelT";
@@ -2724,7 +2694,6 @@ self: {
        homepage = "https://github.com/pthariensflame/ChannelT";
        description = "Generalized stream processors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart" = callPackage
@@ -4058,24 +4027,6 @@ self: {
      }) {};
 
   "Decimal" = callPackage
-    ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "Decimal";
-       version = "0.4.2";
-       sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [
-         base deepseq HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
-       description = "Decimal numbers with variable precision";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Decimal_0_5_1" = callPackage
     ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
@@ -4091,7 +4042,6 @@ self: {
        homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
        description = "Decimal numbers with variable precision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DecisionTree" = callPackage
@@ -4745,6 +4695,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_12_1_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.12.1.0";
+       sha256 = "07dxsl2cvb40z2z41a263xpg5mhplaqj9p2qjhaw6q5rkjz9653k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ListLike ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -4777,22 +4749,6 @@ self: {
      }) {};
 
   "EdisonCore" = callPackage
-    ({ mkDerivation, array, base, containers, EdisonAPI, mtl
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "EdisonCore";
-       version = "1.3.1.1";
-       sha256 = "06shxmcqxcahcn6zgl64vlqix4fnq53d97drcgsh94qp7gp201ry";
-       libraryHaskellDepends = [
-         array base containers EdisonAPI mtl QuickCheck
-       ];
-       homepage = "http://rwd.rdockins.name/edison/home/";
-       description = "A library of efficent, purely-functional data structures (Core Implementations)";
-       license = "unknown";
-     }) {};
-
-  "EdisonCore_1_3_2_1" = callPackage
     ({ mkDerivation, array, base, containers, EdisonAPI, mtl
      , QuickCheck
      }:
@@ -4806,7 +4762,6 @@ self: {
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficient, purely-functional data structures (Core Implementations)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EditTimeReport" = callPackage
@@ -6582,18 +6537,6 @@ self: {
      }) {};
 
   "GenericPretty" = callPackage
-    ({ mkDerivation, base, ghc-prim, pretty }:
-     mkDerivation {
-       pname = "GenericPretty";
-       version = "1.2.1";
-       sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
-       libraryHaskellDepends = [ base ghc-prim pretty ];
-       homepage = "https://github.com/RazvanRanca/GenericPretty";
-       description = "A generic, derivable, haskell pretty printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "GenericPretty_1_2_2" = callPackage
     ({ mkDerivation, base, ghc-prim, pretty }:
      mkDerivation {
        pname = "GenericPretty";
@@ -6603,7 +6546,6 @@ self: {
        homepage = "https://github.com/RazvanRanca/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenussFold" = callPackage
@@ -9060,27 +9002,6 @@ self: {
      }) {};
 
   "HaTeX" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable, matrix
-     , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
-     , wl-pprint-extras
-     }:
-     mkDerivation {
-       pname = "HaTeX";
-       version = "3.17.3.1";
-       sha256 = "1vq22yf90cxq6a224zw73c1iqqbcsa2swasds605y9kwp9wzf6db";
-       libraryHaskellDepends = [
-         base bytestring containers hashable matrix parsec QuickCheck text
-         transformers wl-pprint-extras
-       ];
-       testHaskellDepends = [
-         base parsec QuickCheck tasty tasty-quickcheck text
-       ];
-       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
-       description = "The Haskell LaTeX library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HaTeX_3_18_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hashable, matrix
      , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
      , wl-pprint-extras
@@ -9099,7 +9020,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -9868,28 +9788,6 @@ self: {
      }) {};
 
   "Hoed" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, clock, containers
-     , deepseq, directory, libgraph, process, QuickCheck, regex-tdfa
-     , semigroups, strict, template-haskell, terminal-size, uniplate
-     , vector
-     }:
-     mkDerivation {
-       pname = "Hoed";
-       version = "0.4.1";
-       sha256 = "14d4wypx75xmhb81f4lplvw04f5hjc97ncgzv4s07vd09bal8kq7";
-       libraryHaskellDepends = [
-         array base bytestring cereal clock containers deepseq directory
-         libgraph process QuickCheck regex-tdfa semigroups strict
-         template-haskell terminal-size uniplate vector
-       ];
-       testHaskellDepends = [ base process QuickCheck ];
-       homepage = "https://github.com/MaartenFaddegon/Hoed";
-       description = "Lightweight algorithmic debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Hoed_0_5_0" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, cereal-text
      , cereal-vector, clock, containers, deepseq, directory, hashable
      , hashtables, libgraph, open-browser, primitive, process
@@ -10936,6 +10834,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_2_9_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.9.5";
+       sha256 = "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -10950,23 +10866,6 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
-     mkDerivation {
-       pname = "JuicyPixels-extra";
-       version = "0.2.2";
-       sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld";
-       revision = "1";
-       editedCabalFile = "1h88x4bp9jvxx8laz69izna82a9d3bapr7nfpa9gpbvqpmi7d3vd";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base JuicyPixels ];
-       testHaskellDepends = [ base hspec JuicyPixels ];
-       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
-       homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
-       description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels-extra_0_3_0" = callPackage
     ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
      mkDerivation {
        pname = "JuicyPixels-extra";
@@ -10981,7 +10880,6 @@ self: {
        homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
        description = "Efficiently scale, crop, flip images with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-repa" = callPackage
@@ -11004,8 +10902,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.1.2";
        sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs";
-       revision = "1";
-       editedCabalFile = "08myhf2912c5hd7hhiq58lsylfpj2zwhak5kmhhcffc7zsvhcl24";
+       revision = "2";
+       editedCabalFile = "04g0yga3v0922aysqv2m2h7vxbaaxfdb7lafsakpzlp0w659f930";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -11830,28 +11728,6 @@ self: {
      }) {};
 
   "ListLike" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "ListLike";
-       version = "4.5.1";
-       sha256 = "139aaraprdlana39bldxzrl1pnvymwpiwymikc1xjg2nbcrla1xp";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq dlist fmlist text
-         utf8-string vector
-       ];
-       testHaskellDepends = [
-         array base bytestring containers dlist fmlist HUnit QuickCheck
-         random text utf8-string vector
-       ];
-       homepage = "http://github.com/JohnLato/listlike";
-       description = "Generic support for list-like structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ListLike_4_6" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , dlist, fmlist, HUnit, QuickCheck, random, semigroups, text
      , utf8-string, vector
@@ -11871,7 +11747,6 @@ self: {
        homepage = "http://github.com/JohnLato/listlike";
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ListT" = callPackage
@@ -13013,17 +12888,17 @@ self: {
   "MusicBrainz" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , HTTP, http-conduit, http-types, monad-control, resourcet, text
-     , time, time-locale-compat, transformers, vector, xml-conduit
-     , xml-types
+     , time, time-locale-compat, transformers, unliftio-core, vector
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "MusicBrainz";
-       version = "0.3.1";
-       sha256 = "1zgk2ms1a5zd6wndc41z3f8p2pfygiijpijxbjhr1fqwb2bzs61m";
+       version = "0.4";
+       sha256 = "0aanc1c43di5wq9c2w0b5lw3p24cwpaksgxy79lqm8qxj8qd3jxr";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
          http-types monad-control resourcet text time time-locale-compat
-         transformers vector xml-conduit xml-types
+         transformers unliftio-core vector xml-conduit xml-types
        ];
        homepage = "http://floss.scru.org/hMusicBrainz";
        description = "interface to MusicBrainz XML2 and JSON web services";
@@ -15806,6 +15681,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Rasterific_0_7_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "Rasterific";
+       version = "0.7.2.2";
+       sha256 = "01sr6x22j042vydfiprkszk95wf9flq2fp0552wnmzr7qvn0j8qd";
+       libraryHaskellDepends = [
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive transformers vector vector-algorithms
+       ];
+       description = "A pure haskell drawing engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ReadArgs" = callPackage
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
@@ -16280,6 +16173,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SHA_1_6_4_4" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, QuickCheck
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "SHA";
+       version = "1.6.4.4";
+       sha256 = "0i4b2wjisivdy72synal711ywhx05mfqfba5n65rk8qidggm1nbb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ array base binary bytestring ];
+       testHaskellDepends = [
+         array base binary bytestring QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       description = "Implementations of the SHA suite of message digest functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "SHA2" = callPackage
     ({ mkDerivation, AES, base, bytestring, monads-tf, transformers }:
      mkDerivation {
@@ -16903,8 +16816,8 @@ self: {
     ({ mkDerivation, base, GLUT }:
      mkDerivation {
        pname = "Shu-thing";
-       version = "1.1.3";
-       sha256 = "185vcxd3qvii9k0134j634x6znvk7v83sj24a4dnw7jjsax0kqiv";
+       version = "1.1.4";
+       sha256 = "1j42jgv27lj723mnq3dbc94zirhbbksahzw6y43ay1iylw870yjs";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT ];
@@ -17626,19 +17539,6 @@ self: {
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
-    ({ mkDerivation, base, directory, mtl, syb, transformers }:
-     mkDerivation {
-       pname = "Strafunski-StrategyLib";
-       version = "5.0.0.10";
-       sha256 = "1hhcx0arzyrw8ij5ispnqysbipxyznbs5g9pkmy63fzn3l2im2ih";
-       revision = "1";
-       editedCabalFile = "031p57vf33vdhwk1p4d1jzpk8fcl2js8kzdg7gyhz9g11vl2n4j9";
-       libraryHaskellDepends = [ base directory mtl syb transformers ];
-       description = "Library for strategic programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Strafunski-StrategyLib_5_0_1_0" = callPackage
     ({ mkDerivation, base, directory, mtl, syb, transformers }:
      mkDerivation {
        pname = "Strafunski-StrategyLib";
@@ -17647,7 +17547,6 @@ self: {
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "StrappedTemplates" = callPackage
@@ -21604,8 +21503,8 @@ self: {
        pname = "ad";
        version = "4.3.5";
        sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw";
-       revision = "2";
-       editedCabalFile = "0307kxvxzfsp9jlkhj4rcc6rncndq2ih87b8vn9h55fzii868j74";
+       revision = "3";
+       editedCabalFile = "14g2lfsw1fi4gn2cgvhglz4gyi797xk9g1r4pf46g734ivfl67c5";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
@@ -21736,27 +21635,6 @@ self: {
      }) {};
 
   "adjunctions" = callPackage
-    ({ mkDerivation, array, base, comonad, containers, contravariant
-     , distributive, free, mtl, profunctors, semigroupoids, semigroups
-     , tagged, transformers, transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "adjunctions";
-       version = "4.3";
-       sha256 = "1k1ykisf96i4g2zm47c45md7p42c4vsp9r73392pz1g8mx7s2j5r";
-       revision = "1";
-       editedCabalFile = "1079l9szyr7ybi9wcvv1vjsjfrqirkn9z3j7dann8vbk81a4z37q";
-       libraryHaskellDepends = [
-         array base comonad containers contravariant distributive free mtl
-         profunctors semigroupoids semigroups tagged transformers
-         transformers-compat void
-       ];
-       homepage = "http://github.com/ekmett/adjunctions/";
-       description = "Adjunctions and representable functors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "adjunctions_4_4" = callPackage
     ({ mkDerivation, array, base, comonad, containers, contravariant
      , distributive, free, generic-deriving, hspec, hspec-discover, mtl
      , profunctors, semigroupoids, semigroups, tagged, transformers
@@ -21776,7 +21654,6 @@ self: {
        homepage = "http://github.com/ekmett/adjunctions/";
        description = "Adjunctions and representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adler32" = callPackage
@@ -21795,6 +21672,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
+  "adler32_0_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, zlib }:
+     mkDerivation {
+       pname = "adler32";
+       version = "0.1.2.0";
+       sha256 = "1936b05mx842wm8swz3g3jv6m9absa04islq4rwysicz72gkrd16";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/redneb/hs-adler32";
+       description = "An implementation of Adler-32, supporting rolling checksum operation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zlib;};
+
   "adobe-swatch-exchange" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
      , language-css, mtl, pretty
@@ -22383,6 +22275,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-picker_0_1_0_4" = callPackage
+    ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
+     mkDerivation {
+       pname = "aeson-picker";
+       version = "0.1.0.4";
+       sha256 = "0ln4qwx7app1sc01irmy5lx7bqsq6wsgdig6zihpnp9rbj8263mj";
+       libraryHaskellDepends = [ aeson base lens lens-aeson text ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "https://github.com/ozzzzz/aeson-picker#readme";
+       description = "Tiny library to get fields from JSON format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-prefix" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, mtl, text
      , unordered-containers, vector
@@ -26722,20 +26628,6 @@ self: {
      }) {};
 
   "ansi-terminal" = callPackage
-    ({ mkDerivation, base, colour }:
-     mkDerivation {
-       pname = "ansi-terminal";
-       version = "0.7.1.1";
-       sha256 = "1z2lllm5f2wy3a1j1198mpwq9cb6qclrxr2gpdzjyxzzvybpdj3g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base colour ];
-       homepage = "https://github.com/feuerbach/ansi-terminal";
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ansi-terminal_0_8_0_2" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
@@ -26747,7 +26639,6 @@ self: {
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-wl-pprint" = callPackage
@@ -27042,6 +26933,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs_0_3_0_0" = callPackage
+    ({ mkDerivation, async, base, containers, criterion, linear, mtl
+     , QuickCheck, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "apecs";
+       version = "0.3.0.0";
+       sha256 = "0iir47vj8fgclppynav0skda7q91kw0nnw6pjr4cz6gz9ragh9wh";
+       libraryHaskellDepends = [
+         async base containers mtl template-haskell vector
+       ];
+       testHaskellDepends = [ base containers QuickCheck vector ];
+       benchmarkHaskellDepends = [ base criterion linear ];
+       homepage = "https://github.com/jonascarpay/apecs#readme";
+       description = "A fast ECS for game engine programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apelsin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, filepath, glib, gtk, HTTP, mtl, network, process
@@ -27174,6 +27084,8 @@ self: {
        pname = "apiary";
        version = "2.1.2";
        sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc";
+       revision = "1";
+       editedCabalFile = "0fznli6f20wxzbg1b5ylnjiyfqrmvm0wi5jcvhg8przmqhvjmcki";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html blaze-markup bytestring
          bytestring-lexing case-insensitive data-default-class exceptions
@@ -27186,7 +27098,7 @@ self: {
          aeson base bytestring directory http-types HUnit mtl tasty
          tasty-hunit tasty-quickcheck wai wai-extra
        ];
-       homepage = "https://github.com/philopon/apiary";
+       homepage = "https://github.com/winterland1989/apiary";
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28338,6 +28250,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arithmoi_0_7_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, exact-pi, gauge, ghc-prim
+     , integer-gmp, integer-logarithms, mtl, QuickCheck, random
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "arithmoi";
+       version = "0.7.0.0";
+       sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
+       configureFlags = [ "-f-llvm" ];
+       libraryHaskellDepends = [
+         array base containers exact-pi ghc-prim integer-gmp
+         integer-logarithms mtl random vector
+       ];
+       testHaskellDepends = [
+         base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge integer-logarithms random vector
+       ];
+       homepage = "https://github.com/cartazio/arithmoi";
+       description = "Efficient basic number-theoretic functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "armada" = callPackage
     ({ mkDerivation, base, GLUT, mtl, OpenGL, stm }:
      mkDerivation {
@@ -28352,6 +28292,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "armor" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, HUnit, lens, text
+     }:
+     mkDerivation {
+       pname = "armor";
+       version = "0.1";
+       sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath HUnit lens
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory hspec HUnit lens text
+       ];
+       homepage = "https://github.com/mightybyte/armor";
+       description = "Armor data structures against serialization backwards compatibility problems";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "arpa" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -28793,6 +28752,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asciidiagram_1_3_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
+     , rasterific-svg, svg-tree, text, vector
+     }:
+     mkDerivation {
+       pname = "asciidiagram";
+       version = "1.3.3.1";
+       sha256 = "194jdii485z0fif07nvjcj5468m53zgm2v9x1h3pj8xlmfh9rrly";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers FontyFruity JuicyPixels lens linear mtl
+         rasterific-svg svg-tree text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative rasterific-svg svg-tree text
+       ];
+       description = "Pretty rendering of Ascii diagram into svg or png";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asic" = callPackage
     ({ mkDerivation, asil, base, bytestring, utf8-string }:
      mkDerivation {
@@ -30200,22 +30183,6 @@ self: {
      }) {};
 
   "attoparsec-uri" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
-     , strict, text, vector
-     }:
-     mkDerivation {
-       pname = "attoparsec-uri";
-       version = "0.0.3";
-       sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n";
-       libraryHaskellDepends = [
-         attoparsec attoparsec-ip base bytedump ip strict text vector
-       ];
-       homepage = "https://github.com/athanclark/attoparsec-uri#readme";
-       description = "URI parser / printer using attoparsec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "attoparsec-uri_0_0_4" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
      , strict, text, vector
      }:
@@ -30229,7 +30196,6 @@ self: {
        homepage = "https://github.com/athanclark/attoparsec-uri#readme";
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attosplit" = callPackage
@@ -30514,21 +30480,6 @@ self: {
      }) {};
 
   "autoexporter" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "1.1.3";
-       sha256 = "0rkgb2vfznn6a28h40c26if43mzcavwd81myi27zbg8811g9bv6m";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/autoexporter#readme";
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "autoexporter_1_1_4" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
@@ -30541,7 +30492,6 @@ self: {
        homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -30954,7 +30904,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {awesomium = null;};
 
-  "aws" = callPackage
+  "aws_0_18" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
      , case-insensitive, cereal, conduit, conduit-combinators
@@ -30989,9 +30939,10 @@ self: {
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aws_0_19" = callPackage
+  "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
      , case-insensitive, cereal, conduit, conduit-combinators
@@ -31026,7 +30977,6 @@ self: {
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -31792,30 +31742,6 @@ self: {
      }) {};
 
   "backprop" = callPackage
-    ({ mkDerivation, ad, base, bifunctors, criterion, deepseq
-     , directory, generics-sop, hmatrix, microlens, microlens-mtl
-     , microlens-th, mnist-idx, mtl, mwc-random, profunctors, reflection
-     , tagged, time, transformers, transformers-base, type-combinators
-     , vector
-     }:
-     mkDerivation {
-       pname = "backprop";
-       version = "0.0.3.0";
-       sha256 = "1rjqv29fk0yqbqygnhm14zrjigicsgbiq5gcvr8j4kqkb8s9l6df";
-       libraryHaskellDepends = [
-         ad base generics-sop microlens microlens-mtl microlens-th mtl
-         profunctors reflection tagged transformers-base type-combinators
-       ];
-       benchmarkHaskellDepends = [
-         base bifunctors criterion deepseq directory generics-sop hmatrix
-         mnist-idx mwc-random time transformers type-combinators vector
-       ];
-       homepage = "https://github.com/mstksg/backprop";
-       description = "Heterogeneous, type-safe automatic backpropagation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "backprop_0_1_3_0" = callPackage
     ({ mkDerivation, base, bifunctors, criterion, deepseq, directory
      , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive
      , reflection, time, transformers, type-combinators, vector
@@ -31835,7 +31761,6 @@ self: {
        homepage = "https://github.com/mstksg/backprop#readme";
        description = "Heterogeneous automatic differentation (backpropagation)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -32352,19 +32277,6 @@ self: {
      }) {};
 
   "base-orphans" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "base-orphans";
-       version = "0.6";
-       sha256 = "03mdww5j0gwai7aqlx3m71ldmjcr99jzpkcclzjfclk6a6kjla67";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/haskell-compat/base-orphans#readme";
-       description = "Backwards-compatible orphan instances for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-orphans_0_7" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck
      }:
      mkDerivation {
@@ -32377,7 +32289,6 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-prelude" = callPackage
@@ -32597,18 +32508,6 @@ self: {
      }) {};
 
   "basement" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "basement";
-       version = "0.0.4";
-       sha256 = "1zdqv8dbzv8jx6z8fcghinbnxdc5fb97i7sdfswdr1fcp8jq6i38";
-       libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/haskell-foundation/foundation";
-       description = "Foundation scrap box of array & string";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "basement_0_0_7" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "basement";
@@ -32618,7 +32517,6 @@ self: {
        homepage = "https://github.com/haskell-foundation/foundation";
        description = "Foundation scrap box of array & string";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basex-client" = callPackage
@@ -33981,26 +33879,6 @@ self: {
      }) {};
 
   "binary-conduit" = callPackage
-    ({ mkDerivation, base, binary, bytestring, conduit, hspec
-     , QuickCheck, quickcheck-assertions, resourcet, vector
-     }:
-     mkDerivation {
-       pname = "binary-conduit";
-       version = "1.2.5";
-       sha256 = "06sbs5kib5jdfxn0fj2yx2wjysgr7g0alnjg1v6iwi7rw2m1gm11";
-       libraryHaskellDepends = [
-         base binary bytestring conduit resourcet vector
-       ];
-       testHaskellDepends = [
-         base binary bytestring conduit hspec QuickCheck
-         quickcheck-assertions resourcet
-       ];
-       homepage = "http://github.com/qnikst/binary-conduit/";
-       description = "data serialization/deserialization conduit library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "binary-conduit_1_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, conduit, exceptions
      , hspec, QuickCheck, quickcheck-assertions, resourcet, vector
      }:
@@ -34020,7 +33898,6 @@ self: {
        homepage = "http://github.com/qnikst/binary-conduit/";
        description = "data serialization/deserialization conduit library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-derive" = callPackage
@@ -34384,8 +34261,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri";
-       revision = "7";
-       editedCabalFile = "04l05gfbf3hf0pnkjpclyfqb9jaa665z4f89kf43lmd19qml6h04";
+       revision = "8";
+       editedCabalFile = "0a8xcrx2lm8yzcnrf76c1wynn238i87yz3lqlgrg5n9csdc0bhj1";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -35183,17 +35060,17 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, sane-backends }:
+    ({ mkDerivation, base, bindings-DSL, saneBackends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ sane-backends ];
+       libraryPkgconfigDepends = [ saneBackends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
-     }) {inherit (pkgs) sane-backends;};
+     }) {inherit (pkgs) saneBackends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -36029,8 +35906,8 @@ self: {
        pname = "bits";
        version = "0.5.1";
        sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5";
-       revision = "3";
-       editedCabalFile = "1xvrnswmny4j0p1h30hfgf5h4p128zn578bxzr83v6drmd74az9k";
+       revision = "4";
+       editedCabalFile = "188v93jiwy832ifcjq5db7sk5rngpnvira5kk1cb1srw4851hzyl";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
@@ -36104,6 +35981,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bits-extra" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec
+     , hw-hedgehog, hw-hspec-hedgehog, vector
+     }:
+     mkDerivation {
+       pname = "bits-extra";
+       version = "0.0.0.1";
+       sha256 = "1yggdh8j2hqhyskyqq4gci4hg1kdglzw7sfd7gdf4fsw9l6g8rq0";
+       revision = "1";
+       editedCabalFile = "13rmw51xqbz0zjn2g0135m2f5qqsba3l5w02pb16dkfq4gbhmblx";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
+         base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
+       ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
+       homepage = "https://github.com/haskell-works/bits-extra#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bits-extras" = callPackage
     ({ mkDerivation, base, gcc_s }:
      mkDerivation {
@@ -36292,8 +36188,8 @@ self: {
        pname = "bitwise";
        version = "0.1.1.1";
        sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d";
-       revision = "1";
-       editedCabalFile = "10v3wkjc3y9435kn1rywrp6z0h71pkjcs51p8wl30g9pbpscw5pq";
+       revision = "2";
+       editedCabalFile = "1dqddxjf4kpb16k51z40qlnl0shw6gmpf1c1ckdn4q8jm61bmlgn";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -36303,30 +36199,6 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, directory
-     , doctest, exceptions, hspec, http-client, http-client-tls
-     , http-types, microlens, microlens-th, network, QuickCheck, safe
-     , scientific, split, text, time
-     }:
-     mkDerivation {
-       pname = "bitx-bitcoin";
-       version = "0.11.0.1";
-       sha256 = "1711zfb7hl31xwpcwkxjnsmn541hzzk01fwa5rf1hhmxhpxmfslj";
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq exceptions http-client
-         http-client-tls http-types microlens microlens-th network
-         QuickCheck scientific split text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory doctest hspec http-client
-         http-types microlens safe text time
-       ];
-       homepage = "https://github.com/tebello-thejane/bitx.hs";
-       description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bitx-bitcoin_0_12_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, directory
      , doctest, exceptions, hspec, http-client, http-client-tls
      , http-types, microlens, microlens-th, network, QuickCheck, safe
@@ -36348,7 +36220,6 @@ self: {
        homepage = "https://github.com/tebello-thejane/bitx.hs";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bizzlelude" = callPackage
@@ -36579,24 +36450,6 @@ self: {
      }) {};
 
   "blas-carray" = callPackage
-    ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi
-     , storable-complex, transformers
-     }:
-     mkDerivation {
-       pname = "blas-carray";
-       version = "0.0";
-       sha256 = "131kz5rdgz4l5xhwpfacix0wiwqf9a0ngdvmgp7iznf7znrf8hk6";
-       libraryHaskellDepends = [
-         base blas-ffi carray netlib-carray netlib-ffi storable-complex
-         transformers
-       ];
-       homepage = "http://hub.darcs.net/thielema/blas-carray/";
-       description = "Auto-generated interface to Fortran BLAS via CArrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "blas-carray_0_0_1" = callPackage
     ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi
      , storable-complex, transformers
      }:
@@ -36615,20 +36468,6 @@ self: {
      }) {};
 
   "blas-ffi" = callPackage
-    ({ mkDerivation, base, blas, netlib-ffi }:
-     mkDerivation {
-       pname = "blas-ffi";
-       version = "0.0";
-       sha256 = "173djbrps396c9v5fl706k70qwy5jqcxay9j67draidw5qwhqcs2";
-       libraryHaskellDepends = [ base netlib-ffi ];
-       libraryPkgconfigDepends = [ blas ];
-       homepage = "http://hub.darcs.net/thielema/blas-ffi/";
-       description = "Auto-generated interface to Fortran BLAS";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) blas;};
-
-  "blas-ffi_0_0_1" = callPackage
     ({ mkDerivation, base, blas, netlib-ffi }:
      mkDerivation {
        pname = "blas-ffi";
@@ -36734,6 +36573,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-builder_0_4_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, utf8-string
+     }:
+     mkDerivation {
+       pname = "blaze-builder";
+       version = "0.4.1.0";
+       sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i";
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text utf8-string
+       ];
+       homepage = "http://github.com/lpsmith/blaze-builder";
+       description = "Efficient buffered output";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-builder-conduit" = callPackage
     ({ mkDerivation, base, conduit }:
      mkDerivation {
@@ -37983,8 +37842,8 @@ self: {
     ({ mkDerivation, base, gtk, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
-       version = "0.1.0.4";
-       sha256 = "15ii0v9qy55pzz9ykbwigazck61m7vh5k7m782nzbqyi7az7v7sg";
+       version = "0.1.0.5";
+       sha256 = "062l93lh9y9wgdf8f1xql07ci8rpcspaagpsmcyc6wnikganls9w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
@@ -38043,8 +37902,8 @@ self: {
        pname = "bound";
        version = "2.0.1";
        sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
-       revision = "3";
-       editedCabalFile = "1ivq22ks8y4c086q6w74bh8jvgvliwzdayqw0h5zycx8wg7vcgiz";
+       revision = "4";
+       editedCabalFile = "1gnknncwjil9kcilpj08a5s0r1z3nk5iyg1dlynldxaj6p0z90hx";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -38143,20 +38002,6 @@ self: {
      }) {};
 
   "boxes" = callPackage
-    ({ mkDerivation, base, QuickCheck, split }:
-     mkDerivation {
-       pname = "boxes";
-       version = "0.1.4";
-       sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf";
-       revision = "1";
-       editedCabalFile = "073kkci1pm6rci7mnq9v006679jk41bfzc0jfi7my4c7idwd1ijd";
-       libraryHaskellDepends = [ base split ];
-       testHaskellDepends = [ base QuickCheck split ];
-       description = "2D text pretty-printing library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "boxes_0_1_5" = callPackage
     ({ mkDerivation, base, QuickCheck, split }:
      mkDerivation {
        pname = "boxes";
@@ -38166,7 +38011,6 @@ self: {
        testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bpann" = callPackage
@@ -38344,28 +38188,6 @@ self: {
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, config-ini, containers, contravariant
-     , data-clist, deepseq, dlist, microlens, microlens-mtl
-     , microlens-th, stm, template-haskell, text, text-zipper
-     , transformers, vector, vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.29.1";
-       sha256 = "1jslqfsqgrg379x4zi44f5xxn2jh0syqd4zbnfg07y3zgy5i399z";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base config-ini containers contravariant data-clist deepseq dlist
-         microlens microlens-mtl microlens-th stm template-haskell text
-         text-zipper transformers vector vty word-wrap
-       ];
-       homepage = "https://github.com/jtdaugherty/brick/";
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_34_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, stm, template-haskell, text, text-zipper
@@ -38385,7 +38207,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick-skylighting" = callPackage
@@ -38553,46 +38374,6 @@ self: {
      }) {};
 
   "brittany" = callPackage
-    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
-     , containers, czipwith, data-tree-print, deepseq, directory, extra
-     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
-     , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
-     , safe, semigroups, strict, syb, text, transformers, uniplate
-     , unsafe, yaml
-     }:
-     mkDerivation {
-       pname = "brittany";
-       version = "0.9.0.0";
-       sha256 = "0fi87p8ybibwhsmbh35xhipfkdg3kdwqb6n3y5ynql7603kssgc1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra ghc ghc-boot-th
-         ghc-exactprint ghc-paths monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       executableHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       testHaskellDepends = [
-         aeson base butcher bytestring cmdargs containers czipwith
-         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
-         neat-interpolation parsec pretty safe semigroups strict syb text
-         transformers uniplate unsafe yaml
-       ];
-       homepage = "https://github.com/lspitzner/brittany/";
-       description = "Haskell source code formatter";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "brittany_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
      , containers, czipwith, data-tree-print, deepseq, directory, extra
      , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
@@ -38630,7 +38411,6 @@ self: {
        homepage = "https://github.com/lspitzner/brittany/";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -38693,8 +38473,8 @@ self: {
     ({ mkDerivation, base, bytestring, bytestring-builder }:
      mkDerivation {
        pname = "bsb-http-chunked";
-       version = "0.0.0.1";
-       sha256 = "062rlcipj61cj38mysg8bmbiklbsz45lhgb0cl39j2wvxpmr6v6b";
+       version = "0.0.0.2";
+       sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
        libraryHaskellDepends = [ base bytestring bytestring-builder ];
        homepage = "http://github.com/sjakobi/bsb-http-chunked";
        description = "Chunked HTTP transfer encoding for bytestring builders";
@@ -39037,6 +38817,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bugsnag-haskell" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring
+     , case-insensitive, doctest, hspec, http-client, http-client-tls
+     , http-conduit, http-types, iproute, network, parsec
+     , template-haskell, text, th-lift-instances, time, ua-parser, wai
+     }:
+     mkDerivation {
+       pname = "bugsnag-haskell";
+       version = "0.0.1.1";
+       sha256 = "09jv8qr795ag12xf035ywpvnd61q7cgsqcx1irvyh9zlmiixb975";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive http-client http-client-tls
+         http-conduit http-types iproute network parsec template-haskell
+         text th-lift-instances time ua-parser wai
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base doctest hspec text time
+       ];
+       homepage = "https://github.com/pbrisbin/bugsnag-haskell#readme";
+       description = "Bugsnag error reporter for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bugzilla" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection
      , containers, data-default, http-conduit, http-types, iso8601-time
@@ -39332,26 +39137,6 @@ self: {
      }) {system-glib = pkgs.glib;};
 
   "butcher" = callPackage
-    ({ mkDerivation, base, bifunctors, containers, deque, either, extra
-     , free, microlens, microlens-th, mtl, multistate, pretty
-     , transformers, unsafe, void
-     }:
-     mkDerivation {
-       pname = "butcher";
-       version = "1.2.1.0";
-       sha256 = "0vam5lqbp2k8r56d997bcp63lnsc4bbs7yd4lzjvibimr38g032w";
-       revision = "3";
-       editedCabalFile = "1faax0pipbywayjn961id2bc19y109bq0ny2hl1p9mh209iccnza";
-       libraryHaskellDepends = [
-         base bifunctors containers deque either extra free microlens
-         microlens-th mtl multistate pretty transformers unsafe void
-       ];
-       homepage = "https://github.com/lspitzner/butcher/";
-       description = "Chops a command or program invocation into digestable pieces";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "butcher_1_3_0_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, deque, extra, free
      , microlens, microlens-th, mtl, multistate, pretty, transformers
      , unsafe, void
@@ -39367,7 +39152,6 @@ self: {
        homepage = "https://github.com/lspitzner/butcher/";
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butterflies" = callPackage
@@ -39393,20 +39177,6 @@ self: {
      }) {};
 
   "bv" = callPackage
-    ({ mkDerivation, base, ghc-prim, integer-gmp }:
-     mkDerivation {
-       pname = "bv";
-       version = "0.4.1";
-       sha256 = "1fs5rwmd9zn58wdb5s4xrq8vj9rsimwnjp9nd3hpcbkry58222fx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
-       homepage = "https://github.com/iagoabal/haskell-bv";
-       description = "Bit-vector arithmetic library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bv_0_5" = callPackage
     ({ mkDerivation, base, ghc-prim, integer-gmp }:
      mkDerivation {
        pname = "bv";
@@ -39418,7 +39188,6 @@ self: {
        homepage = "https://github.com/iagoabal/haskell-bv";
        description = "Bit-vector arithmetic library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv-little" = callPackage
@@ -39551,8 +39320,8 @@ self: {
        pname = "bytes";
        version = "0.15.3";
        sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q";
-       revision = "3";
-       editedCabalFile = "13dwn6srx7zgiyayx5yxc14425asph9mylbi21yw30g04ahrbkxv";
+       revision = "4";
+       editedCabalFile = "1w0hmrlxbki1cd5685y40w4jhjbrk6if7jgikxxvl4dzlbl5ksaq";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytestring cereal containers hashable mtl scientific
@@ -40040,33 +39809,6 @@ self: {
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
-    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
-     , conduit-extra, data-default, hspec, mtl, QuickCheck, random
-     , resourcet
-     }:
-     mkDerivation {
-       pname = "bzlib-conduit";
-       version = "0.2.1.5";
-       sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an";
-       revision = "1";
-       editedCabalFile = "1pz462dij6rizmbi7dw6qz50f9xgnzzw2z08cjlvbqzn05cpgdv6";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bindings-DSL bytestring conduit conduit-extra data-default mtl
-         resourcet
-       ];
-       librarySystemDepends = [ bzip2 ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra hspec QuickCheck random
-         resourcet
-       ];
-       benchmarkHaskellDepends = [ base conduit conduit-extra resourcet ];
-       homepage = "https://github.com/snoyberg/bzlib-conduit";
-       description = "Streaming compression/decompression via conduits";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) bzip2;};
-
-  "bzlib-conduit_0_3_0" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
      , data-default, hspec, mtl, random, resourcet
      }:
@@ -40089,7 +39831,6 @@ self: {
        homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
@@ -40293,8 +40034,8 @@ self: {
      }:
      mkDerivation {
        pname = "cab";
-       version = "0.2.17";
-       sha256 = "0lnd8m10999jxyx6x5plbrm135p7bv9q67c80h4l4gy49h07sr87";
+       version = "0.2.18";
+       sha256 = "0ic1ivxiv217ls4g38q5dwrb8sbsrzvdm6c0idv9ancpjmm8k8jl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40876,6 +40617,7 @@ self: {
          ansi-terminal base base-compat bytestring containers mtl
          optparse-applicative parsec text vector
        ];
+       doHaddock = false;
        description = "Library and utiltity for processing cabal's plan.json file";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -42486,6 +42228,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "case-insensitive_1_2_0_11" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , HUnit, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "case-insensitive";
+       version = "1.2.0.11";
+       sha256 = "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7";
+       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit text
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+       homepage = "https://github.com/basvandijk/case-insensitive";
+       description = "Case insensitive string comparison";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "case-insensitive-match" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl
      , QuickCheck, random-strings, tagsoup, text
@@ -42825,28 +42586,6 @@ self: {
      }) {};
 
   "cassava-conduit" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, conduit-extra, containers, criterion, mtl, QuickCheck
-     , text
-     }:
-     mkDerivation {
-       pname = "cassava-conduit";
-       version = "0.4.0.1";
-       sha256 = "0y4zlr0k3hcwh8b9ly1aslpz4fbns7xw2h8jwghfl7zpi52zlj9y";
-       libraryHaskellDepends = [
-         array base bifunctors bytestring cassava conduit conduit-extra
-         containers mtl text
-       ];
-       testHaskellDepends = [
-         base bytestring cassava conduit conduit-extra QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/domdere/cassava-conduit";
-       description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cassava-conduit_0_4_0_2" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, containers, criterion, mtl, QuickCheck, text
      }:
@@ -42865,7 +42604,6 @@ self: {
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-embed" = callPackage
@@ -43531,25 +43269,6 @@ self: {
      }) {};
 
   "cereal-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl
-     , resourcet, transformers
-     }:
-     mkDerivation {
-       pname = "cereal-conduit";
-       version = "0.7.3";
-       sha256 = "18h09j16m4yc4fcp80x7m1p2c87q6f628z36y8bnxbcjc9m95gq5";
-       libraryHaskellDepends = [
-         base bytestring cereal conduit resourcet transformers
-       ];
-       testHaskellDepends = [
-         base bytestring cereal conduit HUnit mtl resourcet transformers
-       ];
-       homepage = "https://github.com/snoyberg/conduit";
-       description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cereal-conduit_0_8_0" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl
      , resourcet, transformers
      }:
@@ -43568,7 +43287,6 @@ self: {
        homepage = "https://github.com/snoyberg/conduit";
        description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-derive" = callPackage
@@ -44147,34 +43865,6 @@ self: {
      }) {};
 
   "chart-unit" = callPackage
-    ({ mkDerivation, base, colour, containers, data-default
-     , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear
-     , mwc-probability, mwc-random, numhask, numhask-range, palette
-     , primitive, protolude, scientific, SVGFonts, tasty, tasty-hspec
-     , tdigest, text
-     }:
-     mkDerivation {
-       pname = "chart-unit";
-       version = "0.5.5.0";
-       sha256 = "0hskfcg17h22fyprr9y264g6jz4lq1a7akqvdyji4fln61mqn07r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base colour data-default diagrams-lib diagrams-svg foldl formatting
-         lens linear numhask numhask-range palette scientific SVGFonts text
-       ];
-       executableHaskellDepends = [
-         base containers diagrams-lib diagrams-svg foldl formatting lens
-         mwc-probability mwc-random numhask primitive protolude tdigest text
-       ];
-       testHaskellDepends = [ base numhask tasty tasty-hspec text ];
-       homepage = "https://github.com/tonyday567/chart-unit#readme";
-       description = "Native haskell charts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "chart-unit_0_6_1_0" = callPackage
     ({ mkDerivation, base, colour, data-default, diagrams-lib
      , diagrams-svg, doctest, foldl, formatting, generic-lens
      , generic-lens-labels, lens, linear, mwc-probability, mwc-random
@@ -45100,15 +44790,18 @@ self: {
      }) {};
 
   "cipher-aes128" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, criterion, crypto-api
-     , entropy, tagged
+    ({ mkDerivation, base, bytestring, Cabal, cereal, criterion
+     , crypto-api, entropy, process, tagged
      }:
      mkDerivation {
        pname = "cipher-aes128";
        version = "0.7.0.3";
        sha256 = "0fif8626z1p2q6734sjb69s1ascwmqiv9dkmzir7166ipjlbw9vg";
+       revision = "1";
+       editedCabalFile = "1c3lr80vcdrajlvks9ny9s8m2n2kc9jw14nh65668dfikp0pqc61";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [
          base bytestring cereal crypto-api tagged
        ];
@@ -45305,29 +44998,28 @@ self: {
      }) {};
 
   "cisco-spark-api" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bitset-word8, bytestring
-     , conduit-combinators, data-default, hspec, http-conduit
-     , http-types, network-uri, optparse-applicative, text
-     , thread-hierarchy, utf8-string, wai, warp
+    ({ 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.0";
-       sha256 = "0wiz580v04acjnc05mpx7nwgdz5gk6gsg84lv26p7qlij17038ds";
+       version = "0.1.0.2";
+       sha256 = "0cgs3d4dlc5vxz51d8c6hjvi1zxsvxzni4nqhqrc0rxnxkimc7bw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bitset-word8 bytestring conduit-combinators
-         data-default http-conduit network-uri text
+         aeson attoparsec base bitset-word8 bytestring conduit data-default
+         http-conduit network-uri text
        ];
        executableHaskellDepends = [
-         aeson base bytestring conduit-combinators data-default http-conduit
+         aeson base bytestring conduit data-default http-conduit
          optparse-applicative text utf8-string
        ];
        testHaskellDepends = [
-         aeson attoparsec base bytestring conduit-combinators data-default
-         hspec http-conduit http-types network-uri text thread-hierarchy wai
-         warp
+         aeson async attoparsec base bytestring conduit data-default hspec
+         http-conduit http-types network-uri text wai warp
        ];
        homepage = "https://github.com/nshimaza/cisco-spark-api#readme";
        description = "A Haskell bindings for Cisco Spark API";
@@ -45878,37 +45570,6 @@ self: {
      }) {};
 
   "classy-prelude" = callPackage
-    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
-     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
-     , hashable, hspec, lifted-async, lifted-base, monad-unlift
-     , mono-traversable, mono-traversable-instances, mtl
-     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
-     , semigroups, stm, stm-chans, text, time, time-locale-compat
-     , transformers, transformers-base, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "classy-prelude";
-       version = "1.3.1";
-       sha256 = "0rk1h0kipmpk94ny2i389l6kjv7j4a55vabpm938rxv5clja2wyd";
-       libraryHaskellDepends = [
-         async base basic-prelude bifunctors bytestring chunked-data
-         containers deepseq dlist exceptions ghc-prim hashable lifted-async
-         lifted-base monad-unlift mono-traversable
-         mono-traversable-instances mtl mutable-containers primitive
-         safe-exceptions say semigroups stm stm-chans text time
-         time-locale-compat transformers transformers-base
-         unordered-containers vector vector-instances
-       ];
-       testHaskellDepends = [
-         base containers hspec QuickCheck transformers unordered-containers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "classy-prelude_1_4_0" = callPackage
     ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, deepseq, dlist, ghc-prim, hashable
      , hspec, mono-traversable, mono-traversable-instances, mtl
@@ -45933,31 +45594,9 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "A typeclass-based Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, conduit
-     , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
-     , transformers, void
-     }:
-     mkDerivation {
-       pname = "classy-prelude-conduit";
-       version = "1.3.1";
-       sha256 = "0n76c6bg45zcvy1jid3lrn6cr4iz3la7dd1ym7nffvqvgrfp0r2j";
-       libraryHaskellDepends = [
-         base bytestring classy-prelude conduit conduit-combinators
-         monad-control resourcet transformers void
-       ];
-       testHaskellDepends = [
-         base bytestring conduit hspec QuickCheck transformers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "classy-prelude together with conduit functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "classy-prelude-conduit_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
      , monad-control, QuickCheck, resourcet, transformers, void
      }:
@@ -45975,29 +45614,9 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "classy-prelude together with conduit functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-yesod" = callPackage
-    ({ mkDerivation, aeson, base, classy-prelude
-     , classy-prelude-conduit, data-default, http-conduit, http-types
-     , persistent, yesod, yesod-newsfeed, yesod-static
-     }:
-     mkDerivation {
-       pname = "classy-prelude-yesod";
-       version = "1.3.1";
-       sha256 = "1yzkwp4gbl1jqv8r95kvbiqgf2sr9wy5ddkqdz3413y0rvwccr9x";
-       libraryHaskellDepends = [
-         aeson base classy-prelude classy-prelude-conduit data-default
-         http-conduit http-types persistent yesod yesod-newsfeed
-         yesod-static
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "Provide a classy prelude including common Yesod functionality";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "classy-prelude-yesod_1_4_0" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
@@ -46014,7 +45633,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Provide a classy prelude including common Yesod functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classyplate" = callPackage
@@ -48440,25 +48058,6 @@ self: {
      }) {};
 
   "combinatorial" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, transformers
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "combinatorial";
-       version = "0.0";
-       sha256 = "0v0djq8kiiam8fd0057skny3dkqn3y138nf5cqbyqp52wzs2lvs6";
-       revision = "1";
-       editedCabalFile = "18aykjlggxkwn3cl46i2vznvag5kkw2kslf69yxvf4sg34bi7yfz";
-       libraryHaskellDepends = [
-         array base containers transformers utility-ht
-       ];
-       testHaskellDepends = [ base QuickCheck utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/combinatorial/";
-       description = "Count, enumerate, rank and unrank combinatorial objects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "combinatorial_0_1" = callPackage
     ({ mkDerivation, array, base, containers, QuickCheck, transformers
      , utility-ht
      }:
@@ -48477,7 +48076,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/combinatorial/";
        description = "Count, enumerate, rank and unrank combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorial-problems" = callPackage
@@ -48714,8 +48312,8 @@ self: {
        pname = "comonad";
        version = "5.0.3";
        sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57";
-       revision = "1";
-       editedCabalFile = "1i72zgxjkbldkwz0g2awf44cm9466ahll89j5kl45vszx4iz0anl";
+       revision = "2";
+       editedCabalFile = "07gfz719y6q3bfv8jbvak78dda9g1qy4phl18cxisiapqdz31rry";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
@@ -49073,8 +48671,8 @@ self: {
        pname = "complex-generic";
        version = "0.1.1.1";
        sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz";
-       revision = "1";
-       editedCabalFile = "0jf2mq26m0asgl5l0b1c1va30qj61ddvwxyl5xq29d3lpgnlby27";
+       revision = "2";
+       editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://code.mathr.co.uk/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
@@ -49711,23 +49309,6 @@ self: {
      }) {};
 
   "concurrency" = callPackage
-    ({ mkDerivation, array, atomic-primops, base, exceptions
-     , monad-control, mtl, stm, transformers
-     }:
-     mkDerivation {
-       pname = "concurrency";
-       version = "1.2.3.0";
-       sha256 = "1abrl3qab0gq1a2v4wjvmfzfmyainbj2qwf67h46pcrnd7va0ddq";
-       libraryHaskellDepends = [
-         array atomic-primops base exceptions monad-control mtl stm
-         transformers
-       ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "concurrency_1_4_0_2" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
@@ -49742,7 +49323,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -49821,6 +49401,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "concurrent-extra_0_7_0_12" = callPackage
+    ({ mkDerivation, async, base, HUnit, random, stm, test-framework
+     , test-framework-hunit, unbounded-delays
+     }:
+     mkDerivation {
+       pname = "concurrent-extra";
+       version = "0.7.0.12";
+       sha256 = "1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4";
+       libraryHaskellDepends = [ base stm unbounded-delays ];
+       testHaskellDepends = [
+         async base HUnit random stm test-framework test-framework-hunit
+         unbounded-delays
+       ];
+       homepage = "https://github.com/basvandijk/concurrent-extra";
+       description = "Extra concurrency primitives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-machines" = callPackage
     ({ mkDerivation, async, base, containers, lifted-async, machines
      , monad-control, semigroups, tasty, tasty-hunit, time, transformers
@@ -49828,8 +49427,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.3.1.2";
-       sha256 = "1qvd452najs0i3a2k2m493zs1jclsiisr1wv318kvkh0k42sb2m6";
+       version = "0.3.1.3";
+       sha256 = "1p1zlqa1mywn3mxg94gcryhpnffq8jpirgnvxhff2b1bs4llfaik";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -49858,6 +49457,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_10_5" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.10.5";
+       sha256 = "1hx51zihgr6awgx2widqv8y8hbi0baaq081m5kmr3mb4hqi9dh4q";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50059,7 +49675,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit" = callPackage
+  "conduit_1_2_13_1" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, exceptions
      , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
      , mwc-random, primitive, QuickCheck, resourcet, safe, split
@@ -50084,9 +49700,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit_1_3_0" = callPackage
+  "conduit" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -50113,38 +49730,39 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-algorithms" = callPackage
-    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
-     , conduit-combinators, conduit-extra, containers, deepseq
-     , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-th, transformers, vector
+  "conduit_1_3_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, gauge, hspec, kan-extensions
+     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+     , resourcet, safe, silently, split, text, transformers, unix
+     , unliftio, unliftio-core, vector
      }:
      mkDerivation {
-       pname = "conduit-algorithms";
-       version = "0.0.7.2";
-       sha256 = "19lamsddxvj8m47f97wlmk3phzf2rjdaxjbz064wc96r763mnigy";
+       pname = "conduit";
+       version = "1.3.0.1";
+       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
        libraryHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq lzma-conduit mtl resourcet stm
-         stm-conduit streaming-commons transformers vector
+         base bytestring directory exceptions filepath mono-traversable mtl
+         primitive resourcet text transformers unix unliftio-core vector
        ];
        testHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq directory HUnit lzma-conduit mtl
-         resourcet stm stm-conduit streaming-commons test-framework
-         test-framework-hunit test-framework-th transformers vector
+         base bytestring containers directory exceptions filepath hspec
+         mono-traversable mtl QuickCheck resourcet safe silently split text
+         transformers unliftio vector
        ];
-       homepage = "https://github.com/luispedro/conduit-algorithms#readme";
-       description = "Conduit-based algorithms";
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-algorithms_0_0_8_0" = callPackage
+  "conduit-algorithms" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, containers, deepseq
      , directory, exceptions, HUnit, lzma-conduit, monad-control, mtl
@@ -50243,34 +49861,6 @@ self: {
      }) {};
 
   "conduit-combinators" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, chunked-data, conduit, conduit-extra, containers
-     , directory, filepath, hspec, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , text, transformers, transformers-base, unix, unix-compat, vector
-     , void
-     }:
-     mkDerivation {
-       pname = "conduit-combinators";
-       version = "1.1.2";
-       sha256 = "0f31iphdi31m7cfd2szq06x3xdag1kkv2vbxh6bm2ax37k9sw2w4";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit conduit-extra filepath monad-control mono-traversable
-         mwc-random primitive resourcet text transformers transformers-base
-         unix unix-compat vector void
-       ];
-       testHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit containers directory filepath hspec mono-traversable mtl
-         mwc-random QuickCheck safe silently text transformers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "Commonly used conduit functions, for both chunked and unchunked data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-combinators_1_3_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "conduit-combinators";
@@ -50281,7 +49871,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "DEPRECATED Functionality merged into the conduit package itself";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-connection" = callPackage
@@ -50305,7 +49894,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "conduit-extra" = callPackage
+  "conduit-extra_1_2_3_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, criterion, directory, exceptions
      , filepath, hspec, monad-control, network, primitive, process
@@ -50336,9 +49925,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-extra_1_3_0" = callPackage
+  "conduit-extra" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring
      , bytestring-builder, conduit, directory, exceptions, filepath
      , gauge, hspec, network, primitive, process, QuickCheck, resourcet
@@ -50365,7 +49955,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-find" = callPackage
@@ -50454,17 +50043,16 @@ self: {
      }) {};
 
   "conduit-parse" = callPackage
-    ({ mkDerivation, base, conduit, conduit-combinators, dlist, mtl
-     , parsers, resourcet, safe, safe-exceptions, tasty, tasty-hunit
-     , text, transformers
+    ({ mkDerivation, base, conduit, dlist, mtl, parsers, resourcet
+     , safe, safe-exceptions, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "conduit-parse";
-       version = "0.1.2.2";
-       sha256 = "19ywaknrdcg88ximmx6fa08bq9xvp76ybly09gyp21xjnfdznsr9";
+       version = "0.2.0.0";
+       sha256 = "03ynwkq48ni473fzbhviyff73i4v7wy8hcdlvr0i8pv8kq1zk7v5";
        libraryHaskellDepends = [
-         base conduit conduit-combinators dlist mtl parsers safe
-         safe-exceptions text transformers
+         base conduit dlist mtl parsers safe safe-exceptions text
+         transformers
        ];
        testHaskellDepends = [
          base conduit mtl parsers resourcet safe-exceptions tasty
@@ -51055,8 +50643,8 @@ self: {
      }:
      mkDerivation {
        pname = "console-program";
-       version = "0.4.2.1";
-       sha256 = "1havd30r0yni6vym7zfkryvyhqp1r0q8ijypr31jdk5dsn8zb2py";
+       version = "0.4.2.2";
+       sha256 = "1zr6c9wdlx16v559zzjah84v0psphyzyq5d837ncshkxmssri8ja";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory haskeline
          parsec parsec-extra split transformers unix utility-ht
@@ -51215,23 +50803,6 @@ self: {
      }) {};
 
   "constraints" = callPackage
-    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "constraints";
-       version = "0.9.1";
-       sha256 = "11d76051i2a335bvack04dqvsz4zhgcms1jxlvy4a4c670l02vi7";
-       libraryHaskellDepends = [
-         base binary deepseq ghc-prim hashable mtl transformers
-         transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/constraints/";
-       description = "Constraint manipulation";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "constraints_0_10" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
      , hspec-discover, mtl, semigroups, transformers
      , transformers-compat
@@ -51249,7 +50820,6 @@ self: {
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructible" = callPackage
@@ -52064,28 +51634,6 @@ self: {
      }) {};
 
   "cookie" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring
-     , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck, text, time
-     }:
-     mkDerivation {
-       pname = "cookie";
-       version = "0.4.3";
-       sha256 = "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring data-default-class deepseq old-locale
-         text time
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
-         tasty-quickcheck text time
-       ];
-       homepage = "http://github.com/snoyberg/cookie";
-       description = "HTTP cookie parsing and rendering";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "cookie_0_4_4" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, deepseq
      , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
      , time
@@ -52104,7 +51652,6 @@ self: {
        homepage = "http://github.com/snoyberg/cookie";
        description = "HTTP cookie parsing and rendering";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coordinate" = callPackage
@@ -52368,6 +51915,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "corenlp-parser" = callPackage
+    ({ mkDerivation, aeson, base, directory, process, raw-strings-qq
+     , string-class, temporary, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "corenlp-parser";
+       version = "0.2.0.0";
+       sha256 = "0h001djrgjds3rnmgdxmap26rb1z2zr88q1snv6gkq28p3vknyf1";
+       libraryHaskellDepends = [
+         aeson base directory process raw-strings-qq string-class temporary
+         text unordered-containers
+       ];
+       homepage = "https://github.com/k-bx/corenlp-parser#readme";
+       description = "Launches CoreNLP and parses the JSON output";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "coroutine-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, monad-coroutine }:
      mkDerivation {
@@ -53545,10 +53109,10 @@ self: {
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.2.6.0";
-       sha256 = "0a9pjmy74cd3yirihyabavsfa6b9rrrgav86qdagw5nwjw7as1bc";
+       version = "1.3.0.0";
+       sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q";
        revision = "2";
-       editedCabalFile = "0i5fb4g9qpar9fkbkgrd9v7ifl4277cp88qmcwxzqak4knxifba8";
+       editedCabalFile = "1yyv34f9yk8d67x18l1al5csd383ypmdwnz73gq0agmw4k2f9c54";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -53559,10 +53123,12 @@ self: {
          parsec semigroups statistics text time transformers
          transformers-compat vector vector-algorithms
        ];
-       executableHaskellDepends = [ base optparse-applicative ];
+       executableHaskellDepends = [
+         base base-compat optparse-applicative semigroups
+       ];
        testHaskellDepends = [
-         aeson base bytestring deepseq directory HUnit QuickCheck statistics
-         tasty tasty-hunit tasty-quickcheck vector
+         aeson base base-compat bytestring deepseq directory HUnit
+         QuickCheck statistics tasty tasty-hunit tasty-quickcheck vector
        ];
        homepage = "http://www.serpentine.com/criterion";
        description = "Robust, reliable performance measurement and analysis";
@@ -54146,8 +53712,8 @@ self: {
      }:
      mkDerivation {
        pname = "crypto-rng";
-       version = "0.1.0.1";
-       sha256 = "1hmml06vkf769cwxjry04zcxigy8w6sgfm9rmzwwv402mqh48dzs";
+       version = "0.1.0.2";
+       sha256 = "1h7ilx91jbnlmax0z74kvk6f3yr4f14pk15bi9qvhn8kj13i7qf1";
        libraryHaskellDepends = [
          base bytestring crypto-api DRBG exceptions monad-control mtl
          transformers-base
@@ -54478,29 +54044,6 @@ self: {
      }) {};
 
   "cryptonite" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, foundation
-     , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
-     , tasty-kat, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite";
-       version = "0.24";
-       sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp";
-       libraryHaskellDepends = [
-         base bytestring deepseq foundation ghc-prim integer-gmp memory
-       ];
-       testHaskellDepends = [
-         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion memory random
-       ];
-       homepage = "https://github.com/haskell-crypto/cryptonite";
-       description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite_0_25" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, gauge
      , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
      , tasty-kat, tasty-quickcheck
@@ -54521,7 +54064,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite-conduit" = callPackage
@@ -54725,6 +54267,21 @@ self: {
        license = "LGPL";
      }) {};
 
+  "csp_1_4_0" = callPackage
+    ({ mkDerivation, base, containers, mtl, nondeterminism, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "csp";
+       version = "1.4.0";
+       sha256 = "15ilx5ycvh12c71wza2d25cp4llvncxc9csmmisjcxwny5gpz1q8";
+       libraryHaskellDepends = [ base containers mtl nondeterminism ];
+       testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
+       description = "Discrete constraint satisfaction problem (CSP) solver";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cspmchecker" = callPackage
     ({ mkDerivation, base, directory, filepath, haskeline, libcspm, mtl
      }:
@@ -55235,6 +54792,28 @@ self: {
      }) {};
 
   "curl-runnings" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cmdargs
+     , directory, hspec, hspec-expectations, http-conduit, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "curl-runnings";
+       version = "0.2.0";
+       sha256 = "0ss98dn39aaa3q2rvf8qf7w638hwwwb2g20p9grw2n9ki0k76i3n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hspec
+         hspec-expectations http-conduit text unordered-containers yaml
+       ];
+       executableHaskellDepends = [ base cmdargs text ];
+       testHaskellDepends = [ base directory hspec hspec-expectations ];
+       homepage = "https://github.com/aviaviavi/curl-runnings#readme";
+       description = "A framework for declaratively writing curl based API tests";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "curl-runnings_0_3_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, cmdargs, directory, hspec, hspec-expectations
      , http-conduit, http-types, text, unordered-containers, vector
@@ -55256,6 +54835,7 @@ self: {
        homepage = "https://github.com/aviaviavi/curl-runnings#readme";
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curlhs" = callPackage
@@ -55302,12 +54882,17 @@ self: {
      }) {};
 
   "currency-codes" = callPackage
-    ({ mkDerivation, aeson, base, bson, random, safe, text }:
+    ({ mkDerivation, aeson, base, bson, deepseq, hspec, QuickCheck
+     , random, safe, text
+     }:
      mkDerivation {
        pname = "currency-codes";
-       version = "2.0.0.0";
-       sha256 = "0sdgnzww38l9vhjxs2b92c4j0db4ssbhxs4zrhvnfh66x6jjvnd5";
-       libraryHaskellDepends = [ aeson base bson random safe text ];
+       version = "3.0.0.0";
+       sha256 = "0xv5mad6d5y0slizwvh3q9m4n2nxjlav4lxy30s3fv0cfkx4hhwn";
+       libraryHaskellDepends = [
+         aeson base bson deepseq random safe text
+       ];
+       testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        homepage = "https://github.com/chordify/currency-codes";
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
@@ -56823,25 +56408,6 @@ self: {
      }) {};
 
   "data-diverse-lens" = callPackage
-    ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
-     , profunctors, tagged
-     }:
-     mkDerivation {
-       pname = "data-diverse-lens";
-       version = "1.0.0.1";
-       sha256 = "0ivrm1n2pbsj6hskgz56igna13d8zfj2n0iiqvmpba81kzwlg0x7";
-       libraryHaskellDepends = [
-         base data-diverse generic-lens lens profunctors tagged
-       ];
-       testHaskellDepends = [
-         base data-diverse generic-lens hspec lens tagged
-       ];
-       homepage = "https://github.com/louispan/data-diverse-lens#readme";
-       description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-diverse-lens_2_1_0_0" = callPackage
     ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
      , profunctors, tagged
      }:
@@ -56858,7 +56424,6 @@ self: {
        homepage = "https://github.com/louispan/data-diverse-lens#readme";
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-dword" = callPackage
@@ -57927,8 +57492,8 @@ self: {
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "data-transform";
-       version = "0.1.0.1";
-       sha256 = "1ib6znjgcjz50z4saf70z7jg9qz132627vj3kv6r3jx6i9vyv2l6";
+       version = "0.1.0.2";
+       sha256 = "0r4j295b8688x88knbw19z6f4ggnpxgs7adpl1r00njjykdhdzac";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -59091,25 +58656,6 @@ self: {
      }) {};
 
   "debug" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, directory, extra
-     , ghc-prim, js-jquery, open-browser, template-haskell, uniplate
-     }:
-     mkDerivation {
-       pname = "debug";
-       version = "0.0.2";
-       sha256 = "13dx8fqyczba1qldl0nk5i8c1hxsqi5497dylkjyzjmxphs6fi53";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base containers directory extra ghc-prim js-jquery
-         open-browser template-haskell uniplate
-       ];
-       testHaskellDepends = [ base extra ];
-       homepage = "https://github.com/ndmitchell/debug";
-       description = "Simple trace-based debugger";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "debug_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, clock, containers
      , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
      , js-jquery, libgraph, monoidal-containers, open-browser
@@ -59137,7 +58683,6 @@ self: {
        homepage = "https://github.com/ndmitchell/debug";
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debug-diff" = callPackage
@@ -59286,8 +58831,8 @@ self: {
      }:
      mkDerivation {
        pname = "declarative";
-       version = "0.5.1";
-       sha256 = "0966yk9ihl2xawr8xiymz6yp0z6py7dq94ii7zd845klgq393maf";
+       version = "0.5.2";
+       sha256 = "014spawd3wgasrlfaz0zcz0qf1cnhr9nxm71lzcxjgi8n1gcza0y";
        libraryHaskellDepends = [
          base hasty-hamiltonian kan-extensions lens mcmc-types
          mighty-metropolis mwc-probability pipes primitive speedy-slice
@@ -59462,8 +59007,8 @@ self: {
        pname = "deepseq-generics";
        version = "0.2.0.0";
        sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh";
-       revision = "1";
-       editedCabalFile = "055m914q7a19jagpxh65d8m67z1nl0h7cz77y1r0zp1qmpkisg82";
+       revision = "2";
+       editedCabalFile = "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
@@ -59665,18 +59210,18 @@ self: {
 
   "dejafu" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, random, ref-fd, transformers, transformers-base
+     , leancheck, profunctors, random, ref-fd, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.9.1.2";
-       sha256 = "1cxskfl2wg3m9hja97yc0sjghskhs442l2jqwcynlhjr308g84as";
+       version = "1.3.1.0";
+       sha256 = "09c2gsgqxnr9kpkhbz4g1wrl66qy02vp3sckp8vsg194r5xx4s1b";
        libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck random
-         ref-fd transformers transformers-base
+         base concurrency containers deepseq exceptions leancheck
+         profunctors random ref-fd transformers
        ];
        homepage = "https://github.com/barrucadu/dejafu";
-       description = "Systematic testing for Haskell concurrency";
+       description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -60248,28 +59793,6 @@ self: {
      }) {};
 
   "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged
-     , template-haskell, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
-       version = "0.3.6";
-       sha256 = "0v9m76hjrlrcbyawdp04y1vv0p867h3jhy00xjxgmqq5cm0sn7qc";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell transformers
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
-       ];
-       homepage = "https://github.com/haskell-compat/deriving-compat";
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_4_1" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -60293,7 +59816,6 @@ self: {
        homepage = "https://github.com/haskell-compat/deriving-compat";
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -60538,37 +60060,6 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring
-     , bytestring, case-insensitive, charset, containers, contravariant
-     , cryptohash, exceptions, http-client, http-client-tls, lens
-     , optparse-generic, parsers, prettyprinter, system-fileio
-     , system-filepath, tasty, tasty-hunit, text, text-format
-     , transformers, trifecta, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.8.2";
-       sha256 = "1llr12rwnd39xs51faxxvrf9n9scwsz3j2ywqdfsrr3hiasq80aj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base base16-bytestring bytestring case-insensitive
-         charset containers contravariant cryptohash exceptions http-client
-         http-client-tls lens parsers prettyprinter system-fileio
-         system-filepath text text-format transformers trifecta
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         base optparse-generic prettyprinter system-filepath text trifecta
-       ];
-       testHaskellDepends = [
-         base containers tasty tasty-hunit text vector
-       ];
-       description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall_1_11_1" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , contravariant, cryptonite, deepseq, directory, exceptions
@@ -60603,32 +60094,9 @@ self: {
        ];
        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
-     , text-format, trifecta, vector
-     }:
-     mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.6";
-       sha256 = "1wjwjpprvd90dpmxij5zj1gr5x41bvzmr4qwyfhxd2am6bzg5n5d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers dhall neat-interpolation shell-escape
-         text text-format vector
-       ];
-       executableHaskellDepends = [
-         base bytestring dhall optparse-generic text trifecta
-       ];
-       description = "Compile Dhall to Bash";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-bash_1_0_10" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , insert-ordered-containers, neat-interpolation, optparse-generic
      , shell-escape, text, text-format, trifecta
@@ -60648,7 +60116,6 @@ self: {
        ];
        description = "Compile Dhall to Bash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-check" = callPackage
@@ -60671,25 +60138,6 @@ self: {
      }) {};
 
   "dhall-json" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-generic, text, trifecta, vector, yaml
-     }:
-     mkDerivation {
-       pname = "dhall-json";
-       version = "1.0.9";
-       sha256 = "0xxgvsv8maccf81mdip1jnw4y3jlpnjhhxvyp4d3ph0xnng7z9l6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ aeson base dhall text vector ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall optparse-generic text
-         trifecta yaml
-       ];
-       description = "Compile Dhall to JSON or YAML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-json_1_0_12" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
      , optparse-generic, text, trifecta, yaml
      }:
@@ -60706,32 +60154,9 @@ self: {
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, hnix
-     , neat-interpolation, optparse-generic, text, text-format, trifecta
-     , vector
-     }:
-     mkDerivation {
-       pname = "dhall-nix";
-       version = "1.0.9";
-       sha256 = "06njwk2mmn8virrzd7q1bw91rwagcczkjn21kjhbajn6gzl77dry";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers data-fix dhall hnix neat-interpolation text
-         text-format vector
-       ];
-       executableHaskellDepends = [
-         base dhall hnix optparse-generic text trifecta
-       ];
-       description = "Dhall to Nix compiler";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-nix_1_1_1" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, hnix
      , insert-ordered-containers, neat-interpolation, optparse-generic
      , scientific, text, text-format, trifecta
@@ -60751,23 +60176,9 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-text" = callPackage
-    ({ mkDerivation, base, dhall, optparse-generic, text }:
-     mkDerivation {
-       pname = "dhall-text";
-       version = "1.0.5";
-       sha256 = "195nfflpk787m8jjmspw2x4rb2s7vd0z5wz5s0bzfwdl6c7xgg27";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base dhall optparse-generic text ];
-       description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-text_1_0_7" = callPackage
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
@@ -60778,7 +60189,6 @@ self: {
        executableHaskellDepends = [ base dhall optparse-generic text ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -60879,6 +60289,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-braille" = callPackage
+    ({ mkDerivation, base, containers, diagrams-core, diagrams-lib
+     , diagrams-rasterific, filepath, hashable, JuicyPixels, lens, mtl
+     , optparse-applicative, Rasterific, time
+     }:
+     mkDerivation {
+       pname = "diagrams-braille";
+       version = "0.1.0.0";
+       sha256 = "0825zczccr878ghlw26x1skg56g8wxa9c0zq3dfaxhfyvxi9d6aq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers diagrams-core diagrams-lib diagrams-rasterific
+         filepath hashable JuicyPixels lens mtl optparse-applicative
+         Rasterific time
+       ];
+       executableHaskellDepends = [
+         base containers diagrams-core diagrams-lib diagrams-rasterific
+         filepath hashable JuicyPixels lens mtl optparse-applicative
+         Rasterific time
+       ];
+       homepage = "https://github.com/mlang/diagrams-braille#readme";
+       description = "Braille diagrams with plain text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-builder" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cmdargs
      , diagrams-cairo, diagrams-lib, diagrams-postscript
@@ -60953,35 +60389,6 @@ self: {
      }) {};
 
   "diagrams-contrib" = callPackage
-    ({ mkDerivation, base, circle-packing, colour, containers
-     , cubicbezier, data-default, data-default-class, diagrams-core
-     , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
-     , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat
-     , parsec, QuickCheck, random, semigroups, split, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "diagrams-contrib";
-       version = "1.4.1";
-       sha256 = "1apbgicaq7qaij42hwh5aiy67si2fjd0m4lah1hw4vz0cqfxxs2v";
-       revision = "1";
-       editedCabalFile = "0143vrfnb5qp3m23nvh5h67b2wvkq8y27yn6jjq601cs95f3b41c";
-       libraryHaskellDepends = [
-         base circle-packing colour containers cubicbezier data-default
-         data-default-class diagrams-core diagrams-lib diagrams-solve
-         force-layout hashable lens linear mfsolve MonadRandom monoid-extras
-         mtl mtl-compat parsec random semigroups split text
-       ];
-       testHaskellDepends = [
-         base containers diagrams-lib HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Collection of user contributions to diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-contrib_1_4_2_1" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , cubicbezier, data-default, data-default-class, diagrams-core
      , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
@@ -61006,7 +60413,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
@@ -61988,24 +61394,6 @@ self: {
      }) {};
 
   "dimensional" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit
-     , numtype-dk, vector
-     }:
-     mkDerivation {
-       pname = "dimensional";
-       version = "1.0.1.3";
-       sha256 = "19wkm9jm6pjrrwqvafhs8zmfa9g06l5a03pcr8jm6497jajndi9v";
-       libraryHaskellDepends = [
-         base deepseq exact-pi numtype-dk vector
-       ];
-       testHaskellDepends = [ base HUnit ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/bjornbm/dimensional/";
-       description = "Statically checked physical dimensions, using Type Families and Data Kinds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dimensional_1_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob
      , hspec, ieee754, numtype-dk, QuickCheck, semigroups
      , template-haskell, vector
@@ -62024,7 +61412,6 @@ self: {
        homepage = "https://github.com/bjornbm/dimensional/";
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dimensional-codata" = callPackage
@@ -62784,23 +62171,6 @@ self: {
      }) {};
 
   "distributed-closure" = callPackage
-    ({ mkDerivation, base, binary, bytestring, constraints, hspec
-     , QuickCheck, syb, template-haskell
-     }:
-     mkDerivation {
-       pname = "distributed-closure";
-       version = "0.3.5";
-       sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h";
-       libraryHaskellDepends = [
-         base binary bytestring constraints syb template-haskell
-       ];
-       testHaskellDepends = [ base binary hspec QuickCheck ];
-       homepage = "https://github.com/tweag/distributed-closure";
-       description = "Serializable closures for distributed programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributed-closure_0_4_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, hspec
      , QuickCheck, syb, template-haskell
      }:
@@ -62815,7 +62185,6 @@ self: {
        homepage = "https://github.com/tweag/distributed-closure";
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process" = callPackage
@@ -63419,8 +62788,8 @@ self: {
        pname = "distributive";
        version = "0.5.3";
        sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
-       revision = "4";
-       editedCabalFile = "1v6b2vnharppjn6w36lxfy0dvl93jzjq7fcyq9cp71650f1g9ai5";
+       revision = "5";
+       editedCabalFile = "0hl43mbw87s5l7p1iqc7iwz5rnzdcmj6g33pmq6hv4s9fg96j8x7";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans tagged transformers transformers-compat
@@ -63858,42 +63227,6 @@ self: {
      }) {};
 
   "docker" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , conduit-combinators, conduit-extra, connection, containers
-     , data-default-class, directory, exceptions, filemanip, filepath
-     , http-client, http-client-tls, http-conduit, http-types, lens
-     , lens-aeson, monad-control, mtl, network, process, QuickCheck
-     , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, time, tls, transformers, transformers-base
-     , unordered-containers, uuid, vector, x509, x509-store, x509-system
-     , zlib
-     }:
-     mkDerivation {
-       pname = "docker";
-       version = "0.4.1.1";
-       sha256 = "103j8hcabfwrzjmjzxw3ks7b90nnanznck941v956q1h3240npka";
-       revision = "1";
-       editedCabalFile = "1zbi904jaq2mvbxhmw2l181xz0p6q8mia843g5arsz3akckq2z72";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit conduit-combinators
-         conduit-extra containers data-default-class directory exceptions
-         filemanip filepath http-client http-conduit http-types
-         monad-control mtl network resourcet scientific tar temporary text
-         time tls transformers transformers-base unordered-containers uuid
-         vector x509 x509-store x509-system zlib
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection containers http-client
-         http-client-tls http-types lens lens-aeson process QuickCheck tasty
-         tasty-hunit tasty-quickcheck text transformers unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/denibertovic/docker-hs";
-       description = "An API client for docker written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "docker_0_5_1_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , conduit-combinators, conduit-extra, connection, containers
      , data-default-class, directory, exceptions, filemanip, filepath
@@ -63925,7 +63258,6 @@ self: {
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -63934,13 +63266,14 @@ self: {
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.8.2";
-       sha256 = "0kmr7b0i5wbcn6r2f2pi4ndnzr4kdi3yj2v1pxwqyv8v0d6h55gi";
+       version = "1.9.1";
+       sha256 = "1d8v9900j9ygx060gahwk208i5f36sdpnlpdaa1qqhcnywvmfzi4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base containers foldl language-docker system-filepath text turtle
        ];
+       homepage = "https://github.com/seatgeek/docker-build-cacher#readme";
        description = "Builds a services with docker and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64047,26 +63380,6 @@ self: {
      }) {};
 
   "doctemplates" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, hspec, parsec, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "doctemplates";
-       version = "0.2.1";
-       sha256 = "1bfs2kl5j5al2w2y4qpbn68p0xsnb65r7h51l356kpkzc326646p";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers parsec
-         scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec text ];
-       homepage = "https://github.com/jgm/doctemplates#readme";
-       description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "doctemplates_0_2_2" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, hspec, parsec, scientific, text, unordered-containers
      , vector
@@ -64084,7 +63397,6 @@ self: {
        homepage = "https://github.com/jgm/doctemplates#readme";
        description = "Pandoc-style document templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest" = callPackage
@@ -64114,7 +63426,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "doctest_0_14_1" = callPackage
+  "doctest_0_15_0" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
      , QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -64122,10 +63434,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.14.1";
-       sha256 = "1phnrsh2gjls54mlpqhfjs0x003jbrsz1sijy107mbg2gnck9cfj";
-       revision = "1";
-       editedCabalFile = "12ypn6bk87kmqfsyy8950zpyl4h45rnkyxsh2i5sbyx4rjq3kwk6";
+       version = "0.15.0";
+       sha256 = "13c1l8cc8rzbxgpnaa75x13z9vnr7kffng18czh8gwpv83vn5bpi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64147,14 +63457,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-discover_0_1_0_8" = callPackage
+  "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.8";
-       sha256 = "1ilmrc173d5xr7yphrbgg4kmkilyj1a89c67q4zrs4b6xfd5pa2x";
+       version = "0.1.0.7";
+       sha256 = "0w5xgw841fxp26n4c9srp84g0m0b105sa1snwrjg5dvxa7d6asmc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64171,14 +63481,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-discover" = callPackage
+  "doctest-discover_0_1_0_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.9";
-       sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437";
+       version = "0.1.0.8";
+       sha256 = "1ilmrc173d5xr7yphrbgg4kmkilyj1a89c67q4zrs4b6xfd5pa2x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64222,25 +63532,6 @@ self: {
      }) {};
 
   "doctest-driver-gen" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "doctest-driver-gen";
-       version = "0.1.0.1";
-       sha256 = "0drv2zp8mr4sisd27y0bcjamip8vs26a09k65x6zm5ric4psmhqs";
-       revision = "1";
-       editedCabalFile = "0005s8byp2ww8y2xnmxvdh24fw5qwly4f6sbmzwbs0yi10zsbfkg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base doctest ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/Hexirp/doctest-driver-gen#readme";
-       description = "Generate doctest-driver.hs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "doctest-driver-gen_0_2_0_0" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
@@ -65092,18 +64383,17 @@ self: {
      }) {};
 
   "drinkery" = callPackage
-    ({ mkDerivation, base, conduit, conduit-combinators, gauge, list-t
-     , ListT, machines, mtl, pipes, transformers
+    ({ mkDerivation, base, conduit, conduit-combinators, exceptions
+     , gauge, list-t, ListT, machines, mtl, pipes, transformers
      }:
      mkDerivation {
        pname = "drinkery";
-       version = "0.1";
-       sha256 = "0cwv7z7gzbbkxrdfikkbmkhd6asbib1m0j9h98nwhm7i1c498rhi";
-       revision = "1";
-       editedCabalFile = "19zjmmfjkkx3dsy4zwz8f3iciwgvlra9rxp5y11mkb5glg5qy3f9";
-       libraryHaskellDepends = [ base mtl transformers ];
+       version = "0.2";
+       sha256 = "0bfdd916ab27fqhsly2z2dmjhfvyz9q5w78qpdryi69d0gimfb8g";
+       libraryHaskellDepends = [ base exceptions mtl transformers ];
        benchmarkHaskellDepends = [
-         base conduit conduit-combinators gauge list-t ListT machines pipes
+         base conduit conduit-combinators exceptions gauge list-t ListT
+         machines mtl pipes transformers
        ];
        homepage = "https://github.com/fumieval/drinkery#readme";
        description = "Boozy streaming library";
@@ -67003,25 +66293,6 @@ self: {
      }) {};
 
   "either" = callPackage
-    ({ mkDerivation, base, bifunctors, exceptions, free, mmorph
-     , monad-control, MonadRandom, mtl, profunctors, semigroupoids
-     , semigroups, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "either";
-       version = "4.5";
-       sha256 = "1mzj86pbplgs3h7a49j3rk22s5cbw06wmd992gdm6harm15hzyzc";
-       libraryHaskellDepends = [
-         base bifunctors exceptions free mmorph monad-control MonadRandom
-         mtl profunctors semigroupoids semigroups transformers
-         transformers-base
-       ];
-       homepage = "http://github.com/ekmett/either/";
-       description = "An either monad transformer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "either_5" = callPackage
     ({ mkDerivation, base, bifunctors, hedgehog, mtl, profunctors
      , semigroupoids, semigroups
      }:
@@ -67036,7 +66307,6 @@ self: {
        homepage = "http://github.com/ekmett/either/";
        description = "Combinators for working with sums";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either-list-functions" = callPackage
@@ -67604,24 +66874,6 @@ self: {
      }) {};
 
   "elm-export-persistent" = callPackage
-    ({ mkDerivation, aeson, base, elm-export, persistent, scientific
-     , text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "elm-export-persistent";
-       version = "0.1.2";
-       sha256 = "17fyv33wv38lbfkx55wqhz1xls8as75ndfd14f10r2sknxafyidw";
-       libraryHaskellDepends = [
-         aeson base elm-export persistent scientific text
-         unordered-containers
-       ];
-       homepage = "https://github.com/jb55/elm-export-persistent";
-       description = "elm-export persistent entities";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
-     }) {};
-
-  "elm-export-persistent_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, elm-export, persistent, scientific
      , text, unordered-containers
      }:
@@ -67636,7 +66888,6 @@ self: {
        homepage = "https://github.com/jb55/elm-export-persistent";
        description = "elm-export persistent entities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
@@ -68020,6 +67271,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3_2_5" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3.2.5";
+       sha256 = "0k2fczw7qk442b3k0qblypaad8bva06x5sai5zgp7h6ckvlg8kvv";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       homepage = "https://github.com/Porges/email-validate-hs";
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -68744,26 +68013,6 @@ self: {
      }) {};
 
   "envy" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec, mtl
-     , QuickCheck, quickcheck-instances, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "envy";
-       version = "1.3.0.2";
-       sha256 = "16w9d0cg2niy766kmnsfgy803s802dm6mr0n3sgwz2fhwy6sz82c";
-       libraryHaskellDepends = [
-         base bytestring containers mtl text time transformers
-       ];
-       testHaskellDepends = [
-         base bytestring hspec mtl QuickCheck quickcheck-instances text time
-         transformers
-       ];
-       description = "An environmentally friendly way to deal with environment variables";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "envy_1_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, mtl
      , QuickCheck, quickcheck-instances, text, time, transformers
      }:
@@ -68937,18 +68186,6 @@ self: {
      }) {};
 
   "eq" = callPackage
-    ({ mkDerivation, base, semigroupoids }:
-     mkDerivation {
-       pname = "eq";
-       version = "4.0.4";
-       sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4";
-       libraryHaskellDepends = [ base semigroupoids ];
-       homepage = "http://github.com/ekmett/eq/";
-       description = "Leibnizian equality";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eq_4_1" = callPackage
     ({ mkDerivation, base, semigroupoids }:
      mkDerivation {
        pname = "eq";
@@ -68958,7 +68195,6 @@ self: {
        homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "equal-files" = callPackage
@@ -69590,8 +68826,8 @@ self: {
      }:
      mkDerivation {
        pname = "eternity";
-       version = "0.1.1";
-       sha256 = "0vl5vyysshbrb4vcf4r85w0n46vlfgpspj6nk7jl054099vsv58f";
+       version = "0.1.2";
+       sha256 = "0rjjdhr9cnpgm55mjvhlkgdvqvi5dmmzrr4vj0jmn9pg7zra34y6";
        libraryHaskellDepends = [
          attoparsec base cereal directory foldl potoki potoki-cereal text
        ];
@@ -69611,8 +68847,8 @@ self: {
      }:
      mkDerivation {
        pname = "eternity-timestamped";
-       version = "0.2.3";
-       sha256 = "1c7qil02diisnpv5vihh76l32l4c912s806z8p7p1jhv4wb13f8z";
+       version = "0.2.5";
+       sha256 = "1ndvb2gs8a9720k9wlbz01vm12s0pb4kmrkidc9w6m33985jckfa";
        libraryHaskellDepends = [
          attoparsec base cereal directory eternity foldl generic-random
          hashable potoki QuickCheck text time
@@ -70221,22 +69457,6 @@ self: {
      }) {};
 
   "eventsource-api" = callPackage
-    ({ mkDerivation, aeson, base, containers, mtl, protolude
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventsource-api";
-       version = "1.1.1";
-       sha256 = "0zy59m7iwxwy5c4l15kvj98fk7vrjwhxp0scc3r3v37cxkakg01h";
-       libraryHaskellDepends = [
-         aeson base containers mtl protolude unordered-containers uuid
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "Provides an eventsourcing high level API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eventsource-api_1_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , enclosed-exceptions, lifted-async, lifted-base, monad-control
      , monad-loops, mtl, stm, stm-chans, string-conversions, text
@@ -70254,32 +69474,9 @@ self: {
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "Provides an eventsourcing high level API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsource-geteventstore-store" = callPackage
-    ({ mkDerivation, aeson, base, eventsource-api
-     , eventsource-store-specs, eventstore, mtl, protolude, tasty
-     , tasty-hspec
-     }:
-     mkDerivation {
-       pname = "eventsource-geteventstore-store";
-       version = "1.0.4";
-       sha256 = "0fn75hwarhjnrjalv7i16ry1wnr2z2gqvpj3ls2faappz1drhxmp";
-       libraryHaskellDepends = [
-         aeson base eventsource-api eventstore mtl protolude
-       ];
-       testHaskellDepends = [
-         base eventsource-api eventsource-store-specs eventstore protolude
-         tasty tasty-hspec
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "GetEventStore store implementation";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventsource-geteventstore-store_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, eventsource-api
      , eventsource-store-specs, eventstore, mtl, protolude
      , string-conversions, tasty, tasty-hspec, transformers-base
@@ -70303,22 +69500,6 @@ self: {
      }) {};
 
   "eventsource-store-specs" = callPackage
-    ({ mkDerivation, aeson, base, eventsource-api, mtl, protolude
-     , tasty, tasty-hspec, uuid
-     }:
-     mkDerivation {
-       pname = "eventsource-store-specs";
-       version = "1.0.1";
-       sha256 = "0fg6rma02vp3iij93xgccqivqfx3h9675203jlmk6073mhg2i5id";
-       libraryHaskellDepends = [
-         aeson base eventsource-api mtl protolude tasty tasty-hspec uuid
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "Provides common test specification for Store implementation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eventsource-store-specs_1_1_1" = callPackage
     ({ mkDerivation, aeson, async, base, eventsource-api, mtl, tasty
      , tasty-hspec, text, transformers-base, uuid
      }:
@@ -70333,30 +69514,9 @@ self: {
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "Provides common test specification for Store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsource-stub-store" = callPackage
-    ({ mkDerivation, aeson, base, containers, eventsource-api
-     , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
-     }:
-     mkDerivation {
-       pname = "eventsource-stub-store";
-       version = "1.0.2";
-       sha256 = "10c853i9k91gc42jbqzxx3scip2hr1ahwkhzvcryhiw3745qsidr";
-       libraryHaskellDepends = [
-         base containers eventsource-api mtl protolude stm
-       ];
-       testHaskellDepends = [
-         aeson base eventsource-api eventsource-store-specs protolude tasty
-         tasty-hspec
-       ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
-       description = "An in-memory stub store implementation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eventsource-stub-store_1_0_3" = callPackage
     ({ mkDerivation, aeson, async, base, containers, eventsource-api
      , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
      , transformers-base
@@ -70375,7 +69535,6 @@ self: {
        homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "An in-memory stub store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsourced" = callPackage
@@ -70401,42 +69560,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, hashable, http-client
-     , interpolate, lifted-async, lifted-base, machines, monad-control
-     , monad-logger, mono-traversable, mtl, protobuf, random
-     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
-     , tasty-hunit, text, text-format, time, transformers-base
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "0.15.0.2";
-       sha256 = "00mamlf121c3dsigpxvshj1mbm2b4hdbil02zyhz7jc6kccgbjwx";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe-exceptions semigroups stm stm-chans text text-format time
-         transformers-base unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger hashable lifted-async
-         lifted-base monad-control mono-traversable protobuf safe-exceptions
-         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
-         transformers-base unordered-containers uuid
-       ];
-       homepage = "https://github.com/YoEight/eventstore#readme";
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_1_1_2" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -71065,8 +70188,8 @@ self: {
        pname = "exp-extended";
        version = "0.1.1.2";
        sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r";
-       revision = "1";
-       editedCabalFile = "1bxlaagjvlhnbf9hh0n46b05gm1vmdrgzzgrc3kbz8mg87j91vyr";
+       revision = "2";
+       editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0";
        libraryHaskellDepends = [ base compensated log-domain ];
        homepage = "https://code.mathr.co.uk/exp-extended";
        description = "floating point with extended exponent range";
@@ -71483,28 +70606,6 @@ self: {
      }) {};
 
   "extensible-effects" = callPackage
-    ({ mkDerivation, base, directory, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, transformers, transformers-base, type-aligned
-     }:
-     mkDerivation {
-       pname = "extensible-effects";
-       version = "2.1.0.0";
-       sha256 = "069v7ql359msnnsbapy1dwgsw3g6f0w8rrc0ihix1jm7p2ivjyrc";
-       libraryHaskellDepends = [
-         base transformers transformers-base type-aligned
-       ];
-       testHaskellDepends = [
-         base directory HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th
-       ];
-       homepage = "https://github.com/suhailshergill/extensible-effects";
-       description = "An Alternative to Monad Transformers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "extensible-effects_2_4_0_0" = callPackage
     ({ mkDerivation, base, criterion, HUnit, mtl, QuickCheck, silently
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , test-framework-th, transformers, transformers-base
@@ -71884,6 +70985,23 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "fake" = callPackage
+    ({ mkDerivation, base, containers, generics-sop, hspec, random
+     , text, time
+     }:
+     mkDerivation {
+       pname = "fake";
+       version = "0.1";
+       sha256 = "1q6l1nz4anq3njbs772y0mdyy6qhfza7yicxa6fkjaxzgc2dnf1m";
+       libraryHaskellDepends = [
+         base containers generics-sop random text time
+       ];
+       testHaskellDepends = [ base hspec random text time ];
+       homepage = "https://github.com/mightybyte/fake";
+       description = "Randomly generated fake data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fake-type" = callPackage
     ({ mkDerivation, base, base-prelude, libXtst, split, X11 }:
      mkDerivation {
@@ -72501,37 +71619,6 @@ self: {
      }) {};
 
   "fb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, bytestring, cereal, conduit, conduit-extra
-     , containers, crypto-api, cryptohash, cryptohash-cryptoapi
-     , data-default, hspec, http-client, http-conduit, http-types, HUnit
-     , lifted-base, monad-control, monad-logger, old-locale, QuickCheck
-     , resourcet, text, time, transformers, transformers-base
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "fb";
-       version = "1.1.1";
-       sha256 = "0rbzcnd0cw06vfyy3k5f1n0f8hr00ygn5pjdws7ayn2f2hsk9ln8";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         bytestring cereal conduit conduit-extra crypto-api cryptohash
-         cryptohash-cryptoapi data-default http-client http-conduit
-         http-types lifted-base monad-control monad-logger old-locale
-         resourcet text time transformers transformers-base
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conduit containers data-default hspec
-         http-conduit HUnit lifted-base monad-control QuickCheck resourcet
-         text time transformers
-       ];
-       homepage = "https://github.com/psibi/fb";
-       description = "Bindings to Facebook's API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fb_1_2_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bytestring, cereal, conduit, conduit-extra
      , containers, crypto-api, cryptohash, cryptohash-cryptoapi
@@ -72559,7 +71646,6 @@ self: {
        homepage = "https://github.com/psibi/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb-persistent" = callPackage
@@ -72820,22 +71906,6 @@ self: {
      }) {};
 
   "fedora-haskell-tools" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, time, unix }:
-     mkDerivation {
-       pname = "fedora-haskell-tools";
-       version = "0.4";
-       sha256 = "0105i1klks1f0gcq9fyv1pbfrm3mfiwp14pdac0xb8hm1fbhbs70";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base directory filepath process time unix
-       ];
-       homepage = "https://github.com/fedora-haskell/fedora-haskell-tools";
-       description = "Building and managing tools for Fedora Haskell";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "fedora-haskell-tools_0_5_1" = callPackage
     ({ mkDerivation, base, directory, filepath, process, time, unix }:
      mkDerivation {
        pname = "fedora-haskell-tools";
@@ -72849,7 +71919,6 @@ self: {
        homepage = "https://github.com/fedora-haskell/fedora-haskell-tools";
        description = "Building and managing tools for Fedora Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fedora-packages" = callPackage
@@ -73364,23 +72433,6 @@ self: {
      }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, hspec
-     , microbench, QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "fgl";
-       version = "5.5.4.0";
-       sha256 = "04bjm44qr63cl0g5lh07hbq78x5sbvdjf6ryymysi658q0fqjxji";
-       libraryHaskellDepends = [
-         array base containers deepseq transformers
-       ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
-       benchmarkHaskellDepends = [ base deepseq microbench ];
-       description = "Martin Erwig's Functional Graph Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fgl_5_6_0_0" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, hspec
      , microbench, QuickCheck, transformers
      }:
@@ -73395,7 +72447,6 @@ self: {
        benchmarkHaskellDepends = [ base deepseq microbench ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-arbitrary" = callPackage
@@ -73677,27 +72728,6 @@ self: {
      }) {};
 
   "filecache" = callPackage
-    ({ mkDerivation, base, directory, exceptions, hashable, hinotify
-     , lens, mtl, stm, strict-base-types, temporary
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "filecache";
-       version = "0.2.9";
-       sha256 = "10fxjphldf2mi25pmx5l9j1073zb5lrhana2ysvkiazfmmjcvrh2";
-       libraryHaskellDepends = [
-         base exceptions hashable hinotify lens mtl stm strict-base-types
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory temporary unordered-containers
-       ];
-       homepage = "http://lpuppet.banquise.net/";
-       description = "A Linux-only cache system associating values to files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "filecache_0_3_1" = callPackage
     ({ mkDerivation, base, containers, directory, exceptions, filepath
      , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time
      }:
@@ -73715,7 +72745,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "A cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filediff" = callPackage
@@ -74485,20 +73514,6 @@ self: {
      }) {};
 
   "fixed-vector" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
-     mkDerivation {
-       pname = "fixed-vector";
-       version = "1.0.0.0";
-       sha256 = "1y2250frzbx750jpp9qslmhfjdx9bn8aariwng3py3kz392p7x3g";
-       revision = "1";
-       editedCabalFile = "02ig2q9jn2lnf9w2cap5fjjslix928zg5dc40pab8pjb7qzlb6wy";
-       libraryHaskellDepends = [ base deepseq primitive ];
-       testHaskellDepends = [ base doctest filemanip primitive ];
-       description = "Generic vectors with statically known size";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fixed-vector_1_1_0_0" = callPackage
     ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
      mkDerivation {
        pname = "fixed-vector";
@@ -74508,7 +73523,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip primitive ];
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-binary" = callPackage
@@ -75764,27 +74778,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fold-debounce-conduit" = callPackage
-    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
-     , stm, transformers, transformers-base
+  "fold-debounce_0_2_0_7" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
      }:
      mkDerivation {
-       pname = "fold-debounce-conduit";
-       version = "0.1.0.5";
-       sha256 = "1k441whksiwss55j7q7iwhr90hdj02dy7jg2rhd2ijz1ysy76gi5";
+       pname = "fold-debounce";
+       version = "0.2.0.7";
+       sha256 = "13y6l6ng5rrva0sx9sa4adp6p2yrpyfz91v3jbkamgh4g99w8zpz";
        libraryHaskellDepends = [
-         base conduit fold-debounce resourcet stm transformers
-         transformers-base
+         base data-default-class stm stm-delay time
        ];
-       testHaskellDepends = [
-         base conduit hspec resourcet stm transformers
-       ];
-       homepage = "https://github.com/debug-ito/fold-debounce-conduit";
-       description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
+       testHaskellDepends = [ base hspec stm time ];
+       homepage = "https://github.com/debug-ito/fold-debounce";
+       description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fold-debounce-conduit_0_2_0_0" = callPackage
+  "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
      }:
@@ -75802,7 +74814,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl" = callPackage
@@ -76395,21 +75406,6 @@ self: {
      }) {};
 
   "formatting" = callPackage
-    ({ mkDerivation, base, clock, old-locale, scientific, text
-     , text-format, time
-     }:
-     mkDerivation {
-       pname = "formatting";
-       version = "6.2.5";
-       sha256 = "0k4z8b9x91m243kplx9gap1rqyvdszf3241aq7pkqwrybbzgm8yh";
-       libraryHaskellDepends = [
-         base clock old-locale scientific text text-format time
-       ];
-       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "formatting_6_3_0" = callPackage
     ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
      , integer-gmp, old-locale, scientific, text, time, transformers
      }:
@@ -76424,6 +75420,23 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "formatting_6_3_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+     , integer-gmp, old-locale, scientific, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "formatting";
+       version = "6.3.1";
+       sha256 = "0yfl3xb0dyig8imzxxaq2lh6gy3rn07c6zxncvmzjzlpzy6kqc2n";
+       libraryHaskellDepends = [
+         array base bytestring clock ghc-prim integer-gmp old-locale
+         scientific text time transformers
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -76666,22 +75679,6 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, basement, gauge, ghc-prim }:
-     mkDerivation {
-       pname = "foundation";
-       version = "0.0.17";
-       sha256 = "00f2p47h715fjb3rpsxlf4jskgwk9sz5p692r09gspspqmrs5l84";
-       revision = "1";
-       editedCabalFile = "15y38y0mj4vc694jwh3cjgnq8xv5vv7954g633f7mw5f0hb3yxkn";
-       libraryHaskellDepends = [ base basement ghc-prim ];
-       testHaskellDepends = [ base basement ];
-       benchmarkHaskellDepends = [ base basement gauge ];
-       homepage = "https://github.com/haskell-foundation/foundation";
-       description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foundation_0_0_20" = callPackage
     ({ mkDerivation, base, basement, gauge, ghc-prim }:
      mkDerivation {
        pname = "foundation";
@@ -76693,7 +75690,6 @@ self: {
        homepage = "https://github.com/haskell-foundation/foundation";
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foundation-edge" = callPackage
@@ -76994,28 +75990,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, containers
-     , distributive, exceptions, mtl, prelude-extras, profunctors
-     , semigroupoids, semigroups, template-haskell, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "4.12.4";
-       sha256 = "1147s393442xf4gkpbq0rd1p286vmykgx85mxhk5d1c7wfm4bzn9";
-       revision = "1";
-       editedCabalFile = "17ymahpfjf3ychrl9f6vhqy5637sc9k019v8b7wp0ydg6b61znmg";
-       libraryHaskellDepends = [
-         base bifunctors comonad containers distributive exceptions mtl
-         prelude-extras profunctors semigroupoids semigroups
-         template-haskell transformers transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/free/";
-       description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "free_5_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, containers
      , distributive, exceptions, mtl, profunctors, semigroupoids
      , semigroups, template-haskell, transformers, transformers-base
@@ -77035,7 +76009,6 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-concurrent" = callPackage
@@ -77388,32 +76361,6 @@ self: {
      }) {};
 
   "freer-simple" = callPackage
-    ({ mkDerivation, base, criterion, extensible-effects, free, mtl
-     , natural-transformation, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, transformers-base
-     }:
-     mkDerivation {
-       pname = "freer-simple";
-       version = "1.0.1.1";
-       sha256 = "1fdxj1iyh8jl2nghrm51r7gvlk1qwzrjjhj13f0akwrm2s0la1jb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base natural-transformation transformers-base
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion extensible-effects free mtl
-       ];
-       homepage = "https://github.com/lexi-lambda/freer-simple#readme";
-       description = "Implementation of a friendly effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "freer-simple_1_1_0_0" = callPackage
     ({ mkDerivation, base, criterion, extensible-effects, free, mtl
      , natural-transformation, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, transformers-base
@@ -77437,7 +76384,6 @@ self: {
        homepage = "https://github.com/lexi-lambda/freer-simple#readme";
        description = "Implementation of a friendly effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesect" = callPackage
@@ -78244,22 +77190,6 @@ self: {
      }) {};
 
   "funcmp" = callPackage
-    ({ mkDerivation, base, filepath, process }:
-     mkDerivation {
-       pname = "funcmp";
-       version = "1.8";
-       sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k";
-       revision = "1";
-       editedCabalFile = "1fkjmx4mmfmf2y08w7mgw1rp6q6w9zxdj95zfydgxgkmvk9b37c4";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base filepath process ];
-       homepage = "https://github.com/peti/funcmp";
-       description = "Functional MetaPost";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "funcmp_1_9" = callPackage
     ({ mkDerivation, base, filepath, pretty, process }:
      mkDerivation {
        pname = "funcmp";
@@ -78270,7 +77200,6 @@ self: {
        homepage = "https://github.com/peti/funcmp";
        description = "Functional MetaPost is a Haskell frontend to the MetaPost language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -78977,28 +77906,6 @@ self: {
      }) {};
 
   "gauge" = callPackage
-    ({ mkDerivation, base, basement, bytestring, code-page, containers
-     , deepseq, directory, HUnit, math-functions, mwc-random, tasty
-     , tasty-hunit, vector
-     }:
-     mkDerivation {
-       pname = "gauge";
-       version = "0.1.3";
-       sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0";
-       libraryHaskellDepends = [
-         base basement code-page containers deepseq math-functions
-         mwc-random vector
-       ];
-       testHaskellDepends = [
-         base bytestring deepseq directory HUnit tasty tasty-hunit
-       ];
-       benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/vincenthz/hs-gauge";
-       description = "small framework for performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gauge_0_2_1" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, directory
      , HUnit, process, tasty, tasty-hunit, vector
      }:
@@ -79016,7 +77923,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-gauge";
        description = "small framework for performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gbu" = callPackage
@@ -79564,23 +78470,6 @@ self: {
      }) {};
 
   "general-games" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom
-     , random, random-shuffle
-     }:
-     mkDerivation {
-       pname = "general-games";
-       version = "1.0.5";
-       sha256 = "0lra0dn1nnvkbbc5x3sxn10z7vziwzvlvg153l3xi6daqhch6za2";
-       libraryHaskellDepends = [
-         base monad-loops MonadRandom random random-shuffle
-       ];
-       testHaskellDepends = [ base hspec HUnit MonadRandom ];
-       homepage = "https://github.com/cgorski/general-games";
-       description = "Library supporting simulation of a number of games";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "general-games_1_1_1" = callPackage
     ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom
      , random, random-shuffle
      }:
@@ -79595,7 +78484,6 @@ self: {
        homepage = "https://github.com/cgorski/general-games";
        description = "Library supporting simulation of a number of games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "general-prelude" = callPackage
@@ -79861,21 +78749,6 @@ self: {
      }) {};
 
   "generic-random" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       pname = "generic-random";
-       version = "1.0.0.0";
-       sha256 = "16wlfmfms5544aag1bkzaq9wwsd5zkq7mhwlz9fvsngmkbfa07g7";
-       revision = "3";
-       editedCabalFile = "12l53dxv400g9fvz07jv42gn7x6825kxsyvpnhd3snsklvjrhl70";
-       libraryHaskellDepends = [ base QuickCheck ];
-       testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://github.com/lysxia/generic-random";
-       description = "Generic random generators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generic-random_1_1_0_2" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "generic-random";
@@ -79886,7 +78759,6 @@ self: {
        homepage = "http://github.com/lysxia/generic-random";
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-records" = callPackage
@@ -80001,6 +78873,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-eot_0_2_1_2" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec
+     , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck
+     , shake
+     }:
+     mkDerivation {
+       pname = "generics-eot";
+       version = "0.2.1.2";
+       sha256 = "07vaywcqrp9jcsbcgj63i5mcs3zbf69zprkkmh9in3rnkvq9cfjf";
+       libraryHaskellDepends = [ base markdown-unlit ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec interpolate markdown-unlit
+         mockery QuickCheck shake
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/soenkehahn/generics-eot#readme";
+       description = "A library for generic programming that aims to be easy to understand";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
@@ -80957,6 +79850,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gh-labeler" = callPackage
+    ({ mkDerivation, base, directory, github, memory, text, vector }:
+     mkDerivation {
+       pname = "gh-labeler";
+       version = "0.1.0";
+       sha256 = "05g3lk1ff87qmjlywi6p90mjyycx418idddavpi8i045gr51am4l";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory github memory text vector
+       ];
+       homepage = "https://github.com/vincenthz/gh-labeler#readme";
+       description = "Github Standard Labeler";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gh-pocket-knife" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
      , QuickCheck, resourcet
@@ -81027,6 +79936,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-call-stack-extras" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ghc-call-stack-extras";
+       version = "0.1.0.2";
+       sha256 = "01gvyl2r7jqxca33gdavv6l2a6yz4xh2ndmb4v0y2mdgc9sskymc";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/treeowl/ghc-call-stack-extras";
+       description = "Extra utilities for HasCallStack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-compact_0_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim }:
      mkDerivation {
@@ -81252,29 +80173,6 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, bytestring, containers, Diff, directory
-     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
-     , silently, syb
-     }:
-     mkDerivation {
-       pname = "ghc-exactprint";
-       version = "0.5.6.0";
-       sha256 = "0fbq7p2kykqq2pzf0mld0brj3pdrgxb1zvpa05pqxsfs66czlbsg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath free ghc ghc-boot
-         ghc-paths mtl syb
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory filemanip filepath ghc
-         ghc-boot ghc-paths HUnit mtl silently syb
-       ];
-       description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-exactprint_0_5_6_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
@@ -81295,7 +80193,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -82403,27 +81300,6 @@ self: {
      }) {};
 
   "gi-atk" = callPackage
-    ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-atk";
-       version = "2.0.14";
-       sha256 = "0fp5shf2hilziw4rlzbc2hzf43b2gi1cwm3vlr2ggdkw29ic0c7m";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ atk ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) atk;};
-
-  "gi-atk_2_0_15" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers
@@ -82442,35 +81318,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-cairo";
-       version = "1.0.14";
-       sha256 = "0414qhjgh94pvkxrrcnkxg8hac35ykrqnhr5nrn63l66wigp1fxb";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo ];
-       doHaddock = false;
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo;};
-
-  "gi-cairo_1_0_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -82493,7 +81343,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
   "gi-gdk" = callPackage
@@ -82631,27 +81480,6 @@ self: {
      }) {inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "gi-glib" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-glib";
-       version = "2.0.15";
-       sha256 = "1gfkqvw2m5i5cg9c3y33l1wqxcr8s80w0sx8kdnnfial0c4ba6cz";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-glib_2_0_16" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -82670,31 +81498,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.15";
-       sha256 = "0h98lld62dhdbw7s0c833jw15wxajy6nmvr69604px3saf4mjrrl";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gobject_2_0_16" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -82713,7 +81519,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-gst" = callPackage
@@ -82940,28 +81745,6 @@ self: {
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "gi-javascriptcore" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, text, transformers
-     , webkitgtk
-     }:
-     mkDerivation {
-       pname = "gi-javascriptcore";
-       version = "4.0.14";
-       sha256 = "00mlnzdi6syay6dl20xz3s32bxsl32gwjhv3y1lbfzmzj7i7f914";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ webkitgtk ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "JavaScriptCore bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
-
-  "gi-javascriptcore_4_0_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
      , webkitgtk
@@ -83925,40 +82708,6 @@ self: {
      }) {};
 
   "github" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, base-compat
-     , base16-bytestring, binary, binary-orphans, byteable, bytestring
-     , containers, cryptohash, deepseq, deepseq-generics, exceptions
-     , file-embed, hashable, hspec, hspec-discover, http-client
-     , http-client-tls, http-link-header, http-types, iso8601-time, mtl
-     , network-uri, semigroups, text, time, tls, transformers
-     , transformers-compat, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "github";
-       version = "0.18";
-       sha256 = "0i4cs6d95ik5c8zs2508nmhjh2v30a0qjyxfqyxhjsz48p9h5p1i";
-       revision = "2";
-       editedCabalFile = "1rywfb78acwh81mdnxb4q35n374k1wbxg0562biis0i0jjxfp211";
-       libraryHaskellDepends = [
-         aeson aeson-compat base base-compat base16-bytestring binary
-         binary-orphans byteable bytestring containers cryptohash deepseq
-         deepseq-generics exceptions hashable http-client http-client-tls
-         http-link-header http-types iso8601-time mtl network-uri semigroups
-         text time tls transformers transformers-compat unordered-containers
-         vector vector-instances
-       ];
-       testHaskellDepends = [
-         aeson-compat base base-compat bytestring file-embed hspec
-         unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/phadej/github";
-       description = "Access to the GitHub API, v3";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "github_0_19" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
@@ -83972,6 +82721,8 @@ self: {
        pname = "github";
        version = "0.19";
        sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph";
+       revision = "1";
+       editedCabalFile = "0f6frc80nkwxjp8p0mr6x6x0jd9vvwi0aw0a8yfsk7lxvd4lr6cs";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -83988,7 +82739,6 @@ self: {
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-backup" = callPackage
@@ -84061,27 +82811,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.1.4";
-       sha256 = "0jnxlvs69jc5d60s266f5clsfx1jr517b7yzl08hnka5km8qqdkb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_1_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -84100,7 +82829,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -85777,29 +84505,6 @@ self: {
      }) {};
 
   "goggles" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , bytestring, containers, cryptonite, exceptions, filepath, hspec
-     , http-client, http-client-tls, http-types, memory, mtl, pem
-     , QuickCheck, req, scientific, stm, text, time, transformers
-     , unix-time, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "goggles";
-       version = "0.1.0.3";
-       sha256 = "0if045sxm1xss91hx2hi4hcjy2b4w7q0sas8h9ra75vmzxfn6hjz";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring binary bytestring
-         containers cryptonite exceptions filepath hspec http-client
-         http-client-tls http-types memory mtl pem QuickCheck req scientific
-         stm text time transformers unix-time x509 x509-store
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ocramz/goggles";
-       description = "Interface to Google Cloud APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "goggles_0_3_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
      , bytestring, containers, cryptonite, exceptions, filepath, hspec
      , http-client, http-client-tls, http-types, memory, mtl, pem
@@ -85820,7 +84525,6 @@ self: {
        homepage = "https://github.com/ocramz/goggles";
        description = "Extensible interface to Web APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goggles-gcs" = callPackage
@@ -85829,8 +84533,8 @@ self: {
      }:
      mkDerivation {
        pname = "goggles-gcs";
-       version = "0.1.0.0";
-       sha256 = "0g23z852g7f1h8s49q4nj0y2lnm4fa0ycs4d633937i3f18bsl74";
+       version = "0.1.2";
+       sha256 = "0p1z03y6sy8daqvyfs4mj767yh98zbl23lri72jpy0z213qsjybf";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite exceptions goggles memory mtl req
          text unix-time
@@ -90351,58 +89055,6 @@ self: {
      }) {};
 
   "hOpenPGP" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, bifunctors, binary, binary-conduit, byteable
-     , bytestring, bzlib, conduit, conduit-extra, containers, criterion
-     , crypto-cipher-types, cryptonite, data-default-class, errors
-     , hashable, incremental-parser, ixset-typed, lens, memory
-     , monad-loops, nettle, network, network-uri, newtype
-     , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet
-     , securemem, semigroups, split, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, time-locale-compat, transformers
-     , unordered-containers, wl-pprint-extras, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.5.5";
-       sha256 = "0m5df5w261nm6v246g6r306a5higmyzpgsskf8cp4m88cnlyy08q";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         bifunctors binary binary-conduit byteable bytestring bzlib conduit
-         conduit-extra containers crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network network-uri newtype
-         openpgp-asciiarmor resourcet securemem semigroups split text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras zlib
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base16-bytestring bifunctors binary
-         binary-conduit byteable bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype QuickCheck quickcheck-instances
-         resourcet securemem semigroups split tasty tasty-hunit
-         tasty-quickcheck text time time-locale-compat transformers
-         unordered-containers wl-pprint-extras zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bifunctors binary
-         binary-conduit byteable bytestring bzlib conduit conduit-extra
-         containers criterion crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network network-uri newtype
-         openpgp-asciiarmor resourcet securemem semigroups split text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras zlib
-       ];
-       homepage = "http://floss.scru.org/hOpenPGP/";
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hOpenPGP_2_6" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
@@ -91526,31 +90178,6 @@ self: {
      }) {};
 
   "hackernews" = callPackage
-    ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
-     , http-types, QuickCheck, quickcheck-instances, servant
-     , servant-client, string-conversions, text
-     }:
-     mkDerivation {
-       pname = "hackernews";
-       version = "1.3.0.0";
-       sha256 = "184hf3lwp275dyq5n2szr1mwp5zpa22x48wqddy9c3clxc7lv535";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base http-client http-types QuickCheck quickcheck-instances
-         servant servant-client string-conversions text
-       ];
-       executableHaskellDepends = [ base http-client http-client-tls ];
-       testHaskellDepends = [
-         aeson base hspec http-client http-client-tls QuickCheck
-         quickcheck-instances
-       ];
-       description = "API for Hacker News";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hackernews_1_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
      , http-types, QuickCheck, quickcheck-instances, servant
      , servant-client, string-conversions, text
@@ -91625,8 +90252,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.5.4";
-       sha256 = "1gbn6bnlhaafycyfsfh5j4rbkd56nc65qny34ii9clr34d2cwkaq";
+       version = "0.5.5";
+       sha256 = "0chvf2wvpvbnzf8980sdg9s61c4p100ps7ava85hlr281sng5d60";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91638,9 +90265,9 @@ self: {
          transformers unix xml zlib
        ];
        testHaskellDepends = [
-         base binary bytestring containers deepseq directory
-         extensible-exceptions filepath HUnit pretty process split time unix
-         xml
+         array base binary bytestring containers deepseq directory
+         extensible-exceptions filepath HUnit parsec pretty process split
+         time unix xml
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
@@ -91861,23 +90488,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haddock-library" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.4.3";
-       sha256 = "0ns4bpf6whmcfl0cm2gx2c73if416x4q3ac4l4qm8w84h0zpcr7p";
-       libraryHaskellDepends = [ base bytestring deepseq transformers ];
-       testHaskellDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck transformers
-       ];
-       homepage = "http://www.haskell.org/haddock/";
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "haddock-library_1_4_4" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
      , hspec-discover, QuickCheck, transformers
@@ -91891,12 +90501,32 @@ self: {
          base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
        testToolDepends = [ hspec-discover ];
+       doHaddock = false;
        homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haddock-library" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
+     , hspec-discover, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "haddock-library";
+       version = "1.4.5";
+       sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9";
+       libraryHaskellDepends = [ base bytestring deepseq transformers ];
+       testHaskellDepends = [
+         base base-compat bytestring deepseq hspec QuickCheck transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       doHaddock = false;
+       homepage = "http://www.haskell.org/haddock/";
+       description = "Library exposing some functionality of Haddock";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haddock-library_1_5_0_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
@@ -91914,6 +90544,7 @@ self: {
          hspec optparse-applicative QuickCheck transformers tree-diff
        ];
        testToolDepends = [ hspec-discover ];
+       doHaddock = false;
        homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
@@ -92416,50 +91047,6 @@ self: {
      }) {};
 
   "hakyll" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptohash, data-default, deepseq, directory
-     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
-     , network, network-uri, optparse-applicative, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
-     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
-     , time-locale-compat, unordered-containers, utillinux, vector, wai
-     , wai-app-static, warp, yaml
-     }:
-     mkDerivation {
-       pname = "hakyll";
-       version = "4.10.0.0";
-       sha256 = "0zz5g8ildihng1cw12hxfv3ihd604id20llnpaasrg25b96bidw2";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
-         text time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process
-         QuickCheck random regex-base regex-tdfa resourcet scientific
-         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
-         time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       testToolDepends = [ utillinux ];
-       homepage = "http://jaspervdj.be/hakyll";
-       description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) utillinux;};
-
-  "hakyll_4_11_0_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , containers, cryptohash, data-default, deepseq, directory
      , file-embed, filepath, fsnotify, http-conduit, http-types
@@ -92472,8 +91059,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.11.0.0";
-       sha256 = "08930cs783krsjqzlswz4fplppdlmw5b29nry5i7kan7d4f4lfb8";
+       version = "4.12.0.1";
+       sha256 = "07alx008dg4q2ygwqf854r1nyizac0i3frkk23lzsfpzrbi784r0";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -92501,7 +91088,6 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -95657,34 +94243,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobjectIntrospection
-     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
-     , text, transformers, xdg-basedir, xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.20.3";
-       sha256 = "0429dz3dn9l9nbrx8cd18j3f34cp6cc8zxb34jsvfpvdmafjin8q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring Cabal containers directory filepath
-         haskell-gi-base mtl pretty-show process regex-tdfa safe text
-         transformers xdg-basedir xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; 
-         inherit (pkgs.gnome3) gobjectIntrospection;};
-
-  "haskell-gi_0_21_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobjectIntrospection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -95709,24 +94267,10 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; 
          inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.20.8";
-       sha256 = "1qfkzsr5z8c71hps66zj90j70s258d85r0zpw5s87vcj1cbjza4i";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_21_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -95737,10 +94281,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-overloading_0_0" = callPackage
+  "haskell-gi-overloading" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "haskell-gi-overloading";
@@ -95750,10 +94293,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-gi-overloading" = callPackage
+  "haskell-gi-overloading_1_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "haskell-gi-overloading";
@@ -95763,6 +94305,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-go-checkers" = callPackage
@@ -96031,30 +94574,6 @@ self: {
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
-     , pretty-show, tasty, tasty-golden, transformers
-     , traverse-with-class, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-names";
-       version = "0.9.0";
-       sha256 = "117nywdif86x11kmv5ibfqxn3bjaxb2flygvhp7d62kglqz2l85x";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-lens-light filepath
-         haskell-src-exts mtl transformers traverse-with-class uniplate
-       ];
-       testHaskellDepends = [
-         base containers filemanip filepath haskell-src-exts mtl pretty-show
-         tasty tasty-golden traverse-with-class
-       ];
-       homepage = "http://documentup.com/haskell-suite/haskell-names";
-       description = "Name resolution library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-names_0_9_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
      , pretty-show, tasty, tasty-golden, transformers
@@ -96076,7 +94595,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -96337,13 +94855,28 @@ self: {
        pname = "haskell-src";
        version = "1.0.2.0";
        sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
+       revision = "1";
+       editedCabalFile = "13lipvh20r35vcgschkvxl8csfi6bn7nqk6avzp7jwrhmpgi9wi0";
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-src-exts" = callPackage
+  "haskell-src_1_0_3_0" = callPackage
+    ({ mkDerivation, array, base, happy, pretty, syb }:
+     mkDerivation {
+       pname = "haskell-src";
+       version = "1.0.3.0";
+       sha256 = "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l";
+       libraryHaskellDepends = [ array base pretty syb ];
+       libraryToolDepends = [ happy ];
+       description = "Support for manipulating Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-src-exts_1_19_1" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
@@ -96362,9 +94895,10 @@ self: {
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-src-exts_1_20_2" = callPackage
+  "haskell-src-exts" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
@@ -96383,7 +94917,6 @@ self: {
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-observe" = callPackage
@@ -96448,18 +94981,6 @@ self: {
      }) {};
 
   "haskell-src-exts-simple" = callPackage
-    ({ mkDerivation, base, haskell-src-exts }:
-     mkDerivation {
-       pname = "haskell-src-exts-simple";
-       version = "1.19.0.0";
-       sha256 = "01i4kaw9sbcygsj7s17xxw7cf8p11kq2msq9af5v32yhwxk93g21";
-       libraryHaskellDepends = [ base haskell-src-exts ];
-       homepage = "https://github.com/int-e/haskell-src-exts-simple";
-       description = "A simplified view on the haskell-src-exts AST";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-src-exts-simple_1_20_0_0" = callPackage
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "haskell-src-exts-simple";
@@ -96469,7 +94990,6 @@ self: {
        homepage = "https://github.com/int-e/haskell-src-exts-simple";
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -96565,22 +95085,6 @@ self: {
      }) {};
 
   "haskell-tools-ast" = callPackage
-    ({ mkDerivation, base, ghc, mtl, references, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-ast";
-       version = "1.0.0.4";
-       sha256 = "000dazz2qmc46pyfxskimz02xllf7fs6nl18ki6pvvahp0ammgd9";
-       libraryHaskellDepends = [
-         base ghc mtl references template-haskell uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-ast_1_0_1_1" = callPackage
     ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references
      , template-haskell, uniplate
      }:
@@ -96595,7 +95099,6 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -96653,24 +95156,6 @@ self: {
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
-     , haskell-tools-ast, mtl, references, safe, split, template-haskell
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-backend-ghc";
-       version = "1.0.0.4";
-       sha256 = "0c909xknb4q28cqm4cckx5girygz1jjg0nwj9v31dj7yhwgm6y2g";
-       libraryHaskellDepends = [
-         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
-         references safe split template-haskell transformers uniplate
-       ];
-       homepage = "https://github.com/nboldi/haskell-tools";
-       description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-backend-ghc_1_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
      , haskell-tools-ast, mtl, references, safe, split, template-haskell
      , transformers, uniplate
@@ -96686,42 +95171,9 @@ self: {
        homepage = "https://github.com/nboldi/haskell-tools";
        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
-    ({ mkDerivation, base, Cabal, containers, directory, either
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-refactor, haskell-tools-rewrite, mtl, old-time
-     , polyparse, references, split, tasty, tasty-hunit
-     , template-haskell, time, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-builtin-refactorings";
-       version = "1.0.0.4";
-       sha256 = "1hxl8j8nkn3f59wxbzfyhjbshjypi4bv7v2vrqlpfygnb1n1jhci";
-       libraryHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite mtl references split template-haskell
-         transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite mtl old-time polyparse references split tasty
-         tasty-hunit template-haskell time transformers uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-builtin-refactorings_1_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, Cabal, classyplate, containers
      , deepseq, directory, either, filepath, ghc, ghc-paths
      , haskell-tools-ast, haskell-tools-backend-ghc
@@ -96755,43 +95207,6 @@ self: {
      }) {};
 
   "haskell-tools-cli" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , directory, filepath, ghc, ghc-paths, Glob
-     , haskell-tools-builtin-refactorings, haskell-tools-daemon
-     , haskell-tools-refactor, knob, mtl, optparse-applicative, process
-     , references, split, strict, tasty, tasty-hunit, time
-     }:
-     mkDerivation {
-       pname = "haskell-tools-cli";
-       version = "1.0.0.4";
-       sha256 = "121q9ydi0jlj9bs6zyy2h6vkmaajwf1pcnnq4s21yw99ah4xhy6q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filepath ghc ghc-paths
-         haskell-tools-builtin-refactorings haskell-tools-daemon
-         haskell-tools-refactor mtl references split strict
-       ];
-       executableHaskellDepends = [
-         base directory filepath Glob haskell-tools-builtin-refactorings
-         haskell-tools-daemon mtl optparse-applicative process split
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath
-         haskell-tools-builtin-refactorings knob tasty tasty-hunit
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring criterion directory filepath
-         haskell-tools-builtin-refactorings haskell-tools-daemon knob split
-         time
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Command-line frontend for Haskell-tools Refact";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-cli_1_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , directory, filepath, ghc, ghc-paths, Glob
      , haskell-tools-builtin-refactorings, haskell-tools-daemon
@@ -96829,41 +95244,6 @@ self: {
      }) {};
 
   "haskell-tools-daemon" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob
-     , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
-     , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative
-     , pretty, process, references, split, strict, tasty, tasty-hunit
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "haskell-tools-daemon";
-       version = "1.0.0.4";
-       sha256 = "1gqx9nn87mq2n722lzl0slpw54dg6asc2s77zjs0sywvcpck4b4v";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers deepseq Diff directory
-         filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings
-         haskell-tools-prettyprint haskell-tools-refactor mtl network
-         optparse-applicative pretty process references split strict
-         template-haskell
-       ];
-       executableHaskellDepends = [
-         base directory filepath haskell-tools-builtin-refactorings
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath ghc Glob
-         haskell-tools-builtin-refactorings HUnit network process tasty
-         tasty-hunit
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Background process for Haskell-tools that editors can connect to";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-daemon_1_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob
      , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
@@ -96899,31 +95279,6 @@ self: {
      }) {};
 
   "haskell-tools-debug" = callPackage
-    ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
-     , haskell-tools-prettyprint, haskell-tools-refactor, references
-     , split, template-haskell
-     }:
-     mkDerivation {
-       pname = "haskell-tools-debug";
-       version = "1.0.0.4";
-       sha256 = "0lh48bfjicpjsk2vazl91n6xw0ahff89rw9iiizpla92rz1fcb20";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base filepath ghc ghc-paths haskell-tools-ast
-         haskell-tools-backend-ghc haskell-tools-builtin-refactorings
-         haskell-tools-prettyprint haskell-tools-refactor references split
-         template-haskell
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Debugging Tools for Haskell-tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-debug_1_0_1_1" = callPackage
     ({ mkDerivation, base, classyplate, criterion, filepath, ghc
      , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
      , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
@@ -96950,38 +95305,6 @@ self: {
      }) {};
 
   "haskell-tools-demo" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
-     , haskell-tools-prettyprint, haskell-tools-refactor, http-types
-     , HUnit, mtl, network, references, tasty, tasty-hunit, transformers
-     , wai, wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "haskell-tools-demo";
-       version = "1.0.0.4";
-       sha256 = "0vqjs4wrgjacj3i6hykfvafhnyik6nn9p8miyb1plmhm9w6g0ynq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-builtin-refactorings haskell-tools-prettyprint
-         haskell-tools-refactor http-types mtl references transformers wai
-         wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network tasty
-         tasty-hunit websockets
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-demo_1_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
@@ -97045,23 +95368,6 @@ self: {
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
-    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
-     , references, split, text, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-prettyprint";
-       version = "1.0.0.4";
-       sha256 = "001mk8fdxl06il8s3w1i4901s85kb99nyhp3yk7jg6ghh4iaf1c9";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast mtl references split text
-         uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-prettyprint_1_0_1_1" = callPackage
     ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
      , references, split, text, uniplate
      }:
@@ -97076,25 +95382,33 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
-     , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
-     , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references
-     , split, template-haskell, transformers, uniplate
+    ({ mkDerivation, aeson, base, Cabal, containers, directory, either
+     , filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-rewrite, mtl, old-time, polyparse, references
+     , split, tasty, tasty-hunit, template-haskell, time, transformers
+     , uniplate
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "1.0.0.4";
-       sha256 = "192najfy3r05vhxl21bg6lqy8m5081sdxp5yfvw9nyjlarfcb2b9";
+       version = "1.0.1.1";
+       sha256 = "1s0nd1swxqiip5hq13ys9f6vbj22mw1c5dh5m9360md163hvvlw2";
        libraryHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-paths
+         aeson base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
          haskell-tools-prettyprint haskell-tools-rewrite mtl references
          split template-haskell transformers uniplate
        ];
+       testHaskellDepends = [
+         base Cabal containers directory either filepath ghc ghc-paths
+         haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
+         polyparse references split tasty tasty-hunit template-haskell time
+         transformers uniplate
+       ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -97132,28 +95446,6 @@ self: {
      }) {};
 
   "haskell-tools-rewrite" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc
-     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
-     , tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-rewrite";
-       version = "1.0.0.4";
-       sha256 = "1jjg6w2ajlnjz7hl74znm2gaylmlixvp65m2ns7p4iryycsr5fjg";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
-         references
-       ];
-       testHaskellDepends = [
-         base directory filepath haskell-tools-ast haskell-tools-prettyprint
-         tasty tasty-hunit
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-rewrite_1_0_1_1" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
      , tasty, tasty-hunit
@@ -97173,7 +95465,6 @@ self: {
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -98720,23 +97011,6 @@ self: {
      }) {};
 
   "hasql-optparse-applicative" = callPackage
-    ({ mkDerivation, base-prelude, hasql, hasql-pool
-     , optparse-applicative
-     }:
-     mkDerivation {
-       pname = "hasql-optparse-applicative";
-       version = "0.2.4";
-       sha256 = "0gdbwhzcfjriq2yah5kfn9r1anc77f1iyay86zsdgq4z8qi6asvr";
-       libraryHaskellDepends = [
-         base-prelude hasql hasql-pool optparse-applicative
-       ];
-       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
-       description = "\"optparse-applicative\" parsers for \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-optparse-applicative_0_3" = callPackage
     ({ mkDerivation, base-prelude, hasql, hasql-pool
      , optparse-applicative
      }:
@@ -98853,26 +97127,6 @@ self: {
      }) {};
 
   "hasql-transaction" = callPackage
-    ({ mkDerivation, async, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
-     , hasql, mtl, rebase, transformers
-     }:
-     mkDerivation {
-       pname = "hasql-transaction";
-       version = "0.5.2";
-       sha256 = "0w4y65vqgc4pk66xpip9jzzbas6cpnss4gx1w91rg7j48491cmym";
-       libraryHaskellDepends = [
-         base base-prelude bytestring bytestring-tree-builder contravariant
-         contravariant-extras hasql mtl transformers
-       ];
-       testHaskellDepends = [ async hasql rebase ];
-       homepage = "https://github.com/nikita-volkov/hasql-transaction";
-       description = "A composable abstraction over the retryable transactions for Hasql";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-transaction_0_6" = callPackage
     ({ mkDerivation, async, base, base-prelude, bytestring
      , bytestring-tree-builder, contravariant, contravariant-extras
      , hasql, mtl, rebase, transformers
@@ -99112,8 +97366,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasty-hamiltonian";
-       version = "1.3.0";
-       sha256 = "0cgvxr4zywnvd7q109qlcrcpcfszj4w5viyjz9g7mafdfay17xqm";
+       version = "1.3.2";
+       sha256 = "17nc33q9vkq13wp5dqrq2vq6bz408ll8h84fg7mapks5w5r9sag6";
        libraryHaskellDepends = [
          base kan-extensions lens mcmc-types mwc-probability pipes primitive
          transformers
@@ -100445,8 +98699,8 @@ self: {
        pname = "heaps";
        version = "0.3.6";
        sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q";
-       revision = "1";
-       editedCabalFile = "0k505k86zwfw1wmj5gr2qab7cq9q26f9nbf9jzfgw9qxwb17j284";
+       revision = "2";
+       editedCabalFile = "0iym09z8039b2v0kfzh1b66b7ky7kqjv85mx1h0xhsayxdy135in";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
@@ -100725,30 +98979,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, HUnit, mtl, network, resource-pool, scanner
-     , slave-thread, stm, test-framework, test-framework-hunit, text
-     , time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.9.12";
-       sha256 = "0z9d0d1f394xf1c6fsi4c0ib3pgn0w3d6iw2h34774bxrmglf5aa";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq mtl network
-         resource-pool scanner stm text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring HUnit mtl slave-thread stm test-framework
-         test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl time ];
-       homepage = "https://github.com/informatikr/hedis";
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_10_0" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, slave-thread, stm, test-framework
@@ -100771,7 +99001,6 @@ self: {
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -102602,8 +100831,8 @@ self: {
        pname = "hgmp";
        version = "0.1.1";
        sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
-       revision = "1";
-       editedCabalFile = "14hbr8r0pjgjv2pv9any7yqrvw2qyg7z1fk89d4sh0wd6isvgjqj";
+       revision = "2";
+       editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://code.mathr.co.uk/hgmp";
@@ -102986,29 +101215,6 @@ self: {
      }) {};
 
   "higher-leveldb" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, data-default, exceptions
-     , hspec, leveldb-haskell, lifted-base, monad-control, mtl, process
-     , resourcet, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "higher-leveldb";
-       version = "0.4.0.1";
-       sha256 = "0ia3ssxr414jqvb4gzkaaa4a8d3rd7b395cfh0m2hz2jn6q7z651";
-       libraryHaskellDepends = [
-         base bytestring cereal data-default exceptions leveldb-haskell
-         lifted-base monad-control mtl resourcet transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring cereal hspec leveldb-haskell lifted-base
-         monad-control mtl process resourcet transformers transformers-base
-       ];
-       homepage = "https://github.com/jeremyjh/higher-leveldb";
-       description = "A rich monadic API for working with leveldb databases";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "higher-leveldb_0_5_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, data-default, exceptions
      , hspec, leveldb-haskell, mtl, process, resourcet, transformers
      , transformers-base, unliftio, unliftio-core
@@ -103028,7 +101234,6 @@ self: {
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "higherorder" = callPackage
@@ -105367,36 +103572,6 @@ self: {
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
-     , data-fix, deepseq, deriving-compat, parsers, semigroups, tasty
-     , tasty-hunit, tasty-th, text, transformers, trifecta
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "hnix";
-       version = "0.3.4";
-       sha256 = "1wnvbal093c207vr68i0zyrxvmb3yyxdr8p7lbw2yy4ari2hi2gc";
-       revision = "1";
-       editedCabalFile = "01svkjznkz51742k3hcc0ssz5m0kymk53ydrdwg4a24ygvb408iw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq deriving-compat
-         parsers semigroups text transformers trifecta unordered-containers
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq
-       ];
-       testHaskellDepends = [
-         base containers data-fix tasty tasty-hunit tasty-th text
-       ];
-       benchmarkHaskellDepends = [ base containers criterion text ];
-       homepage = "http://github.com/jwiegley/hnix";
-       description = "Haskell implementation of the Nix language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hnix_0_4_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
      , data-fix, deepseq, deriving-compat, parsers, regex-tdfa
      , regex-tdfa-text, semigroups, tasty, tasty-hunit, tasty-th, text
@@ -105423,7 +103598,6 @@ self: {
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -105537,26 +103711,6 @@ self: {
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
-     , http-types, microlens, text, unordered-containers, uri-bytestring
-     , uri-bytestring-aeson
-     }:
-     mkDerivation {
-       pname = "hoauth2";
-       version = "1.5.1";
-       sha256 = "1lb76084ha2wkhccgcwvn5ffdsrxsqbvhmlhx9aw9dm39ganggva";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-conduit http-types microlens
-         text unordered-containers uri-bytestring uri-bytestring-aeson
-       ];
-       homepage = "https://github.com/freizl/hoauth2";
-       description = "Haskell OAuth2 authentication client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hoauth2_1_7_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
      , http-types, microlens, text, unordered-containers, uri-bytestring
      , uri-bytestring-aeson
@@ -105574,7 +103728,6 @@ self: {
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hob" = callPackage
@@ -106475,6 +104628,8 @@ self: {
        pname = "hoopl";
        version = "3.10.2.2";
        sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9";
+       revision = "1";
+       editedCabalFile = "0w34az1mldbvzdywszc4japdksdbdsrb1nw44vjqv3nmz65fn14x";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers filepath mtl parsec test-framework
@@ -106551,40 +104706,6 @@ self: {
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
-    ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
-     , base, base16-bytestring, binary, binary-conduit, bytestring
-     , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
-     , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
-     , http-client-tls, http-types, ixset-typed, lens, monad-loops
-     , openpgp-asciiarmor, optparse-applicative, resourcet, text, time
-     , time-locale-compat, transformers, unordered-containers
-     , wl-pprint-extras, wl-pprint-terminfo, yaml
-     }:
-     mkDerivation {
-       pname = "hopenpgp-tools";
-       version = "0.19.5";
-       sha256 = "1yb6slxphz7lghclv1cjs2kwig1ll1dxzcaf4js26nanq280lqz0";
-       revision = "2";
-       editedCabalFile = "1w9ban4w6zm7cknfnlzhgx649xg2j0vsrhqdlnd5g8qzcbbhh0si";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
-         binary-conduit bytestring conduit conduit-extra containers
-         crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
-         http-client http-client-tls http-types ixset-typed lens monad-loops
-         openpgp-asciiarmor optparse-applicative resourcet text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras wl-pprint-terminfo yaml
-       ];
-       executableToolDepends = [ alex happy ];
-       homepage = "http://floss.scru.org/hopenpgp-tools";
-       description = "hOpenPGP-based command-line tools";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hopenpgp-tools_0_20_1" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
@@ -107190,39 +105311,6 @@ self: {
      }) {};
 
   "hpack" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
-     , HUnit, interpolate, mockery, pretty, QuickCheck, scientific
-     , temporary, text, transformers, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.21.2";
-       sha256 = "1grsr2418z42bcvqnr788n3lpfbscqvvfcnglba9v95nl8lpfm0c";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob pretty scientific text transformers
-         unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob pretty scientific text transformers
-         unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob hspec HUnit interpolate mockery
-         pretty QuickCheck scientific temporary text transformers
-         unordered-containers yaml
-       ];
-       homepage = "https://github.com/sol/hpack#readme";
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hpack_0_27_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, interpolate
@@ -107257,6 +105345,43 @@ self: {
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hpack_0_28_1" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
+     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
+     , http-client, http-client-tls, http-types, HUnit, interpolate
+     , mockery, pretty, QuickCheck, scientific, template-haskell
+     , temporary, text, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.28.1";
+       sha256 = "0nigj421i8yw1k1aaly9qzwkahjx92w4arpj2a5mwg89v0xfw7pr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types pretty scientific text transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob http-client http-client-tls
+         http-types pretty scientific text transformers unordered-containers
+         vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bifunctors bytestring Cabal containers cryptonite
+         deepseq directory filepath Glob hspec http-client http-client-tls
+         http-types HUnit interpolate mockery pretty QuickCheck scientific
+         template-haskell temporary text transformers unordered-containers
+         vector yaml
+       ];
+       homepage = "https://github.com/sol/hpack#readme";
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -109487,22 +107612,6 @@ self: {
      }) {};
 
   "hscolour" = callPackage
-    ({ mkDerivation, base, containers }:
-     mkDerivation {
-       pname = "hscolour";
-       version = "1.24.2";
-       sha256 = "08ng635m1qylng1khm9nqvfw2wdhljy1q2wi4ly63nfaznx8dysm";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base containers ];
-       executableHaskellDepends = [ base containers ];
-       homepage = "http://code.haskell.org/~malcolm/hscolour/";
-       description = "Colourise Haskell code";
-       license = "LGPL";
-     }) {};
-
-  "hscolour_1_24_4" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hscolour";
@@ -109516,7 +107625,6 @@ self: {
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscope" = callPackage
@@ -110622,8 +108730,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.4";
-       sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh";
+       version = "2.4.8";
+       sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -110638,15 +108746,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_4_8" = callPackage
+  "hspec_2_5_0" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.8";
-       sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l";
+       version = "2.5.0";
+       sha256 = "16vp3k8bdqvsdhv12srahda3anf1pia7blczh201snib52is9vdb";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -110708,36 +108816,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core" = callPackage
-    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
-     , deepseq, directory, filepath, hspec-expectations, hspec-meta
-     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
-     , silently, temporary, tf-random, time, transformers
-     }:
+  "hspec-contrib_0_5_0" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
      mkDerivation {
-       pname = "hspec-core";
-       version = "2.4.4";
-       sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0";
-       revision = "1";
-       editedCabalFile = "0m4bmclgs7as957wdnq1y4zh49hrwpslgz5m9430myl4dc14r81l";
-       libraryHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv tf-random time transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations hspec-meta HUnit process QuickCheck
-         quickcheck-io random setenv silently temporary tf-random time
-         transformers
-       ];
-       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       pname = "hspec-contrib";
+       version = "0.5.0";
+       sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv";
+       libraryHaskellDepends = [ base hspec-core HUnit ];
+       testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
+       description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-core_2_4_8" = callPackage
+  "hspec-core" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
      , directory, filepath, hspec-expectations, hspec-meta, HUnit
      , process, QuickCheck, quickcheck-io, random, setenv, silently, stm
@@ -110762,6 +108855,33 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hspec-core_2_5_0" = 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.5.0";
+       sha256 = "1p88sxarrpfzic4h37n9crpvmklisv514cm0v6fxmk1f2jvf3rgj";
+       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
+       ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110785,22 +108905,6 @@ self: {
      }) {};
 
   "hspec-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.4.4";
-       sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [ base directory filepath hspec-meta ];
-       homepage = "http://hspec.github.io/";
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_4_8" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
@@ -110817,6 +108921,25 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hspec-discover_2_5_0" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.5.0";
+       sha256 = "1r91g9hqdn815i86hsrv5bagv76rhq4n0avkmhkh670kkryc0iry";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110926,28 +109049,6 @@ self: {
      }) {};
 
   "hspec-golden-aeson" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
-     , random, silently, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-golden-aeson";
-       version = "0.4.0.0";
-       sha256 = "03gsw9jamkjwj5vhlhg9xz7214d71py94qx0daym7gjiq4zpw1gk";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring directory filepath hspec
-         QuickCheck quickcheck-arbitrary-adt random transformers
-       ];
-       testHaskellDepends = [
-         aeson base directory hspec hspec-core QuickCheck
-         quickcheck-arbitrary-adt silently transformers
-       ];
-       homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
-       description = "Use tests to monitor changes in Aeson serialization";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-golden-aeson_0_5_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
      , random, silently, transformers
@@ -110967,7 +109068,6 @@ self: {
        homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
        description = "Use tests to monitor changes in Aeson serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-hashable" = callPackage
@@ -111195,23 +109295,6 @@ self: {
      }) {};
 
   "hspec-smallcheck" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
-     mkDerivation {
-       pname = "hspec-smallcheck";
-       version = "0.4.2";
-       sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds";
-       revision = "1";
-       editedCabalFile = "19fp4xandn3jn1hzs1bkjbncyv74908wzcqkvk7xf0dfmm0wpmqw";
-       libraryHaskellDepends = [ base hspec-core smallcheck ];
-       testHaskellDepends = [
-         base hspec hspec-core QuickCheck smallcheck
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "SmallCheck support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-smallcheck_0_5_0" = callPackage
     ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit
      , QuickCheck, smallcheck
      }:
@@ -111228,6 +109311,25 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hspec-smallcheck_0_5_1" = callPackage
+    ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit
+     , QuickCheck, smallcheck
+     }:
+     mkDerivation {
+       pname = "hspec-smallcheck";
+       version = "0.5.1";
+       sha256 = "11202q3ixqmmi3nx79l82jha5kdnpajvv1rd1s6rwh0560i8vj2v";
+       libraryHaskellDepends = [
+         base call-stack hspec-core HUnit smallcheck
+       ];
+       testHaskellDepends = [
+         base call-stack hspec hspec-core HUnit QuickCheck smallcheck
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "SmallCheck support for the Hspec testing framework";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -112403,7 +110505,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "html-conduit" = callPackage
+  "html-conduit_1_2_1_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, hspec, HUnit, resourcet, tagstream-conduit, text
      , transformers, xml-conduit, xml-types
@@ -112422,9 +110524,10 @@ self: {
        homepage = "https://github.com/snoyberg/xml";
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "html-conduit_1_3_0" = callPackage
+  "html-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, hspec
      , HUnit, resourcet, tagstream-conduit, text, transformers
      , xml-conduit, xml-types
@@ -112443,7 +110546,6 @@ self: {
        homepage = "https://github.com/snoyberg/xml";
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-email-validate" = callPackage
@@ -112837,17 +110939,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-api-data_0_3_8" = callPackage
+  "http-api-data_0_3_8_1" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
      , Cabal, cabal-doctest, containers, directory, doctest, filepath
      , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
-     , unordered-containers, uri-bytestring, uuid, uuid-types
+     , unordered-containers, uri-bytestring, uuid-types
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.3.8";
-       sha256 = "0m1q3zl2bjayafr8b9ihizk0mg8awga4l7gg1p1khy3yyzngl5wv";
+       version = "0.3.8.1";
+       sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec attoparsec-iso8601 base bytestring containers hashable
@@ -112856,7 +110958,7 @@ self: {
        ];
        testHaskellDepends = [
          base bytestring directory doctest filepath hspec HUnit QuickCheck
-         quickcheck-instances text time unordered-containers uuid
+         quickcheck-instances text time unordered-containers uuid-types
        ];
        testToolDepends = [ hspec-discover ];
        homepage = "http://github.com/fizruk/http-api-data";
@@ -112907,6 +111009,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client_0_5_11" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, deepseq, directory
+     , exceptions, filepath, ghc-prim, hspec, http-types, memory
+     , mime-types, monad-control, network, network-uri, random, stm
+     , streaming-commons, text, time, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "http-client";
+       version = "0.5.11";
+       sha256 = "0mjm2d77i82jazq0602v34m5xiyxc15680zx6ay9ncspr7rhd6wp";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring case-insensitive containers
+         cookie deepseq exceptions filepath ghc-prim http-types memory
+         mime-types network network-uri random stm streaming-commons text
+         time transformers
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring case-insensitive containers
+         deepseq directory hspec http-types monad-control network
+         network-uri streaming-commons text time transformers zlib
+       ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "An HTTP client engine";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-auth" = callPackage
     ({ mkDerivation, base, base64-string, blaze-builder, bytestring
      , case-insensitive, conduit, crypto-conduit, http-client
@@ -113100,7 +111231,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-conduit" = callPackage
+  "http-conduit_2_2_4" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, exceptions, hspec, http-client
@@ -113128,9 +111259,10 @@ self: {
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-conduit_2_3_0" = callPackage
+  "http-conduit" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, hspec, http-client, http-client-tls
@@ -113157,7 +111289,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -113578,8 +111709,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-reverse-proxy";
-       version = "0.4.5";
-       sha256 = "0v1f1z3gmc51sbxmxhnp4sspzj6mdm0ihl5x30218p1ynz9ssxjn";
+       version = "0.5.0";
+       sha256 = "10j58i0xkbf84ypk5q8pxz2a85kk24s4xqhkprr6j12d4hx1zl6i";
        libraryHaskellDepends = [
          async base blaze-builder bytestring case-insensitive conduit
          conduit-extra containers data-default-class http-client http-types
@@ -113730,27 +111861,6 @@ self: {
      }) {};
 
   "http-types" = callPackage
-    ({ mkDerivation, array, base, blaze-builder, bytestring
-     , case-insensitive, doctest, hspec, QuickCheck
-     , quickcheck-instances, text
-     }:
-     mkDerivation {
-       pname = "http-types";
-       version = "0.9.1";
-       sha256 = "0l7mnvqyppxpnq6ds4a9f395zdbl22z3sxiry1myfs8wvj669vbv";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring case-insensitive text
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring doctest hspec QuickCheck
-         quickcheck-instances text
-       ];
-       homepage = "https://github.com/aristidb/http-types";
-       description = "Generic HTTP types for Haskell (for both client and server code)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-types_0_12_1" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
      , hspec, QuickCheck, quickcheck-instances, text
      }:
@@ -113767,7 +111877,6 @@ self: {
        homepage = "https://github.com/aristidb/http-types";
        description = "Generic HTTP types for Haskell (for both client and server code)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-wget" = callPackage
@@ -114198,18 +112307,6 @@ self: {
      }) {};
 
   "hunit-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
-     mkDerivation {
-       pname = "hunit-dejafu";
-       version = "0.7.1.1";
-       sha256 = "1b9c4v82fzrl88bg13q36smicndi0l7bp73mxniavbnsmccb22yy";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hunit-dejafu_1_1_0_2" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
@@ -114219,7 +112316,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-gui" = callPackage
@@ -114855,8 +112951,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.3.3";
-       sha256 = "14g0mqwj6fr8sdq62sljzih0a9km1hxqm1zqmr9jv58znmj9f2x1";
+       version = "2.4.0";
+       sha256 = "1c7q05wrwwk2mqr09r14q2c38k5fdpn8phhdzxby0nj1q28azmmk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114879,8 +112975,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "2.1.0";
-       sha256 = "1ncxagsmil3cxmsrw2ywzcpfhhlkaz87mfhzkww7j93jcwacbph2";
+       version = "2.4.0";
+       sha256 = "0xzsdslkc069wccqihd50zxvm9jx6p5izwf4v44dizn42lfymm75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116220,8 +114316,8 @@ self: {
        pname = "hyphenation";
        version = "0.7.1";
        sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52";
-       revision = "1";
-       editedCabalFile = "04kn5pdb1f6yz959qjv3bcbqi3zs88fn6rwxv45m95lx6pzywhln";
+       revision = "2";
+       editedCabalFile = "1pbsq3y0f0j6cl17narqrwxwwpxsvwgazfbqa5k08m2n0s885pfk";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -118585,33 +116681,6 @@ self: {
      }) {};
 
   "influxdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , containers, foldl, http-client, http-types, HUnit, lens, mtl
-     , network, optional-args, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text, time, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
-       version = "1.2.2.3";
-       sha256 = "14454644vlkyd27ywhsvkczxdxdwqkl917zcb51ay68gdnrrwm1i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
-         tasty-th text vector
-       ];
-       homepage = "https://github.com/maoe/influxdb-haskell";
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_3_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
@@ -118637,6 +116706,34 @@ self: {
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "influxdb_1_5_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, clock, containers, doctest, foldl, http-client
+     , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
+     , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     , template-haskell, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "influxdb";
+       version = "1.5.0";
+       sha256 = "008ry9znrjjn3yhc5831gc4jgnxnwr1yibzm72lmngqywhv0mi9w";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clock containers foldl http-client
+         http-types lens network optional-args scientific text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base doctest http-client HUnit mtl QuickCheck tasty tasty-hunit
+         tasty-quickcheck tasty-th template-haskell text vector
+       ];
+       homepage = "https://github.com/maoe/influxdb-haskell";
+       description = "Haskell client library for InfluxDB";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -118847,25 +116944,6 @@ self: {
      }) {};
 
   "inline-java" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
-     , hspec, jni, jvm, language-java, mtl, process, template-haskell
-     , temporary, text
-     }:
-     mkDerivation {
-       pname = "inline-java";
-       version = "0.7.2";
-       sha256 = "0hfjgkv8shi3zhjx7jkcwqyglrh5hrc11zf58ykhwxjhzhj4f05b";
-       libraryHaskellDepends = [
-         base bytestring Cabal directory filepath ghc jni jvm language-java
-         mtl process template-haskell temporary text
-       ];
-       testHaskellDepends = [ base hspec jni jvm text ];
-       homepage = "http://github.com/tweag/inline-java#readme";
-       description = "Java interop via inline Java code in Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "inline-java_0_8_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
      , hspec, jni, jvm, language-java, mtl, process, template-haskell
      , temporary, text
@@ -118882,7 +116960,6 @@ self: {
        homepage = "http://github.com/tweag/inline-java#readme";
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-r" = callPackage
@@ -119012,23 +117089,6 @@ self: {
      }) {};
 
   "inspection-testing" = callPackage
-    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "inspection-testing";
-       version = "0.1.2";
-       sha256 = "1si89b5scc7qw88shmyzi1abbvgl7fv16yw731n5niw4cqps329j";
-       libraryHaskellDepends = [
-         base containers ghc mtl template-haskell transformers
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/nomeata/inspection-testing";
-       description = "GHC plugin to do inspection testing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inspection-testing_0_2_0_1" = callPackage
     ({ mkDerivation, base, containers, ghc, mtl, template-haskell
      , transformers
      }:
@@ -119043,7 +117103,6 @@ self: {
        homepage = "https://github.com/nomeata/inspection-testing";
        description = "GHC plugin to do inspection testing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -119447,8 +117506,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.28";
-       sha256 = "0c9hlbqjisb8y96s2rhgklc93g0jmawq3v80ksdvg9asdyfsmafs";
+       version = "0.1.30";
+       sha256 = "0axjmswi9jgyd9kkhyjwbviqbh693vvki4hvwcg7rq6dsgl0lgk8";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -119493,24 +117552,6 @@ self: {
      }) {};
 
   "interpolate" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
-     , QuickCheck, quickcheck-instances, template-haskell, text
-     }:
-     mkDerivation {
-       pname = "interpolate";
-       version = "0.1.1";
-       sha256 = "120ygxs8vfsjcc7xr9v8p8bcyqidhlg1rd568ym2bsl1nhx4h22b";
-       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
-       testHaskellDepends = [
-         base bytestring haskell-src-meta hspec QuickCheck
-         quickcheck-instances template-haskell text
-       ];
-       homepage = "https://github.com/sol/interpolate#readme";
-       description = "String interpolation done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "interpolate_0_2_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta
      , hspec, QuickCheck, quickcheck-instances, template-haskell, text
      }:
@@ -119526,7 +117567,6 @@ self: {
        homepage = "https://github.com/sol/interpolate#readme";
        description = "String interpolation done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolatedstring-perl6" = callPackage
@@ -119648,8 +117688,8 @@ self: {
        pname = "intervals";
        version = "0.8.1";
        sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww";
-       revision = "2";
-       editedCabalFile = "0ia6pig8g2hg1nr0p46s3npv0gvd2cn9mkgm232slwynyb63qjkn";
+       revision = "3";
+       editedCabalFile = "1dzv19jq6xwf9zff6xkzmn9vab2ch2mds75n7hg9n0xg664q1b95";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [
@@ -120030,6 +118070,8 @@ self: {
        pname = "io-streams-haproxy";
        version = "1.0.0.2";
        sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
+       revision = "1";
+       editedCabalFile = "0mm20k4d6xcjjghwkgbfap9n35nixzvk3y0n52f88cq0rfrn1y0r";
        libraryHaskellDepends = [
          attoparsec base bytestring io-streams network transformers
        ];
@@ -120341,6 +118383,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_3" = callPackage
+    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
+     , network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.3";
+       sha256 = "0zhfn0rxwakspx1b9pxcqb9vbi8lr786hhb5s9j15xiszkl8hf4s";
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder containers doctest hspec network QuickCheck
+         safe
+       ];
+       homepage = "http://www.mew.org/~kazu/proj/iproute/";
+       description = "IP Routing Table";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iptables-helpers" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
      , syb, utf8-string
@@ -120438,27 +118501,6 @@ self: {
      }) {};
 
   "irc-client" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, containers
-     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
-     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
-     , text, time, tls, transformers, x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-client";
-       version = "1.0.1.1";
-       sha256 = "1d5xy2q5pkyn4i6d9myw27wr75xci05s446l23kdjli2ldh0g4nx";
-       libraryHaskellDepends = [
-         base bytestring conduit connection containers contravariant
-         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
-         profunctors stm stm-chans text time tls transformers x509
-         x509-store x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-client";
-       description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-client_1_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, containers
      , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
      , network-conduit-tls, old-locale, profunctors, stm, stm-chans
@@ -120477,7 +118519,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -120492,25 +118533,6 @@ self: {
      }) {};
 
   "irc-conduit" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
-     , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
-     , time, tls, transformers, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-conduit";
-       version = "0.2.2.5";
-       sha256 = "1f9dvs4z15wym2a7dpm9h7m3ffpj8d089k6q28my6yx10mi93ksj";
-       libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra connection irc irc-ctcp
-         network-conduit-tls profunctors text time tls transformers
-         x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-conduit";
-       description = "Streaming IRC message library using conduits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-conduit_0_3_0_1" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
      , time, tls, transformers, x509-validation
@@ -120527,7 +118549,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-conduit";
        description = "Streaming IRC message library using conduits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-core" = callPackage
@@ -122301,25 +120322,6 @@ self: {
      }) {};
 
   "jni" = callPackage
-    ({ mkDerivation, base, bytestring, choice, constraints, containers
-     , cpphs, deepseq, inline-c, jdk, singletons
-     }:
-     mkDerivation {
-       pname = "jni";
-       version = "0.5.1";
-       sha256 = "0lrgj5dxhn7amzjw7gsqxg0gh91nxh1j4vmb4j2f5r8y3m8nwq4a";
-       libraryHaskellDepends = [
-         base bytestring choice constraints containers deepseq inline-c
-         singletons
-       ];
-       librarySystemDepends = [ jdk ];
-       libraryToolDepends = [ cpphs ];
-       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
-       description = "Complete JNI raw bindings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) jdk;};
-
-  "jni_0_6_0" = callPackage
     ({ mkDerivation, base, bytestring, choice, constraints, containers
      , cpphs, deepseq, inline-c, jdk, singletons
      }:
@@ -122336,7 +120338,6 @@ self: {
        homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -122534,21 +120535,6 @@ self: {
      }) {};
 
   "js-jquery" = callPackage
-    ({ mkDerivation, base, HTTP }:
-     mkDerivation {
-       pname = "js-jquery";
-       version = "3.2.1";
-       sha256 = "03qymiwnk24sigqjnl42i77rsx6vrgg5wjday0f2j0d6s213sl30";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base HTTP ];
-       doCheck = false;
-       homepage = "https://github.com/ndmitchell/js-jquery#readme";
-       description = "Obtain minified jQuery code";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "js-jquery_3_3_1" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -122561,7 +120547,6 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle" = callPackage
@@ -122854,8 +120839,8 @@ self: {
        pname = "json-autotype";
        version = "1.0.18";
        sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h";
-       revision = "1";
-       editedCabalFile = "0f67frvi5jsn47w02kqi834mkjy4kz451fic5m4i24lyykw19kvm";
+       revision = "2";
+       editedCabalFile = "1b7q8af32zpsrq32m34d4h4245ww19kxfqjrbq6s2mfx5qd5s5y6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123316,27 +121301,6 @@ self: {
      }) {};
 
   "json-stream" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, hspec
-     , QuickCheck, quickcheck-unicode, scientific, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "json-stream";
-       version = "0.4.1.5";
-       sha256 = "0h5g76grhi60idvmxdhydpz5f3198bydwywfyv9pghlmbrzjnkih";
-       libraryHaskellDepends = [
-         aeson base bytestring scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory hspec QuickCheck quickcheck-unicode
-         scientific text unordered-containers vector
-       ];
-       homepage = "https://github.com/ondrap/json-stream";
-       description = "Incremental applicative JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json-stream_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, hspec
      , QuickCheck, quickcheck-unicode, scientific, text
      , unordered-containers, vector
@@ -123355,7 +121319,6 @@ self: {
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-togo" = callPackage
@@ -123716,8 +121679,8 @@ self: {
      }:
      mkDerivation {
        pname = "judge";
-       version = "0.1.2.0";
-       sha256 = "14lrqrzw70cjzz0skihh9w9kfgah6rb7023dbgmcqbx0m8xjiiaw";
+       version = "0.1.3.0";
+       sha256 = "02lyd1ql4qj5da0p3mhpkh0gq8lrc6xmz3yg5hnc8mk5d3a381hw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -123731,7 +121694,7 @@ self: {
          optparse-applicative text unordered-containers yaml
        ];
        homepage = "https://github.com/slakkenhuis/judge#readme";
-       description = "Tableau-based theorem prover";
+       description = "Tableau-based theorem prover for justification logic";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -123851,23 +121814,6 @@ self: {
      }) {};
 
   "justified-containers" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck
-     , roles, should-not-typecheck
-     }:
-     mkDerivation {
-       pname = "justified-containers";
-       version = "0.2.0.1";
-       sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2";
-       libraryHaskellDepends = [ base containers roles ];
-       testHaskellDepends = [
-         base containers ghc-prim hspec QuickCheck should-not-typecheck
-       ];
-       homepage = "https://github.com/matt-noonan/justified-containers";
-       description = "Keyed container types with type-checked proofs of key presence";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "justified-containers_0_3_0_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck
      , roles, should-not-typecheck
      }:
@@ -123882,7 +121828,6 @@ self: {
        homepage = "https://github.com/matt-noonan/justified-containers";
        description = "Keyed container types with type-checked proofs of key presence";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm" = callPackage
@@ -124231,24 +122176,6 @@ self: {
      }) {};
 
   "kan-extensions" = callPackage
-    ({ mkDerivation, adjunctions, array, base, comonad, containers
-     , contravariant, distributive, fail, free, mtl, semigroupoids
-     , tagged, transformers
-     }:
-     mkDerivation {
-       pname = "kan-extensions";
-       version = "5.0.2";
-       sha256 = "0bj88bgwxlx490f5r979idsm9dpdsb0ldzar9sa0jhj2jn2xx7hw";
-       libraryHaskellDepends = [
-         adjunctions array base comonad containers contravariant
-         distributive fail free mtl semigroupoids tagged transformers
-       ];
-       homepage = "http://github.com/ekmett/kan-extensions/";
-       description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "kan-extensions_5_1" = callPackage
     ({ mkDerivation, adjunctions, array, base, comonad, containers
      , contravariant, distributive, fail, free, mtl, profunctors
      , semigroupoids, tagged, transformers, transformers-compat
@@ -124267,7 +122194,6 @@ self: {
        homepage = "http://github.com/ekmett/kan-extensions/";
        description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kangaroo" = callPackage
@@ -124284,20 +122210,6 @@ self: {
      }) {};
 
   "kanji" = callPackage
-    ({ mkDerivation, base, bytestring, containers, microlens, text }:
-     mkDerivation {
-       pname = "kanji";
-       version = "3.0.2";
-       sha256 = "1kgq8ns8mig93rf86wskay4kjp1lgdwp3xywld20mxdp4zwr5a6b";
-       libraryHaskellDepends = [
-         base bytestring containers microlens text
-       ];
-       homepage = "https://github.com/fosskers/nanq";
-       description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "kanji_3_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
      , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
      , microlens-platform, optparse-applicative, protolude, tasty
@@ -124325,6 +122237,34 @@ self: {
        homepage = "https://github.com/fosskers/kanji";
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "kanji_3_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
+     , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
+     , microlens-platform, optparse-applicative, protolude, tasty
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "kanji";
+       version = "3.2.1";
+       sha256 = "1x9mrjsj73kwk0y7m1j9n9d4pbcrjg066njpasb1vi69w6h2flbs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers deepseq hashable text
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base containers microlens microlens-aeson
+         microlens-platform optparse-applicative protolude text
+       ];
+       testHaskellDepends = [
+         aeson base containers HUnit-approx tasty tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [ aeson base containers criterion text ];
+       homepage = "https://github.com/fosskers/kanji";
+       description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -124501,8 +122441,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.3.0";
-       sha256 = "1v6gyk2x14nvzz0g560r7yh9wsp8r2imqgiq46m2nmx70ksfcx2b";
+       version = "0.5.4.0";
+       sha256 = "1144krzz4wvwhdh1b2673302xn7svz2b6kjfvq9728f1bzkkspad";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -124575,6 +122515,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "katip-scalyr-scribe" = callPackage
+    ({ mkDerivation, aeson, base, katip, scientific, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "katip-scalyr-scribe";
+       version = "0.1.0.1";
+       sha256 = "0pbq4mawa0aq2gzzhkrk9avv0pv20hjhq2qv0lvs0wyhv5jnmkqr";
+       libraryHaskellDepends = [
+         aeson base katip scientific text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base katip scientific text unordered-containers
+       ];
+       homepage = "https://github.com/reactormonk/katip-scalyr-scribe#readme";
+       description = "A katip scribe for logging to json";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "katip-syslog" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hsyslog, katip
      , string-conv, text
@@ -125309,26 +123268,6 @@ self: {
      }) {};
 
   "keys" = callPackage
-    ({ mkDerivation, array, base, comonad, containers, free, hashable
-     , semigroupoids, semigroups, transformers, transformers-compat
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "keys";
-       version = "3.11";
-       sha256 = "1cn45h27hxwb4ci1iyd2qn0fzyb2y85qq4821a9xm37bwsvrgwqc";
-       revision = "1";
-       editedCabalFile = "1lyg4wyi7mkqvbfl9lvfln3j4vys47jih56zyjba7nx36kbw185i";
-       libraryHaskellDepends = [
-         array base comonad containers free hashable semigroupoids
-         semigroups transformers transformers-compat unordered-containers
-       ];
-       homepage = "http://github.com/ekmett/keys/";
-       description = "Keyed functors and containers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "keys_3_12" = callPackage
     ({ mkDerivation, array, base, comonad, containers, free, hashable
      , semigroupoids, semigroups, tagged, transformers
      , transformers-compat, unordered-containers
@@ -125347,7 +123286,6 @@ self: {
        homepage = "http://github.com/ekmett/keys/";
        description = "Keyed functors and containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keysafe" = callPackage
@@ -126150,19 +124088,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
-     mkDerivation {
-       pname = "lackey";
-       version = "0.4.7";
-       sha256 = "026w7wmz71g9796mx6mdn3s1nxrds631kacn423zdvchridm0398";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base hspec servant servant-foreign text ];
-       homepage = "https://github.com/tfausak/lackey#readme";
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_1_0_1" = callPackage
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
@@ -126173,7 +124098,6 @@ self: {
        homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lagrangian" = callPackage
@@ -127239,29 +125163,30 @@ self: {
   "language-docker" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
      , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
-     , split, template-haskell, text, th-lift, th-lift-instances
-     , transformers, unordered-containers, yaml
+     , semigroups, split, template-haskell, text, th-lift
+     , th-lift-instances, time, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "1.0.0";
-       sha256 = "023gahxcy27rg03fyk87h4yirba2c23qv4fww9fwzi4f4m8inf81";
+       version = "2.0.1";
+       sha256 = "0xd7r6npr7kzdh3pxcidvqff3lrww6dqyyksg58chnb57d87b0sc";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath free Glob mtl parsec
-         pretty split template-haskell text th-lift th-lift-instances
-         transformers unordered-containers yaml
+         pretty semigroups split template-haskell text th-lift
+         th-lift-instances time transformers unordered-containers yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath free Glob hspec HUnit mtl
-         parsec pretty process QuickCheck split template-haskell text
-         th-lift th-lift-instances transformers unordered-containers yaml
+         parsec pretty process QuickCheck semigroups split template-haskell
+         text th-lift th-lift-instances time transformers
+         unordered-containers yaml
        ];
        homepage = "https://github.com/hadolint/language-docker#readme";
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_3_0_0" = callPackage
+  "language-docker_3_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
      , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
      , semigroups, split, template-haskell, text, th-lift
@@ -127269,8 +125194,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "3.0.0";
-       sha256 = "0bxj7ipv6b07yjyz4a03j3whayb6rln5ymj1n06kfnbpl0lzcmyr";
+       version = "3.0.1";
+       sha256 = "1bs9ghajxz0a1jmzarb7fzn4z2m8qmcyydsf93rqlzxc8y8fhsp2";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath free Glob mtl parsec
          pretty semigroups split template-haskell text th-lift
@@ -128123,24 +126048,6 @@ self: {
      }) {};
 
   "lapack-carray" = callPackage
-    ({ mkDerivation, base, carray, lapack-ffi, netlib-carray
-     , netlib-ffi, storable-complex, transformers
-     }:
-     mkDerivation {
-       pname = "lapack-carray";
-       version = "0.0";
-       sha256 = "1903wa7hv6mi8zrz99fjlbwk4dvn2q2sshf7nazlyg9dz9gg861l";
-       libraryHaskellDepends = [
-         base carray lapack-ffi netlib-carray netlib-ffi storable-complex
-         transformers
-       ];
-       homepage = "http://hub.darcs.net/thielema/lapack-carray/";
-       description = "Auto-generated interface to Fortran LAPACK via CArrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "lapack-carray_0_0_1" = callPackage
     ({ mkDerivation, base, carray, lapack-ffi, netlib-carray
      , netlib-ffi, storable-complex, transformers
      }:
@@ -128159,20 +126066,6 @@ self: {
      }) {};
 
   "lapack-ffi" = callPackage
-    ({ mkDerivation, base, liblapack, netlib-ffi }:
-     mkDerivation {
-       pname = "lapack-ffi";
-       version = "0.0";
-       sha256 = "1r2625li76ky8gxl07vzqh38xzrjazzf3fxzhhbl2nkjcx9bmv83";
-       libraryHaskellDepends = [ base netlib-ffi ];
-       libraryPkgconfigDepends = [ liblapack ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi/";
-       description = "Auto-generated interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) liblapack;};
-
-  "lapack-ffi_0_0_1" = callPackage
     ({ mkDerivation, base, liblapack, netlib-ffi }:
      mkDerivation {
        pname = "lapack-ffi";
@@ -128187,29 +126080,6 @@ self: {
      }) {inherit (pkgs) liblapack;};
 
   "lapack-ffi-tools" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, containers
-     , explicit-exception, filepath, non-empty, optparse-applicative
-     , parsec, pathtype, transformers, unordered-containers, utility-ht
-     , vector
-     }:
-     mkDerivation {
-       pname = "lapack-ffi-tools";
-       version = "0.0.0.1";
-       sha256 = "091799j96gc1g9dq6hr3swpq4w4s0p8i5256308lwrqls1hlggs8";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         base bytestring cassava containers explicit-exception filepath
-         non-empty optparse-applicative parsec pathtype transformers
-         unordered-containers utility-ht vector
-       ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
-       description = "Generator for Haskell interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lapack-ffi-tools_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers
      , explicit-exception, filepath, non-empty, optparse-applicative
      , parsec, pathtype, transformers, unordered-containers, utility-ht
@@ -128230,7 +126100,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
        description = "Generator for Haskell interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "large-hashable" = callPackage
@@ -128427,33 +126296,6 @@ self: {
      }) {};
 
   "lattices" = callPackage
-    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
-     , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty
-     , tasty-quickcheck, transformers, universe-base
-     , universe-instances-base, universe-reverse-instances
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "lattices";
-       version = "1.7";
-       sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc";
-       revision = "1";
-       editedCabalFile = "1nsc77nnh8cvfw8f58g0w5mjamy4iivkadyyaj3yzawfr8jbxi53";
-       libraryHaskellDepends = [
-         base base-compat containers deepseq hashable semigroupoids tagged
-         universe-base universe-reverse-instances unordered-containers
-       ];
-       testHaskellDepends = [
-         base base-compat containers QuickCheck quickcheck-instances tasty
-         tasty-quickcheck transformers universe-instances-base
-         unordered-containers
-       ];
-       homepage = "http://github.com/phadej/lattices/";
-       description = "Fine-grained library for constructing and manipulating lattices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lattices_1_7_1" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty
      , tasty-quickcheck, transformers, universe-base
@@ -128478,7 +126320,6 @@ self: {
        homepage = "http://github.com/phadej/lattices/";
        description = "Fine-grained library for constructing and manipulating lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "launchpad-control" = callPackage
@@ -129254,47 +127095,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , Cabal, cabal-doctest, call-stack, comonad, containers
-     , contravariant, criterion, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
-     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
-     , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.15.4";
-       sha256 = "1lkwlnhgpgnsz046mw4qs0fa7h4l012gilrr3nf3spllsy3pnbkl";
-       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring call-stack comonad
-         containers contravariant distributive exceptions filepath free
-         ghc-prim hashable kan-extensions mtl parallel profunctors
-         reflection semigroupoids semigroups tagged template-haskell text
-         th-abstraction transformers transformers-compat
-         unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
-         simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "lens_4_16" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -129310,8 +127110,8 @@ self: {
        pname = "lens";
        version = "4.16";
        sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z";
-       revision = "3";
-       editedCabalFile = "0zkjys731g07brc4ky29245jrdx1r8l468k5fh9hlwd0dx9d4996";
+       revision = "4";
+       editedCabalFile = "18nipajdyqz5vpqx0mrl5c1a97jb8wm2skq57jashgygq5h8y7g4";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -129335,7 +127135,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -129381,8 +127180,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.2";
        sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
-       revision = "3";
-       editedCabalFile = "160zpz85p8qfg6scqp2cbg3w9lbv89hkxcvmyk6la34v9d439lm0";
+       revision = "4";
+       editedCabalFile = "1gas30rarvr8337a06z089m3dp5kvdcvhyac2mrp5pjlfp4zz226";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
@@ -129674,8 +127473,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.9.1";
-       sha256 = "10a0y0n62n8indkhapscws3lj95riaxxdq04bcfah8ljvqy1b61r";
+       version = "1.0.10.0";
+       sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -129693,7 +127492,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "lentil_1_0_10_0" = callPackage
+  "lentil_1_0_10_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
@@ -129701,8 +127500,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.10.0";
-       sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7";
+       version = "1.0.10.1";
+       sha256 = "04hr5q48da5clfvypwb9fii6si19kda12ncyx10rp2fni50sshrl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130366,28 +128165,6 @@ self: {
      }) {};
 
   "libmpd" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, filepath, hspec, mtl, network, old-locale
-     , QuickCheck, text, time, unix, utf8-string
-     }:
-     mkDerivation {
-       pname = "libmpd";
-       version = "0.9.0.7";
-       sha256 = "08i6v4i8xbv0vv4w0yqqh2pp7z0fb5dc9chgwyclkrvy480g5w0p";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers data-default-class filepath
-         mtl network old-locale text time utf8-string
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring containers data-default-class filepath
-         hspec mtl network old-locale QuickCheck text time unix utf8-string
-       ];
-       homepage = "http://github.com/vimus/libmpd-haskell#readme";
-       description = "An MPD client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "libmpd_0_9_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, filepath, hspec, mtl, network, old-locale
      , QuickCheck, text, time, unix, utf8-string
@@ -130407,7 +128184,6 @@ self: {
        homepage = "http://github.com/vimus/libmpd-haskell#readme";
        description = "An MPD client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libnotify" = callPackage
@@ -130924,6 +128700,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-base_0_2_3_12" = callPackage
+    ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
+     , test-framework, test-framework-hunit, transformers
+     , transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-base";
+       version = "0.2.3.12";
+       sha256 = "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61";
+       libraryHaskellDepends = [ base monad-control transformers-base ];
+       testHaskellDepends = [
+         base HUnit monad-control test-framework test-framework-hunit
+         transformers transformers-base transformers-compat
+       ];
+       benchmarkHaskellDepends = [
+         base criterion monad-control monad-peel transformers
+       ];
+       homepage = "https://github.com/basvandijk/lifted-base";
+       description = "lifted IO operations from the base library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-protolude" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, ghc-prim, lifted-async, lifted-base, mtl, safe, stm
@@ -131269,8 +129068,8 @@ self: {
        pname = "linear";
        version = "1.20.7";
        sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b";
-       revision = "2";
-       editedCabalFile = "1w5194k2sqr508942xr9acfzk80avc4bwax347blw4js4vl5adwn";
+       revision = "3";
+       editedCabalFile = "0y7gjzrwhfsbr4vh10qkky563jiwr60cp0yx019adabvx6sf7yil";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
@@ -131295,8 +129094,8 @@ self: {
        pname = "linear-accelerate";
        version = "0.5.0.1";
        sha256 = "0khbh6z348pv2jwyfip50hvls7pqa91bwkzks4988vxh54mp2i1l";
-       revision = "1";
-       editedCabalFile = "1r0h6mk2ai11f9grcwfbq4a5j7s9zn32m4finrigar4q22xkxf2j";
+       revision = "2";
+       editedCabalFile = "0b7amkafmf82q6a8q49q6n3v33xs16n5h6y005jva5bhpxkmn26w";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          accelerate base distributive lens linear
@@ -133440,8 +131239,8 @@ self: {
        pname = "log-domain";
        version = "0.12";
        sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
-       revision = "1";
-       editedCabalFile = "0p2cmr9lpbakh4ml4mxgh4fhqmxdk78xpcnqblag1cllx9jrmk5b";
+       revision = "2";
+       editedCabalFile = "1yjphyqyn8122ikxxv0a10fh2cbavy7xyb435jxq6gln8sw3m54d";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
@@ -133542,38 +131341,6 @@ self: {
      }) {};
 
   "log-warper" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, async, base, containers
-     , data-default, deepseq, directory, filepath, fmt, hspec, HUnit
-     , markdown-unlit, microlens-mtl, microlens-platform, mmorph
-     , monad-control, monad-loops, mtl, QuickCheck, text, time
-     , transformers, transformers-base, universum, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "log-warper";
-       version = "1.8.3";
-       sha256 = "1awblvxh6cncwlqacxb1wq4s77x79ncrz6dl81wgrbjjifwpf0xz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base containers deepseq directory filepath fmt
-         microlens-platform mmorph monad-control monad-loops mtl text time
-         transformers transformers-base universum unix unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         base markdown-unlit mtl text universum yaml
-       ];
-       testHaskellDepends = [
-         async base data-default directory filepath hspec HUnit
-         microlens-mtl QuickCheck universum unordered-containers
-       ];
-       homepage = "https://github.com/serokell/log-warper";
-       description = "Flexible, configurable, monadic and pretty logging";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "log-warper_1_8_10_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, containers
      , data-default, deepseq, directory, filepath, fmt, hspec
      , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens
@@ -133606,7 +131373,6 @@ self: {
        homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -134540,6 +132306,8 @@ self: {
        pname = "lrucaching";
        version = "0.3.3";
        sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
+       revision = "1";
+       editedCabalFile = "0axg26s9gssg3ig613rnqj5v4aczki4kgyqmnd208kljkawq6c7k";
        libraryHaskellDepends = [
          base base-compat deepseq hashable psqueues vector
        ];
@@ -134824,6 +132592,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid_2_9_10" = callPackage
+    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
+     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
+     , mtl, parsec, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lucid";
+       version = "2.9.10";
+       sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers hashable mmorph mtl text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text transformers
+       ];
+       homepage = "https://github.com/chrisdone/lucid";
+       description = "Clear to write, read and edit DSL for HTML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lucid-colonnade" = callPackage
     ({ mkDerivation, base, colonnade, lucid, text }:
      mkDerivation {
@@ -135233,8 +133026,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.3";
        sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
-       revision = "1";
-       editedCabalFile = "0y89blvpswvji1ya7h67gcx322iqi93di3jmwx47l6mic3ki4r2d";
+       revision = "2";
+       editedCabalFile = "0c6jkr22w797jvmad9vki2mm7cdzxpqqxkpv836fh5m248nnc618";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -135440,8 +133233,8 @@ self: {
        pname = "machines";
        version = "0.6.3";
        sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz";
-       revision = "5";
-       editedCabalFile = "1w9z6j74vdsaiqr5jhw4zvgl2n3l6fw3x1sgvf1yysmxkx9hhhdn";
+       revision = "6";
+       editedCabalFile = "0ga5x9lpik7gz2fx4j3jnn6dw8xkd9cxg19ngj8iwrx4b946m1w7";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base comonad containers distributive mtl pointed
@@ -135742,37 +133535,6 @@ self: {
      }) {};
 
   "magicbane" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude
-     , conduit, conduit-combinators, data-default, data-has, ekg-core
-     , ekg-wai, envy, errors, fast-logger, http-api-data, http-client
-     , http-client-tls, http-conduit, http-date, http-link-header
-     , http-media, http-types, lifted-async, mime-types, monad-control
-     , monad-logger, monad-metrics, mtl, network, network-uri
-     , raw-strings-qq, refined, servant, servant-server, split
-     , string-conversions, text, transformers, unordered-containers, wai
-     , wai-cli, wai-middleware-metrics
-     }:
-     mkDerivation {
-       pname = "magicbane";
-       version = "0.1.4";
-       sha256 = "1zfj188iw6g0ym88p69wrf5avbipjxvijklphki5bj3rc7h8cyx0";
-       libraryHaskellDepends = [
-         aeson aeson-qq attoparsec base classy-prelude conduit
-         conduit-combinators data-default data-has ekg-core ekg-wai envy
-         errors fast-logger http-api-data http-client http-client-tls
-         http-conduit http-date http-link-header http-media http-types
-         lifted-async mime-types monad-control monad-logger monad-metrics
-         mtl network network-uri raw-strings-qq refined servant
-         servant-server split string-conversions text transformers
-         unordered-containers wai wai-cli wai-middleware-metrics
-       ];
-       homepage = "https://github.com/myfreeweb/magicbane#readme";
-       description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "magicbane_0_2_0" = callPackage
     ({ mkDerivation, aeson, aeson-qq, async, attoparsec, base
      , bytestring, conduit, conduit-combinators, data-default, data-has
      , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data
@@ -136520,30 +134282,6 @@ self: {
      }) {};
 
   "mandrill" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
-     , bytestring, containers, email-validate, http-client
-     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
-     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "mandrill";
-       version = "0.5.3.2";
-       sha256 = "1jzlfi7b4djkwm0vx9ii55db0jf4v8av3idkgg8x3ix95pvps397";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-html bytestring containers
-         email-validate http-client http-client-tls http-types lens mtl
-         old-locale QuickCheck text time unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Library for interfacing with the Mandrill JSON API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mandrill_0_5_3_3" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -136565,7 +134303,6 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -136804,6 +134541,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "markdown_0_1_17" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+     , call-stack, conduit, conduit-extra, containers, data-default
+     , directory, filepath, hspec, text, transformers, xml-conduit
+     , xml-types, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "markdown";
+       version = "0.1.17";
+       sha256 = "11bcbhrlfddjlifrab46qywbrabxcf8hg1zp26l17dlxs3nm681w";
+       libraryHaskellDepends = [
+         attoparsec base blaze-html blaze-markup conduit conduit-extra
+         containers data-default text transformers xml-conduit xml-types
+         xss-sanitize
+       ];
+       testHaskellDepends = [
+         base blaze-html call-stack conduit conduit-extra containers
+         directory filepath hspec text transformers
+       ];
+       homepage = "https://github.com/snoyberg/markdown";
+       description = "Convert Markdown to HTML, with XSS protection";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "markdown-kate" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html
      , conduit, containers, data-default, highlighting-kate, hspec
@@ -136840,27 +134602,6 @@ self: {
      }) {};
 
   "markdown-unlit" = callPackage
-    ({ mkDerivation, base, base-compat, directory, hspec, QuickCheck
-     , silently, stringbuilder, temporary
-     }:
-     mkDerivation {
-       pname = "markdown-unlit";
-       version = "0.4.1";
-       sha256 = "00q9igbplavnrjhg0fjfdg30pnmw9gsrnsk9l3hhp5dmi1lxhf3l";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base base-compat ];
-       executableHaskellDepends = [ base base-compat ];
-       testHaskellDepends = [
-         base base-compat directory hspec QuickCheck silently stringbuilder
-         temporary
-       ];
-       homepage = "https://github.com/sol/markdown-unlit#readme";
-       description = "Literate Haskell support for Markdown";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "markdown-unlit_0_5_0" = callPackage
     ({ mkDerivation, base, base-compat, directory, hspec, QuickCheck
      , silently, stringbuilder, temporary
      }:
@@ -136879,7 +134620,6 @@ self: {
        homepage = "https://github.com/sol/markdown-unlit#readme";
        description = "Literate Haskell support for Markdown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown2svg" = callPackage
@@ -136955,24 +134695,6 @@ self: {
      }) {};
 
   "markup" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad
-     , lucid, mmorph, monad-control, monad-logger, mtl, path-extra
-     , resourcet, text, transformers-base, urlpath
-     }:
-     mkDerivation {
-       pname = "markup";
-       version = "4.0.3";
-       sha256 = "1a4n89j8z3sgyigbxkc10lb3kz6x5bf0kdcs1k0hydcj0vdvwqh3";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup clay comonad lucid mmorph
-         monad-control monad-logger mtl path-extra resourcet text
-         transformers-base urlpath
-       ];
-       description = "Abstraction for HTML-embedded content";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "markup_4_0_4" = callPackage
     ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
      , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
      , path-extra, resourcet, text, transformers-base, urlpath
@@ -136988,7 +134710,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -137200,8 +134921,8 @@ self: {
        pname = "massiv";
        version = "0.1.1.0";
        sha256 = "0xl6f3cxhfbyz15p4mayj0489mjgrvla7hz0sf0i58bfcl2b8r8q";
-       revision = "1";
-       editedCabalFile = "0qymziv7s5w70z0f32l8ns8xhzn9m4qrjhr9sfiy9wc1li0q3pch";
+       revision = "2";
+       editedCabalFile = "06d7lkd65bd5gfpgfgppcg8pagfc8k03qf7psggv2d3sixm088bn";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -137213,6 +134934,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_1_2_0" = callPackage
+    ({ mkDerivation, base, data-default, data-default-class, deepseq
+     , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.1.2.0";
+       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
+       libraryHaskellDepends = [
+         base data-default-class deepseq ghc-prim primitive vector
+       ];
+       testHaskellDepends = [
+         base data-default deepseq hspec QuickCheck safe-exceptions vector
+       ];
+       homepage = "https://github.com/lehins/massiv";
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq, directory
      , filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -138398,75 +136139,25 @@ self: {
      }) {};
 
   "mega-sdist" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude-conduit
-     , conduit-extra, directory, filepath, http-conduit, optparse-simple
-     , tar-conduit, temporary, text, typed-process, yaml
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , http-conduit, optparse-simple, rio, tar-conduit, yaml
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.3.0.6";
-       sha256 = "0cgak9hp1j9ybcpbqjs56pq7h9wn0my46mlx6nqv3fvidwdp5vl7";
+       version = "0.3.2";
+       sha256 = "05v061giv1q0gq4n8x1g44pyfxjy95aqxnnv5bc4cclrp233m5b1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring classy-prelude-conduit conduit-extra directory
-         filepath http-conduit optparse-simple tar-conduit temporary text
-         typed-process yaml
+         base bytestring conduit conduit-extra http-conduit optparse-simple
+         rio tar-conduit yaml
        ];
        homepage = "https://github.com/snoyberg/mega-sdist#readme";
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "mega-sdist_0_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude-conduit
-     , conduit-extra, directory, filepath, http-conduit, optparse-simple
-     , tar-conduit, temporary, text, typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
-       version = "0.3.1";
-       sha256 = "06sgnkia5fwlsmy6m88mdklsabqv8vixgjbfzmyfln3aqhvwqk23";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring classy-prelude-conduit conduit-extra directory
-         filepath http-conduit optparse-simple tar-conduit temporary text
-         typed-process yaml
-       ];
-       homepage = "https://github.com/snoyberg/mega-sdist#readme";
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , criterion, deepseq, hspec, hspec-expectations, mtl
-     , parser-combinators, QuickCheck, scientific, text, transformers
-     , weigh
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "6.3.0";
-       sha256 = "15bhghiszm18acn1igmq6vgdlcvsvsx4dlkl2vg2ghy5qgyrqxsv";
-       revision = "2";
-       editedCabalFile = "1npxvydar8l68vfp3g0ir9cvq5vglf1z2a9q1h1mj438y0084f7v";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers deepseq mtl
-         parser-combinators scientific text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-expectations mtl QuickCheck
-         scientific text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-       homepage = "https://github.com/mrkkrp/megaparsec";
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec_6_4_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -138476,8 +136167,8 @@ self: {
        pname = "megaparsec";
        version = "6.4.1";
        sha256 = "0w0kw8g7c6c3sp0fpgfqjc2w032dv9s7jnyn1dx71hk5mifh2h6y";
-       revision = "1";
-       editedCabalFile = "1r7isvrj7k34bsl7snd14wjvc64vx01dmbkm17ycik3lhllscfif";
+       revision = "2";
+       editedCabalFile = "0vh4l2kl9nfxlr8l82qicldybwiv6vbksi3jdk0xjzxmkvgm0jnf";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -138490,7 +136181,6 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -138764,13 +136454,13 @@ self: {
      }) {};
 
   "memo-sqlite" = callPackage
-    ({ mkDerivation, base, direct-sqlite }:
+    ({ mkDerivation, base, direct-sqlite, text }:
      mkDerivation {
        pname = "memo-sqlite";
-       version = "0.1";
-       sha256 = "1gijza29wj79k8czfg4mghq7nqsbpyf1scnm9hmg2ykhnllpzvy3";
-       libraryHaskellDepends = [ base direct-sqlite ];
-       homepage = "https://gitorious.org/memo-sqlite";
+       version = "0.2";
+       sha256 = "0x6vpf5kcr4icli0hjdqzphbpsakh0yn2ih2jyh65hnk1nh4j8n7";
+       libraryHaskellDepends = [ base direct-sqlite text ];
+       homepage = "https://code.mathr.co.uk/memo-sqlite";
        description = "memoize functions using SQLite3 database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138836,25 +136526,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, basement, bytestring, deepseq, foundation
-     , ghc-prim, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.11";
-       sha256 = "0k6x58r3if8zbsgip8nr7lb77xf468qxlwqnmah8p313rxfg0k37";
-       libraryHaskellDepends = [
-         base basement bytestring deepseq foundation ghc-prim
-       ];
-       testHaskellDepends = [
-         base foundation tasty tasty-hunit tasty-quickcheck
-       ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_16" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, foundation
      , ghc-prim
      }:
@@ -138869,7 +136540,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -139436,28 +137106,6 @@ self: {
      }) {};
 
   "microlens-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
-     , scientific, tasty, tasty-hunit, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "microlens-aeson";
-       version = "2.2.0.2";
-       sha256 = "05zk6pfb9s48kgfpim1lj32vh3p54g633d5x4771inxihlskqd4d";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring microlens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring microlens tasty tasty-hunit text
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/fosskers/microlens-aeson/";
-       description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "microlens-aeson_2_3_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty
      , tasty-hunit, text, unordered-containers, vector
@@ -139481,7 +137129,6 @@ self: {
        homepage = "http://github.com/fosskers/microlens-aeson/";
        description = "Law-abiding lenses for Aeson, using microlens";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-contra" = callPackage
@@ -140583,26 +138230,6 @@ self: {
      }) {};
 
   "miso" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
-     , http-types, lucid, network-uri, servant, servant-lucid, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "miso";
-       version = "0.10.0.0";
-       sha256 = "0p5hnd9k14zbv2gphxwm7a84m3djzybr6awihrb22wk5jyjc9d7x";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-api-data http-types lucid
-         network-uri servant servant-lucid text transformers vector
-       ];
-       homepage = "http://github.com/dmjio/miso";
-       description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miso_0_14_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
@@ -140620,7 +138247,6 @@ self: {
        homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "missing-foreign" = callPackage
@@ -140797,37 +138423,6 @@ self: {
      }) {};
 
   "mmark" = callPackage
-    ({ mkDerivation, aeson, base, case-insensitive, containers
-     , criterion, data-default-class, deepseq, dlist, email-validate
-     , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
-     , megaparsec, microlens, microlens-th, modern-uri, mtl
-     , parser-combinators, QuickCheck, text, text-metrics
-     , unordered-containers, weigh, yaml
-     }:
-     mkDerivation {
-       pname = "mmark";
-       version = "0.0.4.0";
-       sha256 = "05dslarsdfcp2im9w80ks52wzqcqq8ma23b69wdl8nyfbkmaj5ch";
-       revision = "2";
-       editedCabalFile = "1l2xljnasvgj3icc8dynsakyskd65c114gm4f94la3pv8ghcc3rg";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base case-insensitive containers data-default-class deepseq
-         dlist email-validate foldl hashable html-entity-map lucid
-         megaparsec microlens microlens-th modern-uri mtl parser-combinators
-         text text-metrics unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
-         QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion text weigh ];
-       homepage = "https://github.com/mrkkrp/mmark";
-       description = "Strict markdown processor for writers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmark_0_0_5_6" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
      , criterion, data-default-class, deepseq, dlist, email-validate
      , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
@@ -140854,7 +138449,6 @@ self: {
        homepage = "https://github.com/mmark-md/mmark";
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-cli" = callPackage
@@ -140881,26 +138475,6 @@ self: {
      }) {};
 
   "mmark-ext" = callPackage
-    ({ mkDerivation, base, data-default-class, foldl, hspec, lucid
-     , microlens, mmark, modern-uri, text
-     }:
-     mkDerivation {
-       pname = "mmark-ext";
-       version = "0.0.1.2";
-       sha256 = "0f698yvlcbvq627advl832nlzl975jx462zg7pd8h43chdbj5qar";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base data-default-class foldl lucid microlens mmark modern-uri text
-       ];
-       testHaskellDepends = [
-         base data-default-class hspec lucid mmark text
-       ];
-       homepage = "https://github.com/mrkkrp/mmark-ext";
-       description = "Commonly useful extensions for MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmark-ext_0_2_0_0" = callPackage
     ({ mkDerivation, base, foldl, hspec, lucid, microlens, mmark
      , modern-uri, skylighting, text
      }:
@@ -140918,7 +138492,6 @@ self: {
        homepage = "https://github.com/mmark-md/mmark-ext";
        description = "Commonly useful extensions for MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmorph" = callPackage
@@ -141081,33 +138654,6 @@ self: {
      }) {};
 
   "modern-uri" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , criterion, deepseq, exceptions, hspec, hspec-megaparsec
-     , megaparsec, profunctors, QuickCheck, template-haskell, text
-     , weigh
-     }:
-     mkDerivation {
-       pname = "modern-uri";
-       version = "0.1.2.1";
-       sha256 = "10y3ppcd4d987khk9jxaa0clkjssmvip2kpq63z8xcigvdiil91h";
-       revision = "1";
-       editedCabalFile = "1kgwf0y5p5imrkjga53yna4sy6jqk5x3v0zks24c4vb52mi2a19n";
-       libraryHaskellDepends = [
-         base bytestring containers contravariant deepseq exceptions
-         megaparsec profunctors QuickCheck template-haskell text
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq megaparsec text weigh
-       ];
-       homepage = "https://github.com/mrkkrp/modern-uri";
-       description = "Modern library for working with URIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "modern-uri_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , criterion, deepseq, exceptions, hspec, hspec-megaparsec
      , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged
@@ -141133,7 +138679,6 @@ self: {
        homepage = "https://github.com/mrkkrp/modern-uri";
        description = "Modern library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modify-fasta" = callPackage
@@ -141847,6 +139392,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_28_2" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
+     , mtl, resourcet, stm, stm-chans, template-haskell, text
+     , transformers, transformers-base, transformers-compat
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.28.2";
+       sha256 = "1dqrsqpqw4qfyida4j0z6dffds4sj7j282x4ir6wrq9j7nmns4yx";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra exceptions fast-logger
+         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
+         template-haskell text transformers transformers-base
+         transformers-compat unliftio-core
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -142859,6 +140427,38 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "mongoDB_2_3_0_5" = callPackage
+    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+     , binary, bson, bytestring, conduit, conduit-extra, containers
+     , criterion, cryptohash, data-default-class, hashtables, hspec
+     , lifted-base, monad-control, mtl, network, nonce, old-locale
+     , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text
+     , time, tls, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "mongoDB";
+       version = "2.3.0.5";
+       sha256 = "13pa30qgk08846hngh9gy1w6ay0amchwr8aj32558i41nnrhl9j9";
+       libraryHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring conduit conduit-extra containers cryptohash
+         data-default-class hashtables lifted-base monad-control mtl network
+         nonce parsec pureMD5 random random-shuffle resourcet tagged text
+         time tls transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec mtl old-locale text time ];
+       benchmarkHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring containers criterion cryptohash data-default-class
+         hashtables lifted-base monad-control mtl network nonce parsec
+         random random-shuffle text transformers-base
+       ];
+       homepage = "https://github.com/mongodb-haskell/mongodb";
+       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mongodb-queue" = callPackage
     ({ mkDerivation, base, data-default, hspec, lifted-base
      , monad-control, mongoDB, network, text, transformers
@@ -143106,22 +140706,6 @@ self: {
      }) {};
 
   "monoidal-containers" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "monoidal-containers";
-       version = "0.3.0.2";
-       sha256 = "1ivjf0wi77kf07jq6q8mf01bi8zr29qjkvsi2sqpm34kl7hlhsij";
-       libraryHaskellDepends = [
-         base containers deepseq hashable lens newtype unordered-containers
-       ];
-       homepage = "http://github.com/bgamari/monoidal-containers";
-       description = "Containers with monoidal accumulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoidal-containers_0_3_1_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
      , semigroups, unordered-containers
      }:
@@ -143136,7 +140720,6 @@ self: {
        homepage = "http://github.com/bgamari/monoidal-containers";
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoidplus" = callPackage
@@ -145388,20 +142971,6 @@ self: {
      }) {};
 
   "mwc-probability" = callPackage
-    ({ mkDerivation, base, mwc-random, primitive, transformers }:
-     mkDerivation {
-       pname = "mwc-probability";
-       version = "1.3.0";
-       sha256 = "0vqzzsifar0q33ar1583c0g7250bi8fwpjpiwdq7gsigz8isd6qg";
-       revision = "1";
-       editedCabalFile = "1b1w504ycphpkcq279bjr2m1laxmv7xzhrbqaf6ayym265f75mnb";
-       libraryHaskellDepends = [ base mwc-random primitive transformers ];
-       homepage = "http://github.com/jtobin/mwc-probability";
-       description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mwc-probability_2_0_2" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -145411,7 +142980,6 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random" = callPackage
@@ -145435,8 +143003,8 @@ self: {
        pname = "mwc-random-accelerate";
        version = "0.1.0.0";
        sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih";
-       revision = "1";
-       editedCabalFile = "0xgl1glq4jxs48x7wp8wh6pk3zad8483bvppwp89p3k0vlh6yqq3";
+       revision = "2";
+       editedCabalFile = "16llz1jvpq841a20wvv2j8kkb357y970i54w340hwk4c187hypic";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -146020,41 +143588,6 @@ self: {
      }) {};
 
   "nakadi-client" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
-     , classy-prelude, conduit, conduit-combinators, conduit-extra
-     , containers, hashable, http-client, http-client-tls, http-conduit
-     , http-types, iso8601-time, lens, lens-aeson, monad-logger, mtl
-     , random, resourcet, retry, safe-exceptions, say, scientific, split
-     , tasty, tasty-hunit, template-haskell, text, time, transformers
-     , unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "nakadi-client";
-       version = "0.3.0.0";
-       sha256 = "14cr81b6x7cf10zja1vvpqhz9wanq50wwxhkvfx8w1s44skwvasy";
-       libraryHaskellDepends = [
-         aeson aeson-casing base bytestring conduit conduit-combinators
-         conduit-extra containers hashable http-client http-client-tls
-         http-conduit http-types iso8601-time lens monad-logger mtl
-         resourcet retry safe-exceptions scientific split tasty
-         template-haskell text time transformers unordered-containers uuid
-         vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing async base bytestring classy-prelude conduit
-         conduit-combinators conduit-extra containers hashable http-client
-         http-client-tls http-conduit http-types iso8601-time lens
-         lens-aeson monad-logger mtl random resourcet retry safe-exceptions
-         say scientific split tasty tasty-hunit template-haskell text time
-         transformers unordered-containers uuid vector
-       ];
-       homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
-       description = "Client library for the Nakadi Event Broker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "nakadi-client_0_5_0_3" = callPackage
     ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
      , classy-prelude, conduit, conduit-combinators, conduit-extra
      , containers, exceptions, fast-logger, hashable, http-client
@@ -147219,20 +144752,6 @@ self: {
      }) {};
 
   "netlib-carray" = callPackage
-    ({ mkDerivation, base, carray, storable-complex, transformers }:
-     mkDerivation {
-       pname = "netlib-carray";
-       version = "0.0";
-       sha256 = "173hphdy4qv3zx6qigjf2zj38gzlmp94xjcyc8jlwln221s35l0r";
-       libraryHaskellDepends = [
-         base carray storable-complex transformers
-       ];
-       homepage = "http://hub.darcs.net/thielema/netlib-carray/";
-       description = "Helper modules for CArray wrappers to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "netlib-carray_0_0_1" = callPackage
     ({ mkDerivation, base, carray, netlib-ffi, transformers }:
      mkDerivation {
        pname = "netlib-carray";
@@ -147242,22 +144761,9 @@ self: {
        homepage = "http://hub.darcs.net/thielema/netlib-carray/";
        description = "Helper modules for CArray wrappers to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlib-ffi" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "netlib-ffi";
-       version = "0.0";
-       sha256 = "0i04gahmv9171ndw5nkcawkfn3vbfgagnxhl1xpy0a45bfs0n9xc";
-       libraryHaskellDepends = [ base transformers ];
-       homepage = "http://hub.darcs.net/thielema/netlib-ffi/";
-       description = "Helper modules for FFI to BLAS and LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "netlib-ffi_0_0_1" = callPackage
     ({ mkDerivation, base, storable-complex, transformers }:
      mkDerivation {
        pname = "netlib-ffi";
@@ -147267,7 +144773,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/netlib-ffi/";
        description = "Helper modules for FFI to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlines" = callPackage
@@ -147849,28 +145354,6 @@ self: {
      }) {};
 
   "network-conduit-tls" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , connection, cprng-aes, data-default, HUnit, monad-control, mtl
-     , network, streaming-commons, tls, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "network-conduit-tls";
-       version = "1.2.2";
-       sha256 = "11xh5g0c7arf6d0klilacajf2mg24pb47wbzwn2hb7fimkgwv8hj";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra connection cprng-aes
-         data-default monad-control network streaming-commons tls
-         transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra connection HUnit mtl
-       ];
-       homepage = "https://github.com/snoyberg/conduit";
-       description = "Create TLS-aware network code with conduits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "network-conduit-tls_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , connection, data-default-class, HUnit, mtl, network
      , streaming-commons, tls, transformers, unliftio-core
@@ -147889,7 +145372,6 @@ self: {
        homepage = "https://github.com/snoyberg/conduit";
        description = "Create TLS-aware network code with conduits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-connection" = callPackage
@@ -149077,8 +146559,8 @@ self: {
      }:
      mkDerivation {
        pname = "nirum";
-       version = "0.3.0";
-       sha256 = "1s9yk0gjly0camg3crk0nk2943maizgija415lrd0b8ykgm97ax6";
+       version = "0.3.3";
+       sha256 = "0ilrhkfv1q2w49wsj27dssaavw8v5w77vyf2mynb5aam1yax3d3v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149722,23 +147204,6 @@ self: {
      }) {};
 
   "nonce" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
-     , transformers, unliftio, unliftio-core
-     }:
-     mkDerivation {
-       pname = "nonce";
-       version = "1.0.5";
-       sha256 = "15gbgfmby1mlk95c1q7qd38yc5xr4z7l58b3y59aixlsp4qspind";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring entropy text transformers
-         unliftio unliftio-core
-       ];
-       homepage = "https://github.com/prowdsponsor/nonce";
-       description = "Generate cryptographic nonces";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "nonce_1_0_7" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
      , transformers, unliftio, unliftio-core
      }:
@@ -149753,7 +147218,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/nonce";
        description = "Generate cryptographic nonces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nondeterminism" = callPackage
@@ -150684,7 +148148,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "nvim-hs_0_2_4" = callPackage
+  "nvim-hs" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, data-default
      , deepseq, directory, dyre, exceptions, filepath, foreign-store
@@ -150721,46 +148185,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "nvim-hs" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
-     , cereal-conduit, conduit, conduit-extra, containers, data-default
-     , deepseq, directory, dyre, exceptions, filepath, foreign-store
-     , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec
-     , messagepack, monad-control, mtl, network, optparse-applicative
-     , process, QuickCheck, resourcet, setenv, stm, streaming-commons
-     , template-haskell, text, time, time-locale-compat, transformers
-     , transformers-base, utf8-string, void
-     }:
-     mkDerivation {
-       pname = "nvim-hs";
-       version = "0.2.5";
-       sha256 = "1qiypd9cn80zjk38p572rbyfsrlff6a2qwvfj7ck3jdj5vv1dq2b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default deepseq directory dyre
-         exceptions filepath foreign-store hslogger lifted-base megaparsec
-         messagepack monad-control mtl network optparse-applicative process
-         resourcet setenv stm streaming-commons template-haskell text time
-         time-locale-compat transformers transformers-base utf8-string void
-       ];
-       executableHaskellDepends = [ base data-default ];
-       testHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default directory dyre exceptions
-         filepath foreign-store hslogger hspec hspec-discover HUnit
-         lifted-base megaparsec messagepack mtl network optparse-applicative
-         process QuickCheck resourcet setenv stm streaming-commons
-         template-haskell text time time-locale-compat transformers
-         transformers-base utf8-string
-       ];
-       homepage = "https://github.com/neovimhaskell/nvim-hs";
-       description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -153117,22 +150541,6 @@ self: {
      }) {};
 
   "optparse-generic" = callPackage
-    ({ mkDerivation, base, bytestring, Only, optparse-applicative
-     , semigroups, system-filepath, text, time, transformers, void
-     }:
-     mkDerivation {
-       pname = "optparse-generic";
-       version = "1.2.3";
-       sha256 = "1wxzpj4xj3bafg3piarwsr69xxzp75fdglx9c3spbahl1aq9wzgk";
-       libraryHaskellDepends = [
-         base bytestring Only optparse-applicative semigroups
-         system-filepath text time transformers void
-       ];
-       description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-generic_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, Only, optparse-applicative
      , semigroups, system-filepath, text, time, transformers, void
      }:
@@ -153146,7 +150554,6 @@ self: {
        ];
        description = "Auto-generate a command-line parser for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -153926,6 +151333,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packdeps_0_4_5" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , filepath, optparse-applicative, process, semigroups, split, tar
+     , text, time
+     }:
+     mkDerivation {
+       pname = "packdeps";
+       version = "0.4.5";
+       sha256 = "07nsnxxs5y77w0v5dxw9mqgq98s3riws5846qshlnhq4l5q73php";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath split tar text
+         time
+       ];
+       executableHaskellDepends = [
+         base Cabal containers optparse-applicative process semigroups
+       ];
+       homepage = "http://packdeps.haskellers.com/";
+       description = "Check your cabal packages for lagging dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "packed" = callPackage
     ({ mkDerivation, base, containers, gauge, ghc-prim, hedgehog
      , primitive, tasty, tasty-hedgehog, tasty-hunit
@@ -154288,55 +151719,6 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , binary, blaze-html, blaze-markup, bytestring, Cabal
-     , case-insensitive, cmark-gfm, containers, criterion, data-default
-     , deepseq, Diff, directory, doctemplates, executable-path, filepath
-     , Glob, haddock-library, hslua, hslua-module-text, HTTP
-     , http-client, http-client-tls, http-types, JuicyPixels, mtl
-     , network, network-uri, pandoc-types, parsec, process, QuickCheck
-     , random, safe, scientific, SHA, skylighting, split, syb, tagsoup
-     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, temporary
-     , texmath, text, time, unix, unordered-containers, vector, xml
-     , yaml, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "2.0.6";
-       sha256 = "1vhj6splykksb1mkxv5cs0361nj12qn23a3y1i8j5dc637lkdwpj";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring binary blaze-html
-         blaze-markup bytestring case-insensitive cmark-gfm containers
-         data-default deepseq directory doctemplates filepath Glob
-         haddock-library hslua hslua-module-text HTTP http-client
-         http-client-tls http-types JuicyPixels mtl network network-uri
-         pandoc-types parsec process random safe scientific SHA skylighting
-         split syb tagsoup temporary texmath text time unix
-         unordered-containers vector xml yaml zip-archive zlib
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base64-bytestring bytestring containers Diff directory
-         executable-path filepath hslua pandoc-types process QuickCheck
-         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
-         zip-archive
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion text time
-       ];
-       doCheck = false;
-       homepage = "http://pandoc.org";
-       description = "Conversion between markup formats";
-       license = "GPL";
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_2_1_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -154384,46 +151766,10 @@ self: {
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, containers, data-default, directory, filepath, hs-bibutils
-     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.12.2.5";
-       sha256 = "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath mtl pandoc
-         pandoc-types process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_14_1_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
      , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -154456,7 +151802,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -154756,6 +152101,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-types_1_17_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.17.4";
+       sha256 = "0ng8nxrx85wl5fqsjfzmbhwimkqvblwplzkn8ra93pgpvqpnmrk5";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit QuickCheck string-qq syb
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "http://johnmacfarlane.net/pandoc";
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -156312,6 +153682,7 @@ self: {
          async base conduit filepath QuickCheck quickcheck-unicode
          template-haskell temporary text yaml
        ];
+       doHaddock = false;
        homepage = "https://github.com/PasswordManager/passman-core#readme";
        description = "Deterministic password generator core";
        license = stdenv.lib.licenses.gpl3;
@@ -157654,30 +155025,6 @@ self: {
      }) {};
 
   "perf" = callPackage
-    ({ mkDerivation, base, containers, doctest, foldl, formatting
-     , numhask, optparse-generic, protolude, rdtsc, tdigest, text, time
-     , vector
-     }:
-     mkDerivation {
-       pname = "perf";
-       version = "0.3.0";
-       sha256 = "0l8q2jc3gfyair7x7jlx6aqs25m9f2ib9hdmzc3vfrh91ky67x1q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers foldl numhask protolude rdtsc tdigest time
-       ];
-       executableHaskellDepends = [
-         base formatting numhask optparse-generic protolude text vector
-       ];
-       testHaskellDepends = [ base doctest protolude ];
-       homepage = "https://github.com/tonyday567/perf";
-       description = "low-level performance statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "perf_0_3_1_1" = callPackage
     ({ mkDerivation, base, containers, doctest, foldl, formatting
      , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest
      , text, time, vector
@@ -157887,28 +155234,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistent" = callPackage
+  "persistent_2_7_3_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
-     , exceptions, fast-logger, hspec, http-api-data, lifted-base
-     , monad-control, monad-logger, mtl, old-locale, path-pieces
-     , resource-pool, resourcet, scientific, silently, tagged
-     , template-haskell, text, time, transformers, transformers-base
-     , unordered-containers, vector
+     , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data
+     , lifted-base, monad-control, monad-logger, mtl, old-locale
+     , path-pieces, resource-pool, resourcet, scientific, silently
+     , tagged, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers, vector
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.7.1";
-       sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2";
+       version = "2.7.3.1";
+       sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p";
        revision = "1";
-       editedCabalFile = "0ag2fd1iaiwiviskr5qzhgq7a0vr5x7vjq9zi75j25lahrqxxfm1";
+       editedCabalFile = "17kdzvhakjqkif1xxrbgh1lwjd0sfd0ikl1jxrjn4il16jy7gazz";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
-         bytestring conduit containers exceptions fast-logger http-api-data
-         lifted-base monad-control monad-logger mtl old-locale path-pieces
-         resource-pool resourcet scientific silently tagged template-haskell
-         text time transformers transformers-base unordered-containers
-         vector
+         bytestring conduit containers exceptions fast-logger
+         haskell-src-meta http-api-data lifted-base monad-control
+         monad-logger mtl old-locale path-pieces resource-pool resourcet
+         scientific silently tagged template-haskell text time transformers
+         transformers-base unordered-containers vector
        ];
        testHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
@@ -157920,10 +155267,11 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent_2_8_1" = callPackage
+  "persistent" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
      , fast-logger, haskell-src-meta, hspec, http-api-data
@@ -157953,7 +155301,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -158095,26 +155442,6 @@ self: {
      }) {};
 
   "persistent-mongoDB" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal
-     , conduit, containers, http-api-data, monad-control, mongoDB
-     , network, path-pieces, persistent, resource-pool, resourcet, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mongoDB";
-       version = "2.6.0";
-       sha256 = "1y94k4ymrwb1p881gzf6g3ppv41dsvc097cq4myfjcm22xaf4kp3";
-       libraryHaskellDepends = [
-         aeson attoparsec base bson bytestring cereal conduit containers
-         http-api-data monad-control mongoDB network path-pieces persistent
-         resource-pool resourcet text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using mongoDB";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-mongoDB_2_8_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal
      , conduit, containers, http-api-data, mongoDB, network, path-pieces
      , persistent, resource-pool, resourcet, text, time, transformers
@@ -158132,29 +155459,9 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-control, monad-logger, mysql, mysql-simple
-     , persistent, resource-pool, resourcet, text, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mysql";
-       version = "2.6.2.1";
-       sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers
-         monad-control monad-logger mysql mysql-simple persistent
-         resource-pool resourcet text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-mysql_2_8_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-logger, mysql, mysql-simple, persistent
      , resource-pool, resourcet, text, transformers, unliftio-core
@@ -158171,36 +155478,9 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , io-streams, monad-control, monad-logger, mysql-haskell, network
-     , persistent, persistent-template, resource-pool, resourcet, text
-     , time, tls, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mysql-haskell";
-       version = "0.3.6";
-       sha256 = "1a829hrbsa54qikbnafv7vk7shzyg0697nvj43md19p172mkwj93";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers io-streams monad-control
-         monad-logger mysql-haskell network persistent resource-pool
-         resourcet text time tls transformers
-       ];
-       executableHaskellDepends = [
-         base monad-logger persistent persistent-template transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       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_4_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-logger, mysql-haskell, network, persistent
      , persistent-template, resource-pool, resourcet, text, time, tls
@@ -158261,27 +155541,6 @@ self: {
      }) {};
 
   "persistent-postgresql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-control, monad-logger, persistent
-     , postgresql-libpq, postgresql-simple, resource-pool, resourcet
-     , text, time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-postgresql";
-       version = "2.6.3";
-       sha256 = "0yr384b77mp8z7k8mjmdbsqrrqplymcy9rfy6lm1v3ff81g52vli";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers
-         monad-control monad-logger persistent postgresql-libpq
-         postgresql-simple resource-pool resourcet text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using postgresql";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-postgresql_2_8_2_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-logger, persistent, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -158299,7 +155558,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -158395,7 +155653,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "persistent-sqlite" = callPackage
+  "persistent-sqlite_2_6_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-control, monad-logger, old-locale
      , persistent, persistent-template, resource-pool, resourcet
@@ -158419,10 +155677,11 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-sqlite_2_8_1_2" = callPackage
+  "persistent-sqlite" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-logger, old-locale, persistent
      , persistent-template, resource-pool, resourcet, temporary, text
@@ -158446,7 +155705,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -158721,17 +155979,18 @@ self: {
 
   "pg-harness-server" = callPackage
     ({ mkDerivation, async, base, ini, postgresql-simple, random
-     , scotty, text, transformers
+     , scotty, text, transformers, warp
      }:
      mkDerivation {
        pname = "pg-harness-server";
-       version = "0.5.0";
-       sha256 = "1h14lbjygvdsq0g5yp0c3jnkayrzscw9dsllz0s4jzfg9hzskwa1";
+       version = "0.5.1";
+       sha256 = "0l7g99wh2znn3y3ma862j6yrmxdl9bjg2p4qaqf4iijxqxcrb1lq";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
+         warp
        ];
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
@@ -159456,32 +156715,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, monad-logger, mtl
-     , network, profunctors, QuickCheck, random, safe-exceptions
-     , semigroups, text, time, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.12.8";
-       sha256 = "0k9lyk3h108y3zyvqz1krr08cqf4fahg4lh4f5fn1spgz46q3dwk";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-client http-client-tls
-         http-types monad-logger mtl network profunctors random
-         safe-exceptions text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck
-         safe-exceptions semigroups text time transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/jonschoning/pinboard";
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_9_12_9" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -159505,7 +156738,6 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -160115,22 +157347,6 @@ self: {
      }) {};
 
   "pipes-extras" = callPackage
-    ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework
-     , test-framework-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-extras";
-       version = "1.0.12";
-       sha256 = "0sr7n0p8nwsyp52dybq3lgswz353jc239hysqlxhlsa4hh1l5q61";
-       libraryHaskellDepends = [ base foldl lens pipes transformers ];
-       testHaskellDepends = [
-         base HUnit pipes test-framework test-framework-hunit transformers
-       ];
-       description = "Extra utilities for pipes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-extras_1_0_13" = callPackage
     ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework
      , test-framework-hunit, transformers
      }:
@@ -160144,7 +157360,6 @@ self: {
        ];
        description = "Extra utilities for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -160214,22 +157429,6 @@ self: {
      }) {};
 
   "pipes-group" = callPackage
-    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
-     , pipes-parse, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-group";
-       version = "1.0.8";
-       sha256 = "0zcmhq46972zxjj5nmr46fdvvwb3q0i42q9m70i758a3iwkmnr3a";
-       libraryHaskellDepends = [
-         base free pipes pipes-parse transformers
-       ];
-       testHaskellDepends = [ base doctest lens-family-core ];
-       description = "Group streams into substreams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-group_1_0_9" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
      }:
@@ -160243,7 +157442,6 @@ self: {
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-http" = callPackage
@@ -161953,6 +159151,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "poly-cont" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "poly-cont";
+       version = "0.1.0.0";
+       sha256 = "05pkz6v2xyva73ibb5v97c7fh5zjpvkhahfgnnxycrlnsag5ckgy";
+       libraryHaskellDepends = [ base mtl transformers ];
+       description = "Poly-kinded continuations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "poly-control" = callPackage
     ({ mkDerivation, base, lens }:
      mkDerivation {
@@ -162957,22 +160166,6 @@ self: {
      }) {};
 
   "postgresql-libpq" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
-     mkDerivation {
-       pname = "postgresql-libpq";
-       version = "0.9.4.0";
-       sha256 = "15laa8m6i4girhr0i3xscgsl30iqj61mx5vbl67wasb8rwx0pi82";
-       revision = "1";
-       editedCabalFile = "0s1xyl25jn3miysc7i61wf2klm7blnczb0yhnf7hmv3ilpfsqghy";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring unix ];
-       librarySystemDepends = [ postgresql ];
-       homepage = "https://github.com/lpsmith/postgresql-libpq";
-       description = "low-level binding to libpq";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) postgresql;};
-
-  "postgresql-libpq_0_9_4_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
      mkDerivation {
        pname = "postgresql-libpq";
@@ -162984,7 +160177,6 @@ self: {
        homepage = "https://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-named" = callPackage
@@ -163515,8 +160707,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.10.3";
-       sha256 = "0q4pdmikv395gk9ahiild76g3gh9sa924w57dmlc2ly6gqk01mhh";
+       version = "0.11.1";
+       sha256 = "1xmxdlg213y1v09akc853zymbkxpg6pkfspwjb0g1kvnirjlj0rj";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
          potoki-core profunctors text transformers unagi-chan
@@ -163538,8 +160730,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.1.5";
-       sha256 = "1p24iv5mymyrw8q8y4k6zhzq3qd8z62ai0sfx2mh29in4s1y508y";
+       version = "0.1.6";
+       sha256 = "0mr3wv8mx88xzbkcrndq833wcq753dyp9z4610pxa34cfalnbvhf";
        libraryHaskellDepends = [
          base base-prelude bytestring cereal potoki potoki-core text
        ];
@@ -163748,18 +160940,6 @@ self: {
      }) {};
 
   "pqueue" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "pqueue";
-       version = "1.3.2.3";
-       sha256 = "062l0vm4yymlm7vahczczpm29awgaksv0sdy532g7jlspi78nara";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       description = "Reliable, persistent, fast priority queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pqueue_1_4_1_1" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "pqueue";
@@ -163769,7 +160949,6 @@ self: {
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -164025,8 +161204,8 @@ self: {
     ({ mkDerivation, base, hspec, regex-pcre-builtin }:
      mkDerivation {
        pname = "prefix-expression";
-       version = "1.2.4";
-       sha256 = "03gnfh84vpd66i8mnnx5y1ci20p7ykic9cnnsvz3bddfvwp4silr";
+       version = "1.2.5";
+       sha256 = "0z1s74iw87qkfaa7v8a3m91w2phmkp02yiz5xk8w2w4jz72x3x0b";
        libraryHaskellDepends = [ base regex-pcre-builtin ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/VonFry/prefix-expression";
@@ -164476,26 +161655,6 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
-       version = "2.0.2.1";
-       sha256 = "16hnx6ra46m9i0q12b1xlbizv0vm76sqmfgj7w2l4ghw8ddciy8f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base containers mtl parsec text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/cdepillabout/pretty-simple";
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pretty-simple_2_1_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, criterion
      , doctest, Glob, mtl, parsec, text, transformers
      }:
@@ -164513,7 +161672,6 @@ self: {
        homepage = "https://github.com/cdepillabout/pretty-simple";
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -164589,31 +161747,6 @@ self: {
      }) {};
 
   "prettyprinter" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
-     , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "prettyprinter";
-       version = "1.1.1";
-       sha256 = "1kzfgwpsg3br3dkvqjhldv1bjqw7k8sg3xqinkk3c1219pk2xcx0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base bytestring doctest pgp-wordlist tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         ansi-wl-pprint base containers criterion deepseq mtl QuickCheck
-         random text transformers
-       ];
-       homepage = "http://github.com/quchen/prettyprinter";
-       description = "A modern, easy to use, well-documented, extensible prettyprinter";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "prettyprinter_1_2_0_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
      , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers
@@ -164636,7 +161769,6 @@ self: {
        homepage = "http://github.com/quchen/prettyprinter";
        description = "A modern, easy to use, well-documented, extensible prettyprinter";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
@@ -165495,23 +162627,6 @@ self: {
      }) {};
 
   "product-profunctors" = callPackage
-    ({ mkDerivation, base, contravariant, profunctors, tagged
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "product-profunctors";
-       version = "0.8.0.3";
-       sha256 = "1j8cqhx2691pxnb4kwwbm3a3fzq2lyaic00yy5g3112gpb3b392g";
-       libraryHaskellDepends = [
-         base contravariant profunctors tagged template-haskell
-       ];
-       testHaskellDepends = [ base profunctors ];
-       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
-       description = "product-profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "product-profunctors_0_9_0_0" = callPackage
     ({ mkDerivation, base, bifunctors, contravariant, criterion
      , deepseq, profunctors, tagged, template-haskell
      }:
@@ -165527,7 +162642,6 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prof2dot" = callPackage
@@ -166772,6 +163886,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "psqueues_0_2_6_0" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
+     , QuickCheck, random, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, unordered-containers
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.6.0";
+       sha256 = "0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree-psqueue ghc-prim
+         hashable mtl PSQueue random unordered-containers
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pstemmer" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -166843,22 +163981,6 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, criterion, filepath, hspec, random
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "publicsuffix";
-       version = "0.20170802";
-       sha256 = "0a2cfvf7ahaic62jn80sazmraqny20mcfsr6j8bji9fcgxjj150w";
-       libraryHaskellDepends = [ base filepath template-haskell ];
-       testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
-       description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "publicsuffix_0_20171229" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
@@ -166872,7 +163994,6 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -167983,19 +165104,6 @@ self: {
      }) {};
 
   "qchas" = callPackage
-    ({ mkDerivation, base, hmatrix, random, tasty, tasty-hunit }:
-     mkDerivation {
-       pname = "qchas";
-       version = "1.0.1.0";
-       sha256 = "12hvhprcpwznxkdl2165ydsrh1r10xz4q4px1dyzyy5i8pkmddam";
-       libraryHaskellDepends = [ base hmatrix random ];
-       testHaskellDepends = [ base hmatrix tasty tasty-hunit ];
-       homepage = "https://github.com/ardeleanasm/qchas#readme";
-       description = "A library for implementing Quantum Algorithms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "qchas_1_1_0_0" = callPackage
     ({ mkDerivation, base, hmatrix, linear, random, tasty, tasty-hunit
      }:
      mkDerivation {
@@ -168010,7 +165118,6 @@ self: {
        homepage = "https://github.com/ardeleanasm/qchas#readme";
        description = "A library for implementing Quantum Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qd" = callPackage
@@ -168094,23 +165201,6 @@ self: {
      }) {};
 
   "qm-interpolated-string" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "qm-interpolated-string";
-       version = "0.2.1.0";
-       sha256 = "09qzlhrzhv0hcc7m8qwfh64nprf3wq4x9lrcdnqpqw2airh5cbn3";
-       libraryHaskellDepends = [
-         base bytestring haskell-src-meta template-haskell text
-       ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/unclechu/haskell-qm-interpolated-string";
-       description = "Implementation of interpolated multiline strings";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "qm-interpolated-string_0_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
      , template-haskell, text
      }:
@@ -168125,7 +165215,6 @@ self: {
        homepage = "https://github.com/unclechu/haskell-qm-interpolated-string";
        description = "Implementation of interpolated multiline strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qq-literals" = callPackage
@@ -168707,23 +165796,6 @@ self: {
      }) {};
 
   "quickcheck-arbitrary-adt" = callPackage
-    ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "quickcheck-arbitrary-adt";
-       version = "0.2.0.0";
-       sha256 = "1ny04h3kxqdhlfxbvcdzsl6n7vgs5xdk9p0b9hb2jpvqlazqv6fr";
-       libraryHaskellDepends = [ base QuickCheck ];
-       testHaskellDepends = [
-         base hspec lens QuickCheck template-haskell transformers
-       ];
-       homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme";
-       description = "Generic typeclasses for generating arbitrary ADTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-arbitrary-adt_0_3_1_0" = callPackage
     ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell
      , transformers
      }:
@@ -168738,7 +165810,6 @@ self: {
        homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme";
        description = "Generic typeclasses for generating arbitrary ADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-arbitrary-template" = callPackage
@@ -170146,6 +167217,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "random-names" = callPackage
+    ({ mkDerivation, base, QuickCheck, random, safe, text }:
+     mkDerivation {
+       pname = "random-names";
+       version = "0.1.0.0";
+       sha256 = "1sj88ccw4pnqlwbga78pvsvzib4irg7xzz4lhqs89xkdz7l043dy";
+       libraryHaskellDepends = [ base QuickCheck random safe text ];
+       homepage = "https://github.com/aiya000/hs-random-names";
+       description = "Expose Random and Arbitrary instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "random-shuffle" = callPackage
     ({ mkDerivation, base, MonadRandom, random }:
      mkDerivation {
@@ -170722,6 +167805,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rasterific-svg_0_3_3_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
+     , optparse-applicative, primitive, Rasterific, scientific, svg-tree
+     , text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "rasterific-svg";
+       version = "0.3.3.1";
+       sha256 = "110ivmmgajv232hyg9pc30lzg3l72q8ykyp1zrjs3k5n309ymdfn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath FontyFruity
+         JuicyPixels lens linear mtl primitive Rasterific scientific
+         svg-tree text transformers vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative Rasterific svg-tree
+       ];
+       description = "SVG renderer based on Rasterific";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rate-limit" = callPackage
     ({ mkDerivation, base, stm, time, time-units }:
      mkDerivation {
@@ -170735,25 +167844,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, hspec, http-client, http-client-tls
-     , http-types, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "0.3.10";
-       sha256 = "10cqg2rrr8fx57r0vhw37wrv92243lzi2mp7ghsl3kkl1n73qz8n";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base filepath hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, hspec, http-client, http-client-tls
      , http-types, text, uuid
@@ -170770,26 +167860,9 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-client, ratel, wai
-     }:
-     mkDerivation {
-       pname = "ratel-wai";
-       version = "0.3.2";
-       sha256 = "1f38xivw19ic002idr936859rwmz2g9nmhbwxvsf4fw3lm31qwpa";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-client ratel wai
-       ];
-       homepage = "https://github.com/tfausak/ratel-wai#readme";
-       description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel-wai_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
      }:
@@ -170803,7 +167876,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel-wai#readme";
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rating-systems" = callPackage
@@ -170831,38 +167903,6 @@ self: {
      }) {};
 
   "rattletrap" = callPackage
-    ({ mkDerivation, aeson, base, bimap, binary, binary-bits
-     , bytestring, containers, data-binary-ieee754, filepath, hspec
-     , http-client, http-client-tls, template-haskell, temporary, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "rattletrap";
-       version = "3.1.2";
-       sha256 = "0b0f5lkh8m96qg3m8wgnhpamqjndspa6ysf0lq013qbk9nvlvla8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 http-client http-client-tls template-haskell
-         text vector
-       ];
-       executableHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 http-client http-client-tls template-haskell
-         text vector
-       ];
-       testHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 filepath hspec http-client http-client-tls
-         template-haskell temporary text vector
-       ];
-       homepage = "https://github.com/tfausak/rattletrap#readme";
-       description = "Parse and generate Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rattletrap_4_0_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
      , bytestring, containers, filepath, http-client, http-client-tls
      , HUnit, template-haskell, temporary, text, transformers
@@ -170891,7 +167931,6 @@ self: {
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell" = callPackage
@@ -171139,8 +168178,8 @@ self: {
        pname = "rcu";
        version = "0.2.2";
        sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk";
-       revision = "1";
-       editedCabalFile = "0kq7g4wplri8xnp6b1xvxd74vl60dhdkz0p3994swy7dbk8b7vic";
+       revision = "2";
+       editedCabalFile = "0s9rd1ys6y770xwfgljmrkyw968jqwsa39xpa3x88wzb93qzypmr";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -171901,28 +168940,6 @@ self: {
      }) {};
 
   "rebase" = callPackage
-    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
-     , containers, contravariant, contravariant-extras, deepseq, dlist
-     , either, fail, hashable, mtl, profunctors, scientific
-     , semigroupoids, semigroups, stm, text, time, transformers
-     , unordered-containers, uuid, vector, void
-     }:
-     mkDerivation {
-       pname = "rebase";
-       version = "1.1.1";
-       sha256 = "0rhfpdh8hmna02pbiljkiy623sdy1nqk60azr43cdx5q9aw1b3jy";
-       libraryHaskellDepends = [
-         base base-prelude bifunctors bytestring containers contravariant
-         contravariant-extras deepseq dlist either fail hashable mtl
-         profunctors scientific semigroupoids semigroups stm text time
-         transformers unordered-containers uuid vector void
-       ];
-       homepage = "https://github.com/nikita-volkov/rebase";
-       description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rebase_1_2_3" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , containers, contravariant, contravariant-extras, deepseq, dlist
      , either, fail, hashable, mtl, profunctors, scientific
@@ -171942,7 +168959,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/rebase";
        description = "A more progressive alternative to the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -173380,24 +170396,6 @@ self: {
      }) {};
 
   "regex-tdfa" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
-     , parsec, regex-base
-     }:
-     mkDerivation {
-       pname = "regex-tdfa";
-       version = "1.2.2";
-       sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb";
-       revision = "1";
-       editedCabalFile = "0m2i94gm6a1m6sn3mj47jbnmjp5ksiqmdn6v4pdr7xsv5a15gfwn";
-       libraryHaskellDepends = [
-         array base bytestring containers ghc-prim mtl parsec regex-base
-       ];
-       homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-tdfa_1_2_3" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
      , parsec, regex-base
      }:
@@ -173411,7 +170409,6 @@ self: {
        homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-pipes" = callPackage
@@ -174419,6 +171416,8 @@ self: {
        pname = "repa";
        version = "3.4.1.3";
        sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
+       revision = "1";
+       editedCabalFile = "08n1c94kds39p5gaz46cij4swycr49jz7jhpr669jf68limhrqk6";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -174433,6 +171432,8 @@ self: {
        pname = "repa-algorithms";
        version = "3.4.1.2";
        sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87";
+       revision = "1";
+       editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k";
        libraryHaskellDepends = [ base repa vector ];
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
@@ -174524,8 +171525,8 @@ self: {
        pname = "repa-examples";
        version = "3.4.1.1";
        sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
-       revision = "1";
-       editedCabalFile = "0acl57w635zi1il4r4jxzp3r1kd0zdqdiihinpbla5vnp3a5zg13";
+       revision = "2";
+       editedCabalFile = "1ljqrqlk5h34q4mg6qipx5qsgz8fhp51p5mfkzv822d7v5qdsnv7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174585,8 +171586,8 @@ self: {
        pname = "repa-io";
        version = "3.4.1.1";
        sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm";
-       revision = "1";
-       editedCabalFile = "0z0wbaz7svqdzjpmx7d9wwfjl31w0i29pcc1v11r26f9avw3g9qi";
+       revision = "2";
+       editedCabalFile = "0zslqm87abzrsbrw2dlnsmm8jnpvg7ldi2d83d7p5sih78ksfmmm";
        libraryHaskellDepends = [
          base binary bmp bytestring old-time repa vector
        ];
@@ -175283,7 +172284,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet" = callPackage
+  "resourcet_1_1_11" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat, unliftio-core
@@ -175300,9 +172301,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet_1_2_0" = callPackage
+  "resourcet" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, mtl
      , primitive, transformers, unliftio-core
      }:
@@ -175317,7 +172319,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "respond" = callPackage
@@ -175351,29 +172352,6 @@ self: {
      }) {};
 
   "rest-client" = callPackage
-    ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive
-     , data-default, exceptions, http-client, http-conduit, http-types
-     , hxt, hxt-pickle-utils, monad-control, mtl, resourcet, rest-types
-     , tostring, transformers, transformers-base, transformers-compat
-     , uri-encode, utf8-string
-     }:
-     mkDerivation {
-       pname = "rest-client";
-       version = "0.5.1.1";
-       sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x";
-       revision = "2";
-       editedCabalFile = "0issr73rbnyaqfgx4c0wsy9sq948sqrkima2cr2sb1lkf8n4ihr8";
-       libraryHaskellDepends = [
-         aeson-utils base bytestring case-insensitive data-default
-         exceptions http-client http-conduit http-types hxt hxt-pickle-utils
-         monad-control mtl resourcet rest-types tostring transformers
-         transformers-base transformers-compat uri-encode utf8-string
-       ];
-       description = "Utility library for use in generated API client libraries";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rest-client_0_5_2_1" = callPackage
     ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive
      , data-default, exceptions, http-client, http-conduit, http-types
      , hxt, hxt-pickle-utils, monad-control, mtl, resourcet, rest-types
@@ -175392,7 +172370,6 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-core" = callPackage
@@ -178094,19 +175071,6 @@ self: {
      }) {};
 
   "safe" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "safe";
-       version = "0.3.15";
-       sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
-       description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "safe_0_3_17" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
@@ -178117,7 +175081,6 @@ self: {
        homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-access" = callPackage
@@ -178133,21 +175096,6 @@ self: {
      }) {};
 
   "safe-exceptions" = callPackage
-    ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
-     , void
-     }:
-     mkDerivation {
-       pname = "safe-exceptions";
-       version = "0.1.6.0";
-       sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i";
-       libraryHaskellDepends = [ base deepseq exceptions transformers ];
-       testHaskellDepends = [ base hspec void ];
-       homepage = "https://github.com/fpco/safe-exceptions#readme";
-       description = "Safe, consistent, and easy exception handling";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "safe-exceptions_0_1_7_0" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
      , void
      }:
@@ -178155,14 +175103,13 @@ self: {
        pname = "safe-exceptions";
        version = "0.1.7.0";
        sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
-       revision = "2";
-       editedCabalFile = "01n9yyhqa1xzsi2mk4if7p0zqdxcwr8f44vbbj01hx9152xs7j4k";
+       revision = "3";
+       editedCabalFile = "0y1b9pw5wriyiffcmvk9g53imh6lm5fgfbjsgpn2w96qspaagdb5";
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        homepage = "https://github.com/fpco/safe-exceptions#readme";
        description = "Safe, consistent, and easy exception handling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-exceptions-checked" = callPackage
@@ -178328,29 +175275,6 @@ self: {
      }) {};
 
   "safecopy" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
-     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
-     , tasty-quickcheck, template-haskell, text, time, vector
-     }:
-     mkDerivation {
-       pname = "safecopy";
-       version = "0.9.3.3";
-       sha256 = "17msazxg0iqvmsn4cwlnr1hwcw5bfp276zsg7x5r47ifi9j748nb";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers old-time template-haskell
-         text time vector
-       ];
-       testHaskellDepends = [
-         array base cereal containers lens lens-action QuickCheck
-         quickcheck-instances tasty tasty-quickcheck template-haskell time
-         vector
-       ];
-       homepage = "https://github.com/acid-state/safecopy";
-       description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "safecopy_0_9_4" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -178371,7 +175295,6 @@ self: {
        homepage = "https://github.com/acid-state/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -179195,34 +176118,6 @@ self: {
      }) {};
 
   "sbv" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , crackNum, data-binary-ieee754, deepseq, directory, doctest
-     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
-     , process, QuickCheck, random, syb, tasty, tasty-golden
-     , tasty-hunit, template-haskell, time, z3
-     }:
-     mkDerivation {
-       pname = "sbv";
-       version = "7.4";
-       sha256 = "0yylg2zdrcqzckhmlz9d5chac1jawbnrdp7fn49ia1nsl0i3jggc";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base containers crackNum data-binary-ieee754 deepseq
-         directory filepath generic-deriving ghc mtl pretty process
-         QuickCheck random syb template-haskell time
-       ];
-       testHaskellDepends = [
-         base bytestring data-binary-ieee754 directory doctest filepath Glob
-         hlint mtl random syb tasty tasty-golden tasty-hunit
-         template-haskell
-       ];
-       testSystemDepends = [ z3 ];
-       homepage = "http://leventerkok.github.com/sbv/";
-       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) z3;};
-
-  "sbv_7_5" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
@@ -179248,7 +176143,6 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -179854,6 +176748,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_5_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.5.3";
+       sha256 = "0j67qa7iqlkx0l9xlgxsyzv53bnrs7fdhv2xj1zlnkn22wsd39hj";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq hashable integer-gmp
+         integer-logarithms primitive text
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -180482,26 +177401,6 @@ self: {
      }) {};
 
   "sdl2" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
-     , StateVar, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "sdl2";
-       version = "2.3.0.1";
-       sha256 = "1cyp3afs89xsqn3hxzk1223vpbifr1w2faczqfkii3irdgpqjl6k";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring exceptions linear StateVar text transformers vector
-       ];
-       librarySystemDepends = [ SDL2 ];
-       libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) SDL2;};
-
-  "sdl2_2_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
      , StateVar, text, transformers, vector
      }:
@@ -180519,7 +177418,6 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        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
@@ -180613,29 +177511,6 @@ self: {
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-mixer" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, lifted-base
-     , monad-control, sdl2, SDL2_mixer, template-haskell, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "sdl2-mixer";
-       version = "0.1";
-       sha256 = "1h1b5q5jrns4ia5ih9qrhqvld96vfc1f4z1m5pcyx1qwkqfz696r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring data-default-class lifted-base monad-control sdl2
-         template-haskell text transformers vector
-       ];
-       librarySystemDepends = [ SDL2_mixer ];
-       libraryPkgconfigDepends = [ SDL2_mixer ];
-       executableHaskellDepends = [ base data-default-class sdl2 vector ];
-       description = "Bindings to SDL2_mixer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) SDL2_mixer;};
-
-  "sdl2-mixer_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, lifted-base
      , monad-control, sdl2, SDL2_mixer, template-haskell, vector
      }:
@@ -181282,30 +178157,6 @@ self: {
      }) {};
 
   "semigroupoids" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, Cabal
-     , cabal-doctest, comonad, containers, contravariant, distributive
-     , doctest, hashable, semigroups, tagged, transformers
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "semigroupoids";
-       version = "5.2.1";
-       sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r";
-       revision = "4";
-       editedCabalFile = "0izc33v2n2321hc4ssr1b8fj85i91ca6c99w1qhdqnnp1sank7sk";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad containers contravariant
-         distributive hashable semigroups tagged transformers
-         transformers-compat unordered-containers
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/semigroupoids";
-       description = "Semigroupoids: Category sans id";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroupoids_5_2_2" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, Cabal
      , cabal-doctest, comonad, containers, contravariant, distributive
      , doctest, hashable, semigroups, tagged, template-haskell
@@ -181315,8 +178166,8 @@ self: {
        pname = "semigroupoids";
        version = "5.2.2";
        sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
-       revision = "2";
-       editedCabalFile = "1ps5v8c9w39jbcakg4vignza5mr4cjanxwh9y0hslwpm5mhh7326";
+       revision = "3";
+       editedCabalFile = "1k7iq54rkiqrx5kdcc6mc11agqqcnp1hgrw6c6rl3yjybz1vc5y4";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
@@ -181327,7 +178178,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -181594,6 +178444,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sentiwordnet-parser" = callPackage
+    ({ mkDerivation, base, Decimal, hashable, parsers, safe
+     , string-class, text, trifecta, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "sentiwordnet-parser";
+       version = "0.1.1.0";
+       sha256 = "0mb5c0n2i0gyyk94j4lnfpxzh8v2vxlq7dbp1v5gmz5ws7s9pfll";
+       libraryHaskellDepends = [
+         base Decimal hashable parsers safe string-class text trifecta
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/k-bx/sentiwordnet-parser#readme";
+       description = "Parser for the SentiWordNet tab-separated file";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sentry" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal, cmdargs
      , directory, filepath, old-locale, old-time, process, safecopy
@@ -182066,37 +178933,6 @@ self: {
      }) {};
 
   "servant" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
-     , bytestring, Cabal, cabal-doctest, case-insensitive, directory
-     , doctest, filemanip, filepath, hspec, http-api-data, http-media
-     , http-types, mmorph, mtl, natural-transformation, network-uri
-     , QuickCheck, quickcheck-instances, string-conversions, tagged
-     , text, url, vault
-     }:
-     mkDerivation {
-       pname = "servant";
-       version = "0.11";
-       sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5";
-       revision = "2";
-       editedCabalFile = "1b5zxz1cqf0n2y1jfvb1rsza95hdyhn9fc6fl73bxr5m9apv511z";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat bytestring case-insensitive
-         http-api-data http-media http-types mmorph mtl
-         natural-transformation network-uri string-conversions tagged text
-         vault
-       ];
-       testHaskellDepends = [
-         aeson aeson-compat attoparsec base base-compat bytestring directory
-         doctest filemanip filepath hspec QuickCheck quickcheck-instances
-         string-conversions text url
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "A family of combinators for defining webservices APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant_0_13" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
      , bytestring, Cabal, cabal-doctest, case-insensitive, doctest
      , hspec, hspec-discover, http-api-data, http-media, http-types
@@ -182123,7 +178959,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-JuicyPixels" = callPackage
@@ -182214,35 +179049,6 @@ self: {
      }) {};
 
   "servant-auth-cookie" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , cereal, cookie, criterion, cryptonite, data-default, deepseq
-     , exceptions, hspec, http-api-data, http-types, memory, mtl
-     , QuickCheck, servant, servant-server, tagged, time, transformers
-     , wai
-     }:
-     mkDerivation {
-       pname = "servant-auth-cookie";
-       version = "0.5.0.5";
-       sha256 = "1ml7f452ikfwzymvajrs0fmlww7pbq5prphsv65r12n4pzx9ynva";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring blaze-builder bytestring cereal cookie
-         cryptonite data-default exceptions http-api-data http-types memory
-         mtl servant servant-server tagged time transformers wai
-       ];
-       testHaskellDepends = [
-         base bytestring cereal cryptonite data-default deepseq hspec
-         QuickCheck servant-server time transformers
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion cryptonite servant-server
-       ];
-       description = "Authentication via encrypted cookies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-cookie_0_6_0_3" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , cereal, cereal-time, cookie, criterion, cryptonite, data-default
      , deepseq, exceptions, hspec, http-api-data, http-types, memory
@@ -182270,7 +179076,6 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -182518,20 +179323,6 @@ self: {
      }) {};
 
   "servant-blaze" = callPackage
-    ({ mkDerivation, base, blaze-html, http-media, servant }:
-     mkDerivation {
-       pname = "servant-blaze";
-       version = "0.7.1";
-       sha256 = "0ii60xn5khsj8w3glvwqpwrpd6v9yc1n52gk9qsfwfxq49x1rvch";
-       revision = "6";
-       editedCabalFile = "051m44rqmxkl30n96qcbz1xwwsw2n7l7laflnc0xydc40ws0bj96";
-       libraryHaskellDepends = [ base blaze-html http-media servant ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Blaze-html support for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-blaze_0_8" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant
      , servant-server, wai, warp
      }:
@@ -182544,7 +179335,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-cassava" = callPackage
@@ -182570,33 +179360,6 @@ self: {
      }) {};
 
   "servant-checked-exceptions" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
-     , hspec-wai, http-media, profunctors, servant, servant-client
-     , servant-docs, servant-server, tagged, tasty, tasty-hspec
-     , tasty-hunit, text, wai
-     }:
-     mkDerivation {
-       pname = "servant-checked-exceptions";
-       version = "0.4.1.0";
-       sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g";
-       revision = "1";
-       editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq http-media profunctors servant
-         servant-client servant-docs servant-server tagged text
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hspec-wai servant servant-server tasty
-         tasty-hspec tasty-hunit wai
-       ];
-       homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
-       description = "Checked exceptions for Servant APIs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-checked-exceptions_1_1_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
      , hspec-wai, http-media, http-types, profunctors, servant
      , servant-client, servant-client-core, servant-docs, servant-server
@@ -182620,43 +179383,9 @@ self: {
        homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, deepseq, exceptions, generics-sop
-     , hspec, http-api-data, http-client, http-client-tls, http-media
-     , http-types, HUnit, monad-control, mtl, network, network-uri
-     , QuickCheck, safe, semigroupoids, servant, servant-server
-     , string-conversions, text, transformers, transformers-base
-     , transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-client";
-       version = "0.11";
-       sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga";
-       revision = "2";
-       editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat base64-bytestring bytestring
-         exceptions generics-sop http-api-data http-client http-client-tls
-         http-media http-types monad-control mtl network-uri safe
-         semigroupoids servant string-conversions text transformers
-         transformers-base transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring deepseq generics-sop hspec
-         http-api-data http-client http-media http-types HUnit mtl network
-         QuickCheck servant servant-server text transformers
-         transformers-compat wai warp
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "automatical derivation of querying functions for servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-client_0_13" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , containers, deepseq, exceptions, generics-sop, hspec
      , hspec-discover, http-api-data, http-client, http-client-tls
@@ -182685,7 +179414,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client-core" = callPackage
@@ -182772,34 +179500,6 @@ self: {
      }) {};
 
   "servant-docs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , case-insensitive, control-monad-omega, hashable, hspec
-     , http-media, http-types, lens, servant, string-conversions, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs";
-       version = "0.11";
-       sha256 = "02bzp1bcvc54cx0kcnnsqqiva7rwbrn46a7gdxzqqiqrmm0a0fm0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring case-insensitive
-         control-monad-omega hashable http-media http-types lens servant
-         string-conversions text unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base lens servant string-conversions text
-       ];
-       testHaskellDepends = [
-         aeson base hspec lens servant string-conversions
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-docs_0_11_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
      , hspec-discover, http-media, http-types, lens, servant
@@ -182826,7 +179526,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ede" = callPackage
@@ -182946,18 +179645,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.10.1";
-       sha256 = "1j69mv1i6q5z790asbj0n24h62biz3dlnm2zrxnmwn4k4aygbwl8";
-       libraryHaskellDepends = [ base http-types lens servant text ];
-       testHaskellDepends = [ base hspec servant ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_11" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
      }:
@@ -182972,7 +179659,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generic" = callPackage
@@ -183155,20 +179841,6 @@ self: {
      }) {};
 
   "servant-lucid" = callPackage
-    ({ mkDerivation, base, http-media, lucid, servant }:
-     mkDerivation {
-       pname = "servant-lucid";
-       version = "0.7.1";
-       sha256 = "0h7yw140ymigrzrzp2vkkhg13gg1d8pj9xmcpq8bw2cv2myvl9pc";
-       revision = "6";
-       editedCabalFile = "0bz3j6xjig6qj7qwkvzv9kqvivd6qvz0kn42lpwg1kcf1j6w31mc";
-       libraryHaskellDepends = [ base http-media lucid servant ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Servant support for lucid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-lucid_0_8" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant, servant-server
      , wai, warp
      }:
@@ -183181,7 +179853,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-match" = callPackage
@@ -183224,36 +179895,6 @@ self: {
      }) {};
 
   "servant-mock" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
-     , hspec, hspec-discover, hspec-wai, http-types, QuickCheck, servant
-     , servant-server, transformers, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-mock";
-       version = "0.8.3";
-       sha256 = "0fwkygv4rx98qys8apj7aby4xhssgzqdgsxmb6vh4ky71vjq0q5m";
-       revision = "2";
-       editedCabalFile = "00dq310ik9nm20mxxr9d46jilp9h6k54f5mdl1ii2ggwy2mck1dm";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring http-types QuickCheck servant servant-server
-         transformers wai
-       ];
-       executableHaskellDepends = [
-         aeson base QuickCheck servant-server warp
-       ];
-       testHaskellDepends = [
-         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
-         servant-server wai
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Derive a mock server for free from your servant API types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-mock_0_8_4" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , bytestring-conversion, hspec, hspec-discover, hspec-wai
      , http-types, QuickCheck, servant, servant-server, transformers
@@ -183280,7 +179921,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-multipart" = callPackage
@@ -183359,23 +179999,6 @@ self: {
      }) {};
 
   "servant-pandoc" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, http-media
-     , lens, pandoc-types, servant-docs, string-conversions, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-pandoc";
-       version = "0.4.1.4";
-       sha256 = "0hsmbrn7i6zbwfw5j2l8qppnjx1cl2g0iksim514ajga6zfjm96j";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive http-media lens pandoc-types
-         servant-docs string-conversions text unordered-containers
-       ];
-       description = "Use Pandoc to render servant API documentation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-pandoc_0_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, http-media
      , lens, pandoc-types, servant-docs, string-conversions, text
      , unordered-containers
@@ -183390,7 +180013,6 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -183609,21 +180231,6 @@ self: {
      }) {};
 
   "servant-ruby" = callPackage
-    ({ mkDerivation, base, casing, doctest, lens, QuickCheck
-     , servant-foreign, text
-     }:
-     mkDerivation {
-       pname = "servant-ruby";
-       version = "0.5.1.0";
-       sha256 = "0j1q8yl1cz8lwij17zl13rk35r0qnk8ibh963qlcd35w83wms56j";
-       libraryHaskellDepends = [ base casing lens servant-foreign text ];
-       testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "https://github.com/joneshf/servant-ruby#readme";
-       description = "Generate a Ruby client from a Servant API with Net::HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-ruby_0_7_0_0" = callPackage
     ({ mkDerivation, base, casing, doctest, lens, QuickCheck
      , servant-foreign, text
      }:
@@ -183636,7 +180243,6 @@ self: {
        homepage = "https://github.com/joneshf/servant-ruby#readme";
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-scotty" = callPackage
@@ -183660,45 +180266,6 @@ self: {
      }) {};
 
   "servant-server" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
-     , directory, doctest, exceptions, filemanip, filepath, hspec
-     , hspec-discover, hspec-wai, http-api-data, http-types
-     , monad-control, mtl, network, network-uri, parsec, QuickCheck
-     , resourcet, safe, servant, should-not-typecheck, split
-     , string-conversions, system-filepath, tagged, temporary, text
-     , transformers, transformers-base, transformers-compat, wai
-     , wai-app-static, wai-extra, warp, word8
-     }:
-     mkDerivation {
-       pname = "servant-server";
-       version = "0.11.0.1";
-       sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat base64-bytestring bytestring
-         containers exceptions filepath http-api-data http-types
-         monad-control mtl network network-uri resourcet safe servant split
-         string-conversions system-filepath tagged text transformers
-         transformers-base transformers-compat wai wai-app-static warp word8
-       ];
-       executableHaskellDepends = [ aeson base servant text wai warp ];
-       testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring directory
-         doctest exceptions filemanip filepath hspec hspec-wai http-types
-         mtl network parsec QuickCheck resourcet safe servant
-         should-not-typecheck string-conversions temporary text transformers
-         transformers-compat wai wai-extra warp
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "A family of combinators for defining webservices APIs and serving them";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-server_0_13" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
      , directory, doctest, exceptions, filepath, hspec, hspec-discover
@@ -183735,7 +180302,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -183802,33 +180368,6 @@ self: {
      }) {};
 
   "servant-static-th" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , directory, doctest, filepath, Glob, hspec-wai, http-media
-     , semigroups, servant, servant-blaze, servant-server, tasty
-     , tasty-hspec, tasty-hunit, template-haskell, text, wai
-     }:
-     mkDerivation {
-       pname = "servant-static-th";
-       version = "0.1.0.6";
-       sha256 = "19rb7xmfnls8wkgyq6gf5b6rri6b6z4qfj1m2pxa9rwx5hfajiax";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-html bytestring containers directory filepath http-media
-         semigroups servant servant-blaze servant-server template-haskell
-         text
-       ];
-       testHaskellDepends = [
-         base blaze-html bytestring directory doctest filepath Glob
-         hspec-wai servant servant-blaze servant-server tasty tasty-hspec
-         tasty-hunit wai
-       ];
-       homepage = "https://github.com/cdepillabout/servant-static-th";
-       description = "Embed a directory of static files in your Servant server";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-static-th_0_2_0_1" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, doctest, filepath, Glob, hspec-wai, http-media
      , semigroups, servant, servant-blaze, servant-server, tasty
@@ -183853,7 +180392,6 @@ self: {
        homepage = "https://github.com/cdepillabout/servant-static-th";
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -183884,30 +180422,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
-     , cabal-doctest, directory, doctest, filepath, hspec, http-media
-     , insert-ordered-containers, lens, QuickCheck, servant, swagger2
-     , text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.1.4";
-       sha256 = "0xcs019v0kmaa265a15zbqj591d3nrrj19r5176816pldq8q213i";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base bytestring hspec http-media insert-ordered-containers
-         lens QuickCheck servant swagger2 text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base directory doctest filepath hspec lens
-         QuickCheck servant swagger2 text time
-       ];
-       homepage = "https://github.com/haskell-servant/servant-swagger";
-       description = "Generate Swagger specification for your servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_1_5" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
      , cabal-doctest, directory, doctest, filepath, hspec
      , hspec-discover, http-media, insert-ordered-containers, lens
@@ -183932,7 +180446,6 @@ self: {
        homepage = "https://github.com/haskell-servant/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -183962,29 +180475,6 @@ self: {
      }) {};
 
   "servant-websockets" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, conduit
-     , exceptions, resourcet, servant-server, text, wai, wai-websockets
-     , warp, websockets
-     }:
-     mkDerivation {
-       pname = "servant-websockets";
-       version = "1.0.0";
-       sha256 = "05y9yyrg5c99xdlyfzwddylrklpspabijdd08f5c75bhdi2i4cb2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring conduit exceptions resourcet
-         servant-server text wai wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [
-         aeson base conduit servant-server text wai warp websockets
-       ];
-       homepage = "https://github.com/moesenle/servant-websockets#readme";
-       description = "Small library providing WebSocket endpoints for servant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-websockets_1_1_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
      , exceptions, resourcet, servant-server, text, wai, wai-websockets
      , warp, websockets
@@ -184005,7 +180495,6 @@ self: {
        homepage = "https://github.com/moesenle/servant-websockets#readme";
        description = "Small library providing WebSocket endpoints for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-xml" = callPackage
@@ -184014,8 +180503,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-xml";
-       version = "1.0.1";
-       sha256 = "09rxvrxxmj62rscvddza8rygx4zv06k975j99yz7ymggmimhwaig";
+       version = "1.0.1.1";
+       sha256 = "1j1gbwywbb8n6zplvf1drrlpp2ghh7n2jrzl9x7pjplplr6mfpbh";
        libraryHaskellDepends = [
          base bytestring http-media servant xmlbf xmlbf-xeno
        ];
@@ -185144,6 +181633,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "shake-language-c_0_12_0" = callPackage
+    ({ mkDerivation, base, data-default-class, directory, doctest
+     , fclabels, hspec, process, shake, split, unordered-containers
+     }:
+     mkDerivation {
+       pname = "shake-language-c";
+       version = "0.12.0";
+       sha256 = "1c0smbshksjw114m09n5i1ynkhibvd9kix9n7h696p75g40ka7k6";
+       libraryHaskellDepends = [
+         base data-default-class fclabels process shake split
+         unordered-containers
+       ];
+       testHaskellDepends = [ base directory doctest hspec shake ];
+       doCheck = false;
+       homepage = "https://github.com/samplecount/shake-language-c";
+       description = "Utilities for cross-compiling with Shake";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shake-minify" = callPackage
     ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }:
      mkDerivation {
@@ -186006,23 +182515,6 @@ self: {
      }) {};
 
   "show-prettyprint" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
-     , trifecta
-     }:
-     mkDerivation {
-       pname = "show-prettyprint";
-       version = "0.2.0.1";
-       sha256 = "0nkp1qjm017j3pmih9qnymi361wq1f45vr2pqi6y3wbspi0gq029";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base prettyprinter trifecta
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/quchen/show-prettyprint#readme";
-       description = "Robust prettyprinter for output of auto-generated Show instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "show-prettyprint_0_2_0_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
      , trifecta
      }:
@@ -186037,7 +182529,6 @@ self: {
        homepage = "https://github.com/quchen/show-prettyprint#readme";
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "show-type" = callPackage
@@ -186930,6 +183421,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-reflect_0_3_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "simple-reflect";
+       version = "0.3.3";
+       sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
+       description = "Simple reflection of expressions containing variables";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-rope" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck }:
      mkDerivation {
@@ -187931,22 +184435,23 @@ self: {
      }) {};
 
   "skylighting" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
-     , blaze-html, bytestring, case-insensitive, containers, criterion
-     , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show
-     , QuickCheck, random, regex-pcre-builtin, safe, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, text, utf8-string
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , base64-bytestring, binary, blaze-html, bytestring
+     , case-insensitive, colour, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, text, utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.5.1";
-       sha256 = "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg";
+       version = "0.6";
+       sha256 = "1027rcj6zqmnwm6is5k5v28r8af8bsf6i36dwi128h5g92pg206f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring binary blaze-html
-         bytestring case-insensitive containers directory filepath hxt mtl
-         regex-pcre-builtin safe text utf8-string
+         aeson ansi-terminal attoparsec base base64-bytestring binary
+         blaze-html bytestring case-insensitive colour containers directory
+         filepath hxt mtl regex-pcre-builtin safe text utf8-string
        ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
@@ -188121,30 +184626,6 @@ self: {
      }) {};
 
   "slack-web" = callPackage
-    ({ mkDerivation, aeson, base, containers, errors, hspec
-     , http-api-data, http-client, http-client-tls, megaparsec, mtl
-     , servant, servant-client, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "slack-web";
-       version = "0.2.0.1";
-       sha256 = "1v1w6szcjy4qgdx66754vkp7w4fnkyg0pngijy2v422pqmc4jpr9";
-       libraryHaskellDepends = [
-         aeson base containers errors http-api-data http-client
-         http-client-tls megaparsec mtl servant servant-client text time
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base containers errors hspec http-api-data megaparsec text
-         time
-       ];
-       homepage = "https://github.com/jpvillaisaza/slack-web";
-       description = "Bindings for the Slack web API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "slack-web_0_2_0_3" = callPackage
     ({ mkDerivation, aeson, base, containers, errors, hspec
      , http-api-data, http-client, http-client-tls, megaparsec, mtl
      , servant, servant-client, servant-client-core, text, time
@@ -189252,8 +185733,8 @@ self: {
        pname = "snap-server";
        version = "1.0.3.3";
        sha256 = "1vjfpgcl09l974mdsvgxdlqcl68xmn33z1scx3sfyvcnz32xnnkl";
-       revision = "2";
-       editedCabalFile = "1nb3jxr7sgw2r305k6bbbyyx8myxm3r01a8zhvxdkz4xvv9907d0";
+       revision = "3";
+       editedCabalFile = "0y0rd2skx59knkxm53zg6m4mi0p4rj9jw32vsj9mbl8sy2vw9hlj";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -190512,8 +186993,8 @@ self: {
        pname = "soap";
        version = "0.2.3.5";
        sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs";
-       revision = "2";
-       editedCabalFile = "07283pa4n5mf908zl3az9gy95y49zk65kiwyymsmcz5nvhqvp840";
+       revision = "3";
+       editedCabalFile = "0kdxd31csfmixq3jps9kqhcbqirrvrlxh4lv07gyb761dpfpc039";
        libraryHaskellDepends = [
          base bytestring conduit configurator data-default exceptions
          http-client http-types iconv mtl resourcet text
@@ -191364,30 +187845,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sparse-linear-algebra_0_2_9_7" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec
-     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
-     , scientific, transformers, vector, vector-algorithms, vector-space
-     }:
-     mkDerivation {
-       pname = "sparse-linear-algebra";
-       version = "0.2.9.7";
-       sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base containers exceptions mtl transformers vector
-         vector-algorithms vector-space
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec matrix-market-attoparsec mtl
-         mwc-random primitive QuickCheck scientific vector-space
-       ];
-       homepage = "https://github.com/ocramz/sparse-linear-algebra";
-       description = "Numerical computation in native Haskell";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "sparse-linear-algebra" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec
      , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
@@ -191411,6 +187868,30 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "sparse-linear-algebra_0_3" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec
+     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
+     , scientific, transformers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "sparse-linear-algebra";
+       version = "0.3";
+       sha256 = "10s3z0mva8hf9f2ckbpfkzdkhnixp73xli5yigh4d44662rzwqn1";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers exceptions hspec mtl primitive QuickCheck
+         transformers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec matrix-market-attoparsec mtl
+         mwc-random primitive QuickCheck scientific
+       ];
+       homepage = "https://github.com/ocramz/sparse-linear-algebra";
+       description = "Numerical computing in native Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparsebit" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -192007,6 +188488,8 @@ self: {
        pname = "splitmix";
        version = "0";
        sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi";
+       revision = "1";
+       editedCabalFile = "0dh4p3rzvx3zwj0bh5flf4qsiw831rb4vxmbh5jq45qkvry8z8hy";
        libraryHaskellDepends = [ base random time ];
        testHaskellDepends = [
          base base-compat bytestring random tf-random
@@ -193388,51 +189871,6 @@ self: {
      }) {};
 
   "stackage-curator" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
-     , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
-     , conduit, conduit-extra, containers, cryptonite
-     , cryptonite-conduit, data-default-class, directory, exceptions
-     , filepath, hashable, hspec, html-conduit, http-client
-     , http-client-tls, http-conduit, lucid, memory, mime-types
-     , monad-unlift, monad-unlift-ref, mono-traversable, mtl, old-locale
-     , optparse-applicative, optparse-simple, process, QuickCheck
-     , resourcet, safe, semigroups, stm, store, streaming-commons, syb
-     , system-fileio, system-filepath, tar, temporary, text, time
-     , transformers, unix-compat, unordered-containers, utf8-string
-     , vector, xml-conduit, xml-types, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "stackage-curator";
-       version = "0.15.1.0";
-       sha256 = "158bxk5g1bc139nmdqvr4fid5igmsgqa1d4nxy0dpl8xb68l69jp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-s3 async base blaze-html
-         bytestring Cabal classy-prelude-conduit conduit conduit-extra
-         containers cryptonite cryptonite-conduit data-default-class
-         directory exceptions filepath hashable html-conduit http-client
-         http-client-tls http-conduit lucid memory mime-types monad-unlift
-         monad-unlift-ref mono-traversable mtl old-locale process resourcet
-         safe semigroups stm store streaming-commons syb system-fileio
-         system-filepath tar temporary text time transformers unix-compat
-         unordered-containers utf8-string vector xml-conduit xml-types yaml
-         zlib
-       ];
-       executableHaskellDepends = [
-         aeson base http-client http-client-tls optparse-applicative
-         optparse-simple system-filepath text
-       ];
-       testHaskellDepends = [
-         base Cabal classy-prelude-conduit containers directory hspec
-         http-client http-client-tls QuickCheck text yaml
-       ];
-       homepage = "https://github.com/fpco/stackage-curator";
-       description = "Tools for curating Stackage bundles";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stackage-curator_0_16_0_0" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, blaze-html, bytestring, Cabal, classy-prelude-conduit
      , conduit, conduit-extra, containers, cryptonite
@@ -193475,7 +189913,6 @@ self: {
        homepage = "https://github.com/fpco/stackage-curator";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-install" = callPackage
@@ -193510,6 +189947,8 @@ self: {
        pname = "stackage-metadata";
        version = "0.3.0.0";
        sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx";
+       revision = "1";
+       editedCabalFile = "1kfdzvvfxlc0y23mdwklm3szb91zjwpzibb68jgjf1hkmv5kfzk3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193522,7 +189961,7 @@ self: {
          stackage-install stackage-update tar text transformers yaml
        ];
        homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool";
-       description = "Grab current metadata for all packages";
+       description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194129,6 +190568,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "static-text_0_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, doctest-discover, tasty
+     , tasty-hunit, template-haskell, text, vector
+     }:
+     mkDerivation {
+       pname = "static-text";
+       version = "0.2.0.1";
+       sha256 = "0acj953bclr2b9qd1i5b1grxrz07pr38f9q720j92v4xpk8i4pgd";
+       libraryHaskellDepends = [
+         base bytestring template-haskell text vector
+       ];
+       testHaskellDepends = [
+         base bytestring doctest doctest-discover tasty tasty-hunit
+         template-haskell
+       ];
+       homepage = "https://github.com/dzhus/static-text#readme";
+       description = "Lists, Texts, ByteStrings and Vectors of statically known length";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "staticanalysis" = callPackage
     ({ mkDerivation, base, MissingH }:
      mkDerivation {
@@ -194632,35 +191092,6 @@ self: {
      }) {};
 
   "stm-conduit" = callPackage
-    ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
-     , conduit-combinators, conduit-extra, directory, doctest, ghc-prim
-     , HUnit, lifted-async, lifted-base, monad-control, monad-loops
-     , QuickCheck, resourcet, stm, stm-chans, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, transformers
-     , void
-     }:
-     mkDerivation {
-       pname = "stm-conduit";
-       version = "3.0.0";
-       sha256 = "02d83mji1rlijdn315q7fik6jy5q49fjwygd64c9kf4z0qy6cvyg";
-       revision = "1";
-       editedCabalFile = "0wmjqypqjw9irmpsmra6zbj1sa4l14xnx5xpaz2zvfsk4x90qyyg";
-       libraryHaskellDepends = [
-         async base cereal cereal-conduit conduit conduit-combinators
-         conduit-extra directory ghc-prim lifted-async lifted-base
-         monad-control monad-loops resourcet stm stm-chans transformers void
-       ];
-       testHaskellDepends = [
-         base conduit conduit-combinators directory doctest HUnit QuickCheck
-         resourcet stm stm-chans test-framework test-framework-hunit
-         test-framework-quickcheck2 transformers
-       ];
-       homepage = "https://github.com/cgaebel/stm-conduit";
-       description = "Introduces conduits to channels, and promotes using conduits concurrently";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stm-conduit_4_0_0" = callPackage
     ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
      , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
      , QuickCheck, resourcet, stm, stm-chans, test-framework
@@ -194684,7 +191115,6 @@ self: {
        homepage = "https://github.com/cgaebel/stm-conduit";
        description = "Introduces conduits to channels, and promotes using conduits concurrently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-containers" = callPackage
@@ -195006,6 +191436,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stopwatch_0_1_0_5" = callPackage
+    ({ mkDerivation, base, clock, hspec, transformers }:
+     mkDerivation {
+       pname = "stopwatch";
+       version = "0.1.0.5";
+       sha256 = "0q9l27cpfz5hs3ggxij0lk8p3vrgkjg1binhv2nwss4dvygdc7j6";
+       libraryHaskellDepends = [ base clock transformers ];
+       testHaskellDepends = [ base clock hspec ];
+       homepage = "https://github.com/debug-ito/stopwatch";
+       description = "A simple stopwatch utility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "storable" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -195225,30 +191669,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
-     , hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.14.0";
-       sha256 = "11y97l0qsyab8hk126qi4lj8a8d13wp8zhk2qsqwy31rcmjipr0s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable lens template-haskell
-         text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable hspec hspec-discover
-         lens template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_19_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -195270,7 +191690,6 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -195578,14 +191997,14 @@ self: {
      }) {};
 
   "streaming-concurrency" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, lifted-async
+    ({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async
      , monad-control, QuickCheck, quickcheck-instances, stm, streaming
-     , streaming-with, transformers-base
+     , streaming-with, testbench, transformers-base
      }:
      mkDerivation {
        pname = "streaming-concurrency";
-       version = "0.3.0.1";
-       sha256 = "040x4g1q520s6a1kxi4j730r6vr7n539wg92mdcvg9bswa620yqj";
+       version = "0.3.1.0";
+       sha256 = "151nyi75qrlvp5q3xi678rkg2vk0mrvpyr8c4yagh1df90amhvsm";
        libraryHaskellDepends = [
          base exceptions lifted-async monad-control stm streaming
          streaming-with transformers-base
@@ -195593,6 +192012,10 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances streaming
        ];
+       benchmarkHaskellDepends = [
+         base exceptions HUnit lifted-async monad-control streaming
+         testbench
+       ];
        description = "Concurrency support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195857,8 +192280,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka";
-       version = "2.0.2";
-       sha256 = "1lrp6llvl0g469gjgl7rl67qj8zn1ssbg61n6qwkb8lqqqpq03mq";
+       version = "2.0.2.1";
+       sha256 = "0wh702y5m7045jlr3qf2k852x68d7ylr16hanb6jjw2f476fnc7i";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base base-prelude base64-bytestring
          bifunctors bytestring bytestring-tree-builder hashable http-media
@@ -195895,8 +192318,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka-wai";
-       version = "1.0.1";
-       sha256 = "0zbz8aa5gvh4y5brypzkp8bn1gkkz4pcdmd3ga62xpym8hhf83cc";
+       version = "1.0.1.1";
+       sha256 = "05l26v777fifb5rpvmkyvaqr12f7q8i9780savx6wfabi6wvqh5i";
        libraryHaskellDepends = [
          base base-prelude bytestring case-insensitive http-types
          strelka-core text unordered-containers wai warp
@@ -195933,23 +192356,6 @@ self: {
      }) {};
 
   "strict-base-types" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
-     , hashable, lens, QuickCheck, strict
-     }:
-     mkDerivation {
-       pname = "strict-base-types";
-       version = "0.5.0";
-       sha256 = "1jx10iqkdmrhakk1aq2g9vf8lfm8gd9y560s2s69qzzrszrsvg7y";
-       libraryHaskellDepends = [
-         aeson base bifunctors binary deepseq ghc-prim hashable lens
-         QuickCheck strict
-       ];
-       homepage = "https://github.com/meiersi/strict-base-types";
-       description = "Strict variants of the types provided in base";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "strict-base-types_0_6_1" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
      , hashable, lens, QuickCheck, strict
      }:
@@ -195964,7 +192370,6 @@ self: {
        homepage = "https://github.com/meiersi/strict-base-types";
        description = "Strict variants of the types provided in base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-concurrency" = callPackage
@@ -196262,23 +192667,6 @@ self: {
      }) {};
 
   "string-transform" = callPackage
-    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
-     , tasty-smallcheck, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "string-transform";
-       version = "0.1.1";
-       sha256 = "0qg9db46hbpgwndg1n7h6dfz5kx8372fqbs02nw8p9l6fsigiks8";
-       libraryHaskellDepends = [ base bytestring text utf8-string ];
-       testHaskellDepends = [
-         base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
-       ];
-       homepage = "https://github.com/ncaq/string-transform#readme";
-       description = "simple and easy haskell string transform wrapper";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "string-transform_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, tasty, tasty-hunit
      , tasty-smallcheck, text, utf8-string
      }:
@@ -196293,7 +192681,6 @@ self: {
        homepage = "https://github.com/ncaq/string-transform#readme";
        description = "simple and easy haskell string transform wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "string-typelits" = callPackage
@@ -196443,23 +192830,6 @@ self: {
      }) {};
 
   "stripe-core" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, mtl, text, time
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "stripe-core";
-       version = "2.2.3";
-       sha256 = "0vyqmz0q2davlqj2673pzj5qxawvrxypm2jd839igb5y0wnj9idv";
-       libraryHaskellDepends = [
-         aeson base bytestring mtl text time transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/dmjio/stripe-haskell";
-       description = "Stripe API for Haskell - Pure Core";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-core_2_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, mtl, text, time
      , transformers, unordered-containers
      }:
@@ -196474,22 +192844,9 @@ self: {
        homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-haskell" = callPackage
-    ({ mkDerivation, base, stripe-core, stripe-http-streams }:
-     mkDerivation {
-       pname = "stripe-haskell";
-       version = "2.2.3";
-       sha256 = "086baq9f9pzacf5vqvi2ikx47sijyb8r6ndnqph9r8qvjgc2xy2x";
-       libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
-       homepage = "https://github.com/dmjio/stripe";
-       description = "Stripe API for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-haskell_2_3_0" = callPackage
     ({ mkDerivation, base, stripe-core, stripe-http-streams }:
      mkDerivation {
        pname = "stripe-haskell";
@@ -196499,30 +192856,9 @@ self: {
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-http-streams" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec
-     , http-streams, io-streams, stripe-core, stripe-tests, text
-     }:
-     mkDerivation {
-       pname = "stripe-http-streams";
-       version = "2.2.3";
-       sha256 = "0bdl85xwm7ym1kf2d0vjn4652z3bgvzj2l7z5lgsxzr5acn6q02p";
-       libraryHaskellDepends = [
-         aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
-         text
-       ];
-       testHaskellDepends = [
-         base free HsOpenSSL hspec http-streams stripe-core stripe-tests
-       ];
-       doCheck = false;
-       description = "Stripe API for Haskell - http-streams backend";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-http-streams_2_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec
      , http-streams, io-streams, stripe-core, stripe-tests, text
      }:
@@ -196540,28 +192876,9 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-tests" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
-     , mtl, random, stripe-core, text, time, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stripe-tests";
-       version = "2.2.3";
-       sha256 = "1yks2wabqirq4hi1a52k9302pyp1w4q7b6chg6a7r28wsjlv27hs";
-       libraryHaskellDepends = [
-         aeson base bytestring free hspec hspec-core mtl random stripe-core
-         text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/dmjio/stripe-haskell";
-       description = "Tests for Stripe API bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stripe-tests_2_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
      , mtl, random, stripe-core, text, time, transformers
      , unordered-containers
@@ -196577,7 +192894,6 @@ self: {
        homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strips" = callPackage
@@ -196596,25 +192912,6 @@ self: {
      }) {};
 
   "strive" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
-       version = "4.0.3";
-       sha256 = "1b1shq0jznyx9cbir33diflw1602py651rqj2hfjrgdywjrac8fq";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [ base bytestring markdown-unlit time ];
-       homepage = "https://github.com/tfausak/strive#readme";
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_5_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -196631,7 +192928,6 @@ self: {
        homepage = "https://github.com/tfausak/strive#readme";
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -196905,41 +193201,12 @@ self: {
          base base-compat bytestring optparse-applicative
        ];
        testHaskellDepends = [ base base-compat bytestring hspec ];
+       doHaddock = false;
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "stylish-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
-     , strict, syb, test-framework, test-framework-hunit, yaml
-     }:
-     mkDerivation {
-       pname = "stylish-haskell";
-       version = "0.8.1.0";
-       sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl syb yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl optparse-applicative strict syb yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
-         yaml
-       ];
-       homepage = "https://github.com/jaspervdj/stylish-haskell";
-       description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stylish-haskell_0_9_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , file-embed, filepath, haskell-src-exts, HUnit, mtl
      , optparse-applicative, strict, syb, test-framework
@@ -196967,7 +193234,6 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylized" = callPackage
@@ -197718,6 +193984,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sv-cassava" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv
+     , text, utf8-string, validation, vector
+     }:
+     mkDerivation {
+       pname = "sv-cassava";
+       version = "0.1";
+       sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15";
+       libraryHaskellDepends = [
+         attoparsec base bytestring cassava sv utf8-string vector
+       ];
+       testHaskellDepends = [
+         base bytestring cassava HUnit sv text validation vector
+       ];
+       homepage = "https://github.com/qfpl/sv";
+       description = "Integration to use sv with cassava's parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "svg-builder" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
      , unordered-containers
@@ -197769,6 +194054,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "svg-tree_0_6_2_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
+     , vector, xml
+     }:
+     mkDerivation {
+       pname = "svg-tree";
+       version = "0.6.2.2";
+       sha256 = "1iva5vb76z2laygvlh31zbhhcfzympk9s765499j7p356ycl0s1s";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "svg2q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -200326,18 +196629,6 @@ self: {
      }) {};
 
   "tar-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit-combinators }:
-     mkDerivation {
-       pname = "tar-conduit";
-       version = "0.1.1";
-       sha256 = "189dy1j32c44mjr3waljcvch1hqlijnax7myp4jih7y12hji6i9r";
-       libraryHaskellDepends = [ base bytestring conduit-combinators ];
-       homepage = "https://github.com/snoyberg/tar-conduit#readme";
-       description = "Parse tar files using conduit for streaming";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tar-conduit_0_2_3" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, criterion, deepseq, directory, filepath, hspec
      , QuickCheck, safe-exceptions, text, unix, weigh
@@ -200361,7 +196652,6 @@ self: {
        homepage = "https://github.com/snoyberg/tar-conduit#readme";
        description = "Extract and create tar files using conduit for streaming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tardis" = callPackage
@@ -200518,24 +196808,6 @@ self: {
      }) {};
 
   "tasty" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers
-     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
-     , unbounded-delays, unix
-     }:
-     mkDerivation {
-       pname = "tasty";
-       version = "0.11.3";
-       sha256 = "1g5394akq4j7y93b7cqwqf9lacqh2k21rrj6srbnh2sg97ng7j1b";
-       libraryHaskellDepends = [
-         ansi-terminal async base clock containers deepseq mtl
-         optparse-applicative regex-tdfa stm tagged unbounded-delays unix
-       ];
-       homepage = "https://github.com/feuerbach/tasty";
-       description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty_1_0_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      }:
@@ -200550,7 +196822,6 @@ self: {
        homepage = "https://github.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -200594,18 +196865,6 @@ self: {
      }) {};
 
   "tasty-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
-       version = "0.7.1.1";
-       sha256 = "04qmgvm6z2bfbb8dsbj71famyiacswp7nbjwsa043w4i0hnsgpsl";
-       libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_1_1_0_1" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
@@ -200615,37 +196874,9 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, Glob
-     , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-discover";
-       version = "4.1.5";
-       sha256 = "1v2g0jyfrcv04klxicp1z6p478ppq5l3szkx4f4hjqnim6kg8pgh";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filepath Glob
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath Glob
-       ];
-       testHaskellDepends = [
-         base containers directory filepath Glob hedgehog tasty
-         tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       homepage = "https://github.com/lwm/tasty-discover#readme";
-       description = "Test discovery for the tasty framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-discover_4_2_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck
@@ -200670,7 +196901,6 @@ self: {
        homepage = "https://github.com/lwm/tasty-discover#readme";
        description = "Test discovery for the tasty framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-expected-failure" = callPackage
@@ -200716,27 +196946,6 @@ self: {
      }) {};
 
   "tasty-golden" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, mtl, optparse-applicative, process, tagged
-     , tasty, tasty-hunit, temporary, temporary-rc
-     }:
-     mkDerivation {
-       pname = "tasty-golden";
-       version = "2.3.1.2";
-       sha256 = "088rvrvmi8wjci3zlyn3mph1yjl77j0wabdwzp4x2wxpygviy7k9";
-       libraryHaskellDepends = [
-         async base bytestring containers deepseq directory filepath mtl
-         optparse-applicative process tagged tasty temporary
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary-rc
-       ];
-       homepage = "https://github.com/feuerbach/tasty-golden";
-       description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-golden_2_3_1_3" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, mtl, optparse-applicative, process, tagged
      , tasty, tasty-hunit, temporary, temporary-rc
@@ -200755,7 +196964,6 @@ self: {
        homepage = "https://github.com/feuerbach/tasty-golden";
        description = "Golden tests support for tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-groundhog-converters" = callPackage
@@ -200785,11 +196993,13 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.1.0.2";
        sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x";
+       revision = "1";
+       editedCabalFile = "1kmmry6zawyhxgi20v3j62m58lqjcjzvap0qp6b35yj31vbzl727";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       homepage = "https://github.com/qfpl/tasty-hedghog";
+       homepage = "https://github.com/qfpl/tasty-hedgehog";
        description = "Integrates the hedgehog testing library with the tasty testing framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200802,11 +197012,13 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
+       revision = "2";
+       editedCabalFile = "1if3pmvnnfs8zrqbg5awdc9qafqhwrgq4f75bqcqlapljlhp4xx0";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       homepage = "https://github.com/qfpl/tasty-hedghog";
+       homepage = "https://github.com/qfpl/tasty-hedgehog";
        description = "Integration for tasty and hedgehog";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200848,18 +197060,6 @@ self: {
      }) {};
 
   "tasty-hunit" = callPackage
-    ({ mkDerivation, base, tasty }:
-     mkDerivation {
-       pname = "tasty-hunit";
-       version = "0.9.2";
-       sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
-       libraryHaskellDepends = [ base tasty ];
-       homepage = "http://documentup.com/feuerbach/tasty";
-       description = "HUnit support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-hunit_0_10_0_1" = callPackage
     ({ mkDerivation, base, call-stack, tasty }:
      mkDerivation {
        pname = "tasty-hunit";
@@ -200869,7 +197069,6 @@ self: {
        homepage = "https://github.com/feuerbach/tasty";
        description = "HUnit support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-hunit-adapter" = callPackage
@@ -201011,11 +197210,11 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-quickcheck";
-       version = "0.9.1";
-       sha256 = "03db6aknm5rdl14mn98lxhb38357ywvs7agygyz1hbc5iv7rggxa";
+       version = "0.9.2";
+       sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5";
        libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
-       homepage = "http://documentup.com/feuerbach/tasty";
+       homepage = "https://github.com/feuerbach/tasty";
        description = "QuickCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -202280,25 +198479,6 @@ self: {
      }) {};
 
   "terminal-progress-bar" = callPackage
-    ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "terminal-progress-bar";
-       version = "0.1.1.1";
-       sha256 = "1y9mpmnbc12bbybaqq7cqwhvbbdbx31zxkb63mymiaz1bnhi58fp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base stm stm-chans ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/roelvandijk/terminal-progress-bar";
-       description = "A simple progress bar in the terminal";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "terminal-progress-bar_0_2" = callPackage
     ({ mkDerivation, async, base, HUnit, stm, stm-chans, terminal-size
      , test-framework, test-framework-hunit
      }:
@@ -202315,7 +198495,6 @@ self: {
        homepage = "https://github.com/roelvandijk/terminal-progress-bar";
        description = "A simple progress bar in the terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terminal-size" = callPackage
@@ -202464,27 +198643,6 @@ self: {
      }) {};
 
   "test-framework" = callPackage
-    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
-     , hostname, old-locale, random, regex-posix, time, xml
-     }:
-     mkDerivation {
-       pname = "test-framework";
-       version = "0.8.1.1";
-       sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
-       revision = "3";
-       editedCabalFile = "1b6pi4j1dpcbiyx1bpfks29x293j02z7ashs2sdc8fhzbwsr9lxj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal ansi-wl-pprint base containers hostname old-locale
-         random regex-posix time xml
-       ];
-       homepage = "https://batterseapower.github.io/test-framework/";
-       description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "test-framework_0_8_2_0" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, bytestring
      , containers, hostname, HUnit, libxml, old-locale, QuickCheck
      , random, regex-posix, semigroups, time, xml
@@ -202505,7 +198663,6 @@ self: {
        homepage = "http://haskell.github.io/test-framework/";
        description = "Framework for running and organising tests, with HUnit and QuickCheck support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-doctest" = callPackage
@@ -203099,30 +199256,6 @@ self: {
      }) {};
 
   "text" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
-     , quickcheck-unicode, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "text";
-       version = "1.2.2.2";
-       sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii";
-       libraryHaskellDepends = [
-         array base binary bytestring deepseq ghc-prim integer-gmp
-       ];
-       testHaskellDepends = [
-         array base binary bytestring deepseq directory ghc-prim HUnit
-         integer-gmp QuickCheck quickcheck-unicode random test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       doCheck = false;
-       homepage = "https://github.com/bos/text";
-       description = "An efficient packed Unicode text type";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "text_1_2_3_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
      , quickcheck-unicode, random, test-framework, test-framework-hunit
@@ -203144,25 +199277,9 @@ self: {
        homepage = "https://github.com/haskell/text";
        description = "An efficient packed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-all" = callPackage
-    ({ mkDerivation, base, bytestring, text, text-format, utf8-string
-     }:
-     mkDerivation {
-       pname = "text-all";
-       version = "0.4.1.1";
-       sha256 = "195f1l4s6vfg4dhpmkfsd178rldknw0gdkl1qpbn3kzhba044y7w";
-       libraryHaskellDepends = [
-         base bytestring text text-format utf8-string
-       ];
-       homepage = "http://github.com/aelve/text-all";
-       description = "Everything Data.Text related in one package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-all_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, text, text-format, utf8-string
      }:
      mkDerivation {
@@ -203175,7 +199292,6 @@ self: {
        homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-and-plots" = callPackage
@@ -203772,6 +199888,8 @@ self: {
        pname = "text-show";
        version = "3.7.2";
        sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s";
+       revision = "1";
+       editedCabalFile = "1iaa9scqwys9da98ya62jz2lyqia79ys8zq4hhcgb3l45x0ngc27";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -203810,8 +199928,8 @@ self: {
        pname = "text-show-instances";
        version = "3.6.2";
        sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5";
-       revision = "1";
-       editedCabalFile = "04rkwk7c6zzl2ql22x66gn3amgq7cfqdndxyhh6ywlbksa9ljjsw";
+       revision = "3";
+       editedCabalFile = "1nzl40bcg17i98xnlcm5djhriaz6pcmhyzmmd0pavkgyra57arz0";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
@@ -203832,6 +199950,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-show-instances_3_6_3" = callPackage
+    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
+     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
+     , haskeline, hoopl, hpc, hspec, hspec-discover, old-locale
+     , old-time, pretty, process, QuickCheck, quickcheck-instances
+     , random, semigroups, tagged, template-haskell, terminfo, text
+     , text-show, th-orphans, time, transformers, transformers-compat
+     , unix, unordered-containers, vector, xhtml
+     }:
+     mkDerivation {
+       pname = "text-show-instances";
+       version = "3.6.3";
+       sha256 = "14b5bz0xxihi44nd80c8ma81khn7yjcpl8xvavsdfqy4jz9sb9fr";
+       libraryHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
+         random semigroups tagged template-haskell terminfo text text-show
+         time transformers transformers-compat unix unordered-containers
+         vector xhtml
+       ];
+       testHaskellDepends = [
+         base base-compat bifunctors binary bytestring containers directory
+         generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
+         old-locale old-time pretty process QuickCheck quickcheck-instances
+         random semigroups tagged template-haskell terminfo text text-show
+         th-orphans time transformers transformers-compat unix
+         unordered-containers vector xhtml
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/RyanGlScott/text-show-instances";
+       description = "Additional instances for text-show";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-stream-decode" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
      }:
@@ -204257,6 +200410,8 @@ self: {
        pname = "th-desugar";
        version = "1.7";
        sha256 = "1iqlqadax1ahgv9h1vdyddf55v2h4ghqrxfyqirrvk97iyk1rcsj";
+       revision = "1";
+       editedCabalFile = "06cxv8yx2dwppzzb9vjqiic2hiaiiqakg0kv0byp9k00sidabbm3";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-expand-syns th-lift
          th-orphans
@@ -204278,6 +200433,8 @@ self: {
        pname = "th-desugar";
        version = "1.8";
        sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv";
+       revision = "1";
+       editedCabalFile = "13jvl6ijxjwbd7df0cq5pnijs3wrs8x5r9ykyyj180dak66909wd";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-expand-syns th-lift
          th-orphans
@@ -204466,13 +200623,13 @@ self: {
      }) {};
 
   "th-nowq" = callPackage
-    ({ mkDerivation, base, template-haskell, time }:
+    ({ mkDerivation, base, markdown-unlit, template-haskell, time }:
      mkDerivation {
        pname = "th-nowq";
-       version = "0.1.0.0";
-       sha256 = "06ajyk1a1kdxa0cva4lym2jf52bkkz8dxgk8753k2m035czm2w26";
+       version = "0.1.0.2";
+       sha256 = "1r9qwj3aw5adxzgxb1kgr9s1scrqclf4jfmlhv8nz1dhbqwg84h1";
        libraryHaskellDepends = [ base template-haskell time ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base markdown-unlit ];
        homepage = "https://github.com/dzhus/th-nowq#readme";
        description = "Template Haskell splice that expands to current time";
        license = stdenv.lib.licenses.bsd3;
@@ -204978,6 +201135,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threads_0_5_1_6" = callPackage
+    ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "threads";
+       version = "0.5.1.6";
+       sha256 = "0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base concurrent-extra HUnit stm test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/basvandijk/threads";
+       description = "Fork threads and wait for their result";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threads-extras" = callPackage
     ({ mkDerivation, base, stm, threads }:
      mkDerivation {
@@ -205846,8 +202022,8 @@ self: {
        pname = "time-parsers";
        version = "0.1.2.0";
        sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f";
-       revision = "1";
-       editedCabalFile = "1fvk31ab241v4ib7lg718q6qwrc3w7axq9kinccbdnn7b7d259gj";
+       revision = "2";
+       editedCabalFile = "1qvhmwkdb4a0msxpfssyqdz0fmi45iv7iwmw7b1mf4flqz6jvaql";
        libraryHaskellDepends = [ base parsers template-haskell time ];
        testHaskellDepends = [
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -206033,17 +202209,6 @@ self: {
      }) {};
 
   "timeit" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "timeit";
-       version = "1.0.0.0";
-       sha256 = "0dkjbp636dp882zlbwvvz76k4g7ga28wksd41w6mh0k8z45xjj5x";
-       libraryHaskellDepends = [ base ];
-       description = "Time a computation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timeit_2_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "timeit";
@@ -206053,7 +202218,6 @@ self: {
        homepage = "https://github.com/merijn/timeit";
        description = "Time monadic computations with an IO base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timelens" = callPackage
@@ -206290,6 +202454,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timers-tick" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "timers-tick";
+       version = "0.4.0.0";
+       sha256 = "02da32j9jz21awmsf38rrj3l3ks7s9a6vvqadr98c35shx3sxzcq";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://ariis.it/static/articles/timers-tick/page.html";
+       description = "tick based timers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timers-updatable" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -206383,6 +202560,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-olson_0_1_9" = callPackage
+    ({ mkDerivation, base, binary, bytestring, extensible-exceptions
+     , time, timezone-series
+     }:
+     mkDerivation {
+       pname = "timezone-olson";
+       version = "0.1.9";
+       sha256 = "05abywx1nrcaz0nqzfy4zw62bc5qd7pdfnjvv4drxkwv084ha8rj";
+       libraryHaskellDepends = [
+         base binary bytestring extensible-exceptions time timezone-series
+       ];
+       homepage = "http://projects.haskell.org/time-ng/";
+       description = "A pure Haskell parser and renderer for binary Olson timezone files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "timezone-olson-th" = callPackage
     ({ mkDerivation, base, template-haskell, time, timezone-olson
      , timezone-series
@@ -206411,6 +202605,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-series_0_1_9" = callPackage
+    ({ mkDerivation, base, deepseq, time }:
+     mkDerivation {
+       pname = "timezone-series";
+       version = "0.1.9";
+       sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5";
+       libraryHaskellDepends = [ base deepseq time ];
+       homepage = "http://projects.haskell.org/time-ng/";
+       description = "Enhanced timezone handling for Data.Time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "timezone-unix" = callPackage
     ({ mkDerivation, base, directory, filepath, leapseconds, tasty
      , tasty-golden, tasty-hunit, time, timezone-olson, timezone-series
@@ -206701,29 +202908,6 @@ self: {
      }) {};
 
   "tldr" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
-     , filepath, optparse-applicative, semigroups, shell-conduit, text
-     }:
-     mkDerivation {
-       pname = "tldr";
-       version = "0.2.5";
-       sha256 = "0b87zkwj27z7h5rxf25qh4sq20smwbd3fg6j30hgmn0p9rsg4gzw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring cmark text
-       ];
-       executableHaskellDepends = [
-         base directory filepath optparse-applicative semigroups
-         shell-conduit
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/psibi/tldr-hs#readme";
-       description = "Haskell tldr client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tldr_0_3_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
      , filepath, optparse-applicative, semigroups, text, typed-process
      }:
@@ -206744,7 +202928,6 @@ self: {
        homepage = "https://github.com/psibi/tldr-hs#readme";
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls" = callPackage
@@ -207828,8 +204011,8 @@ self: {
      }:
      mkDerivation {
        pname = "transfer-db";
-       version = "0.3.1.0";
-       sha256 = "0gmgn78p0gfpm8iqkziz50yrx59lkj6m11lnawyfi55dxjjcwqgf";
+       version = "0.3.1.1";
+       sha256 = "1wgxg576dqivwxfks75nc0yaxxiaf8zyxz0fpay0qgdfwd218f2n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208686,8 +204869,8 @@ self: {
        pname = "trifecta";
        version = "1.7.1.1";
        sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31";
-       revision = "3";
-       editedCabalFile = "18n50vn8znpwci2f333wsqzr8zkj35ki5z8bs9a2717yhzyha4k8";
+       revision = "4";
+       editedCabalFile = "12dv7mipmqc7ykazjqql6slbgdgi5f6hglw2cbdi6brvkwxk7w9z";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -209433,29 +205616,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, foldl, hostname
-     , managed, optional-args, optparse-applicative, process, semigroups
-     , stm, system-fileio, system-filepath, temporary, text, time
-     , transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.4.6";
-       sha256 = "02qayazjr2b2g6ksmpwn9v5z3kibrf5kf9f1whfw83sq6vqa7ixx";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         foldl hostname managed optional-args optparse-applicative process
-         semigroups stm system-fileio system-filepath temporary text time
-         transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_5" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -209476,6 +205636,29 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "turtle_1_5_6" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , semigroups, stm, system-fileio, system-filepath, temporary, text
+     , time, transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.6";
+       sha256 = "1cx25845i4n00xjb5dg9jg1p229nra0j5r2jwpwarra5c092df2p";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm system-fileio
+         system-filepath temporary text time transformers unix unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -210286,18 +206469,6 @@ self: {
      }) {};
 
   "type-combinators-singletons" = callPackage
-    ({ mkDerivation, base, singletons, type-combinators }:
-     mkDerivation {
-       pname = "type-combinators-singletons";
-       version = "0.1.0.0";
-       sha256 = "11sc0fjlppp35fy35bk4vxzx8c4ws7j3zww59cg1abrpfk7i82mh";
-       libraryHaskellDepends = [ base singletons type-combinators ];
-       homepage = "https://github.com/mstksg/type-combinators-singletons";
-       description = "Interop between /type-combinators/ and /singletons/";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-combinators-singletons_0_2_1_0" = callPackage
     ({ mkDerivation, base, singletons, type-combinators }:
      mkDerivation {
        pname = "type-combinators-singletons";
@@ -210307,7 +206478,6 @@ self: {
        homepage = "https://github.com/mstksg/type-combinators-singletons";
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-digits" = callPackage
@@ -211034,22 +207204,6 @@ self: {
      }) {};
 
   "typelits-witnesses" = callPackage
-    ({ mkDerivation, base, base-compat, constraints, reflection
-     , transformers
-     }:
-     mkDerivation {
-       pname = "typelits-witnesses";
-       version = "0.2.3.0";
-       sha256 = "0311zz3anvngjgrgry2zij5jkb8mjxfcb8rvmrik06myq7wr4vm5";
-       libraryHaskellDepends = [
-         base base-compat constraints reflection transformers
-       ];
-       homepage = "https://github.com/mstksg/typelits-witnesses";
-       description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "typelits-witnesses_0_3_0_1" = callPackage
     ({ mkDerivation, base, base-compat, constraints, reflection
      , transformers
      }:
@@ -211063,7 +207217,6 @@ self: {
        homepage = "https://github.com/mstksg/typelits-witnesses";
        description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typeof" = callPackage
@@ -211875,22 +208028,6 @@ self: {
      }) {};
 
   "unfoldable" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
-     , random, transformers
-     }:
-     mkDerivation {
-       pname = "unfoldable";
-       version = "0.9.5";
-       sha256 = "0ll29dvizh8hqhqncrmzwzgbb1q9br2f7326r38dr7xmdpmpjsbn";
-       libraryHaskellDepends = [
-         base containers ghc-prim one-liner QuickCheck random transformers
-       ];
-       homepage = "https://github.com/sjoerdvisscher/unfoldable";
-       description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unfoldable_0_9_6" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
      }:
@@ -211904,7 +208041,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -212698,30 +208834,6 @@ self: {
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , ghc-prim, hashable, microlens, microlens-mtl, mtl
-     , safe-exceptions, semigroups, stm, text, text-format, transformers
-     , type-operators, unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "universum";
-       version = "1.0.0";
-       sha256 = "1wsglfacd2aqfxxri3hzs5zwxvfkn3kqb09icax1fncjmb0yc35w";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable microlens
-         microlens-mtl mtl safe-exceptions stm text text-format transformers
-         type-operators unordered-containers utf8-string vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq hashable mtl semigroups text
-         unordered-containers
-       ];
-       homepage = "https://github.com/serokell/universum";
-       description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "universum_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , doctest, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty
@@ -212748,7 +208860,6 @@ self: {
        homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -212906,6 +209017,8 @@ self: {
        pname = "unjson";
        version = "0.15.1.0";
        sha256 = "1k61lak22snr7fimpr7pjri33rg0gm1hhfn253bwlz3pvpn85vmp";
+       revision = "1";
+       editedCabalFile = "1icfcg8dbqw48a96w6j9jwa6xf08nms55pfixjwf4332qk7q7hkc";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
          pretty primitive scientific text time unordered-containers vector
@@ -212955,6 +209068,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_5_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.5.0";
+       sha256 = "0c08i5vnhjw28i321dpjap1a9jz3g85gq2zm39v8pl6w89ilcq81";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm transformers unix
+         unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm
+         transformers unix unliftio-core
+       ];
+       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -213012,32 +209147,6 @@ self: {
      }) {};
 
   "unordered-containers" = callPackage
-    ({ mkDerivation, base, bytestring, ChasingBottoms, containers
-     , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
-     , mtl, QuickCheck, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "unordered-containers";
-       version = "0.2.8.0";
-       sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4";
-       revision = "1";
-       editedCabalFile = "0bllj6rg1ab468ilxzhnafjx2qzqx1bshlf207rk9yhszw801awj";
-       libraryHaskellDepends = [ base deepseq hashable ];
-       testHaskellDepends = [
-         base ChasingBottoms containers hashable HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion deepseq deepseq-generics
-         hashable hashmap mtl random
-       ];
-       homepage = "https://github.com/tibbe/unordered-containers";
-       description = "Efficient hashing-based container types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unordered-containers_0_2_9_0" = callPackage
     ({ mkDerivation, base, bytestring, ChasingBottoms, containers
      , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
      , mtl, QuickCheck, random, test-framework, test-framework-hunit
@@ -213059,7 +209168,6 @@ self: {
        homepage = "https://github.com/tibbe/unordered-containers";
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unordered-containers-rematch" = callPackage
@@ -213749,25 +209857,6 @@ self: {
      }) {};
 
   "urlpath" = callPackage
-    ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
-     , monad-control, monad-control-aligned, monad-logger, mtl
-     , path-extra, resourcet, split, strict, text, transformers
-     , transformers-base, vector
-     }:
-     mkDerivation {
-       pname = "urlpath";
-       version = "7.0.2";
-       sha256 = "0q8kxgvlm6wf5xwq8a61c7vwbv3ghbbhid516ril677r5y6l7vv3";
-       libraryHaskellDepends = [
-         attoparsec-uri base exceptions mmorph monad-control
-         monad-control-aligned monad-logger mtl path-extra resourcet split
-         strict text transformers transformers-base vector
-       ];
-       description = "Painfully simple URL deployment";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "urlpath_8_0_1" = callPackage
     ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
      , monad-control, monad-control-aligned, monad-logger, mtl
      , path-extra, resourcet, split, strict, text, transformers
@@ -213784,7 +209873,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urn" = callPackage
@@ -214736,23 +210824,6 @@ self: {
      }) {};
 
   "validation" = callPackage
-    ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
-     , semigroupoids, semigroups
-     }:
-     mkDerivation {
-       pname = "validation";
-       version = "0.6.3";
-       sha256 = "07j4nxah790vbzn0jfkp9lgb4afr8zwi06a0xp5dw0xjdl0qja66";
-       libraryHaskellDepends = [
-         base bifunctors deepseq lens semigroupoids semigroups
-       ];
-       testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
-       homepage = "https://github.com/qfpl/validation";
-       description = "A data-type like Either but with an accumulating Applicative";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "validation_1" = callPackage
     ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
      , semigroupoids, semigroups
      }:
@@ -214767,7 +210838,6 @@ self: {
        homepage = "https://github.com/qfpl/validation";
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validations" = callPackage
@@ -215738,17 +211808,6 @@ self: {
      }) {};
 
   "vector-space" = callPackage
-    ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
-     mkDerivation {
-       pname = "vector-space";
-       version = "0.12";
-       sha256 = "16nzp2m6pcbqp27dm54v9a009j7jdjkrhw2hm1rgvh5jh4alyzi3";
-       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
-       description = "Vector & affine spaces, linear maps, and derivatives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-space_0_13" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
        pname = "vector-space";
@@ -215757,7 +211816,6 @@ self: {
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space-map" = callPackage
@@ -215859,32 +211917,6 @@ self: {
      }) {};
 
   "vectortiles" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, criterion
-     , deepseq, hex, microlens, microlens-platform, protobuf, tasty
-     , tasty-hunit, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "vectortiles";
-       version = "1.2.0.6";
-       sha256 = "1l3sdd1cpcx9lxqcfzy9nndflzf8x2z7xayrj6k18zdf862dbxn7";
-       libraryHaskellDepends = [
-         base bytestring cereal containers deepseq protobuf text
-         transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring cereal containers hex protobuf tasty tasty-hunit
-         text vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring cereal containers criterion microlens
-         microlens-platform protobuf text vector
-       ];
-       homepage = "https://github.com/fosskers/vectortiles";
-       description = "GIS Vector Tiles, as defined by Mapbox";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "vectortiles_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , hashable, hex, microlens, microlens-platform, protocol-buffers
      , protocol-buffers-descriptor, tasty, tasty-hunit, text
@@ -215914,7 +211946,6 @@ self: {
        homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -216289,6 +212320,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vinyl_0_8_1" = callPackage
+    ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
+     , lens, linear, microlens, mwc-random, primitive
+     , should-not-typecheck, singletons, tagged, vector
+     }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.8.1";
+       sha256 = "02ccxz95r99nzzlgr50kdha2vv8znlyrzza3k150xmh7m63dzgnr";
+       libraryHaskellDepends = [ array base ghc-prim ];
+       testHaskellDepends = [
+         base doctest hspec lens microlens should-not-typecheck singletons
+       ];
+       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
@@ -216725,43 +212777,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.19.2";
-       sha256 = "158afcgzcwq7ybjw7jk28q799xzpns47m1l4sivc3wrrfklqh7xz";
-       revision = "1";
-       editedCabalFile = "16xg3m7rfg9rf2z9q0ns7f3gyi1acyw21d3bvr6fy4b9v1ngxsdq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/jtdaugherty/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_20" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -216796,7 +212811,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -217480,24 +213494,6 @@ self: {
      }) {};
 
   "wai-logger" = callPackage
-    ({ mkDerivation, base, blaze-builder, byteorder, bytestring
-     , case-insensitive, doctest, fast-logger, http-types, network, unix
-     , unix-time, wai
-     }:
-     mkDerivation {
-       pname = "wai-logger";
-       version = "2.3.1";
-       sha256 = "0ldx9jiq70ga2clsrg1sw5jsy76n4s6kzs3785qs87gbj5dqfdip";
-       libraryHaskellDepends = [
-         base blaze-builder byteorder bytestring case-insensitive
-         fast-logger http-types network unix unix-time wai
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-logger_2_3_2" = callPackage
     ({ mkDerivation, base, byteorder, bytestring, case-insensitive
      , doctest, fast-logger, http-types, network, unix, unix-time, wai
      }:
@@ -217512,7 +213508,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
@@ -218015,30 +214010,6 @@ self: {
      }) {};
 
   "wai-middleware-rollbar" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, hostname, hspec, hspec-golden-aeson, http-client
-     , http-conduit, http-types, lens, lens-aeson, network, QuickCheck
-     , text, time, unordered-containers, uuid, wai
-     }:
-     mkDerivation {
-       pname = "wai-middleware-rollbar";
-       version = "0.8.4";
-       sha256 = "1yycbkcc7jq8mlv6jslnq2j0w8yhv4859fds34pg2k1fg7ccb1iw";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive hostname http-client
-         http-conduit http-types network text time unordered-containers uuid
-         wai
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive containers hspec
-         hspec-golden-aeson lens lens-aeson QuickCheck text
-       ];
-       homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme";
-       description = "Middleware that communicates to Rollbar";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-rollbar_0_10_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hostname, http-client
      , http-conduit, http-types, rollbar-hs, text, time, uuid, wai
      }:
@@ -218053,7 +214024,6 @@ self: {
        homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme";
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -218739,41 +214709,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
-       version = "3.2.18";
-       sha256 = "0xlwbch06q9mjv36ki79z06n49na48326bawgw1vsz5afcyrlj34";
-       libraryHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client http-date http-types http2 HUnit iproute
-         lifted-base network process QuickCheck silently simple-sendfile stm
-         streaming-commons text time transformers unix unix-compat vault wai
-         word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_18_1" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -218806,7 +214741,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -218850,23 +214784,6 @@ self: {
      }) {};
 
   "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, tls-session-manager, wai, warp
-     }:
-     mkDerivation {
-       pname = "warp-tls";
-       version = "3.2.4";
-       sha256 = "05vfjlgi574nnydfmfpyp3q6mf389iyj9mv94djnm8d1izasml85";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls tls-session-manager wai warp
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp-tls_3_2_4_2" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
@@ -218881,7 +214798,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -219932,6 +215848,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets_0_12_4_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
+     , streaming-commons, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "websockets";
+       version = "0.12.4.0";
+       sha256 = "1sq488nm8bjrg1q9vypag9pd8vljfibx3kacgkcfi1zqmr14x8x3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy network
+         random SHA streaming-commons text
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy HUnit
+         network QuickCheck random SHA streaming-commons test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers criterion entropy
+         network random SHA text
+       ];
+       doCheck = false;
+       homepage = "http://jaspervdj.be/websockets";
+       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets-rpc" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , exceptions, hashable, monad-control, mtl, QuickCheck
@@ -220053,17 +216005,17 @@ self: {
      }) {};
 
   "wedged" = callPackage
-    ({ mkDerivation, array, base, colour, containers, diagrams-cairo
-     , diagrams-lib, MonadRandom, strict
+    ({ mkDerivation, array, base, colour, containers, diagrams-lib
+     , diagrams-rasterific, MonadRandom, strict
      }:
      mkDerivation {
        pname = "wedged";
-       version = "1";
-       sha256 = "1phq3zrx5adclzxri61hr7977jxpq8ycbaan00qxvr3bbk4247g4";
+       version = "2";
+       sha256 = "1aw29dk0h25zw60m288423bakz36k0jpmzdhy7kq2wns3l5k6jqs";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base colour containers diagrams-cairo diagrams-lib
+         array base colour containers diagrams-lib diagrams-rasterific
          MonadRandom strict
        ];
        description = "Wedged postcard generator";
@@ -220383,6 +216335,22 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "wide-word_0_1_0_6" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "wide-word";
+       version = "0.1.0.6";
+       sha256 = "0y3wdd5kslz71nlk32nvmi3yqd331jjl49njm58bixqanyc0k30x";
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
+       homepage = "https://github.com/erikd/wide-word";
+       description = "Data types for large but fixed width signed and unsigned integers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wigner-symbols" = callPackage
     ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
      , random, vector
@@ -220471,6 +216439,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind_0_1_1_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
+     , stm, text, transformers
+     }:
+     mkDerivation {
+       pname = "wild-bind";
+       version = "0.1.1.1";
+       sha256 = "00xs9m87skqnwv6cysy84bfbpnhb4jp46x08gn9f07n5jz113asi";
+       libraryHaskellDepends = [ base containers text transformers ];
+       testHaskellDepends = [
+         base hspec microlens QuickCheck stm transformers
+       ];
+       homepage = "https://github.com/debug-ito/wild-bind";
+       description = "Dynamic key binding framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wild-bind-indicator" = callPackage
     ({ mkDerivation, base, containers, gtk, text, transformers
      , wild-bind
@@ -220507,23 +216493,6 @@ self: {
      }) {};
 
   "wild-bind-x11" = callPackage
-    ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck
-     , stm, text, time, transformers, wild-bind, X11
-     }:
-     mkDerivation {
-       pname = "wild-bind-x11";
-       version = "0.1.0.7";
-       sha256 = "0vdhmjkpy09w21xqhrqaxc645ghyb0ify1yq37wrlabqdqqms08d";
-       libraryHaskellDepends = [
-         base containers fold-debounce stm text transformers wild-bind X11
-       ];
-       testHaskellDepends = [ base hspec QuickCheck time wild-bind X11 ];
-       homepage = "https://github.com/debug-ito/wild-bind";
-       description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind-x11_0_2_0_1" = callPackage
     ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
      , semigroups, stm, text, time, transformers, wild-bind, X11
      }:
@@ -220541,7 +216510,6 @@ self: {
        homepage = "https://github.com/debug-ito/wild-bind";
        description = "X11-specific implementation for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "win-hp-path" = callPackage
@@ -221477,45 +217445,6 @@ self: {
      }) {};
 
   "wrecker" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, ansigraph, array
-     , authenticate-oauth, base, base64-bytestring, blaze-builder
-     , bytestring, case-insensitive, clock, clock-extras, connection
-     , containers, cookie, cryptonite, data-default, data-default-class
-     , deepseq, exceptions, filepath, http-client, http-client-tls
-     , http-types, immortal, lens, markdown-unlit, memory, mime-types
-     , network, network-uri, next-ref, optparse-applicative, random
-     , statistics, stm, stm-chans, streaming-commons, tabular, tdigest
-     , text, threads, threads-extras, time, tls, transformers
-     , unagi-chan, unix, unordered-containers, vector, vty, wreq
-     }:
-     mkDerivation {
-       pname = "wrecker";
-       version = "1.2.4.0";
-       sha256 = "1yrjr1mhywxwdcnakyfgga7jlwpxzb4clldp21igw35y3n53i6y8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal ansigraph array authenticate-oauth base
-         base64-bytestring blaze-builder bytestring case-insensitive clock
-         clock-extras connection containers cookie cryptonite data-default
-         data-default-class deepseq exceptions filepath http-client
-         http-client-tls http-types immortal memory mime-types network
-         network-uri next-ref optparse-applicative random statistics stm
-         stm-chans streaming-commons tabular tdigest text threads
-         threads-extras time tls transformers unagi-chan unix
-         unordered-containers vector vty wreq
-       ];
-       executableHaskellDepends = [
-         base http-client http-client-tls lens markdown-unlit
-         optparse-applicative transformers wreq
-       ];
-       homepage = "https://github.com/lorenzo/wrecker#readme";
-       description = "An HTTP Performance Benchmarker";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wrecker_1_3_1_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansigraph, array
      , authenticate-oauth, base, base64-bytestring, blaze-builder
      , bytestring, case-insensitive, clock, clock-extras, connection
@@ -221590,47 +217519,6 @@ self: {
      }) {};
 
   "wreq" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec
-     , authenticate-oauth, base, base16-bytestring, base64-bytestring
-     , byteable, bytestring, Cabal, cabal-doctest, case-insensitive
-     , containers, cryptohash, directory, doctest, exceptions, filepath
-     , ghc-prim, hashable, http-client, http-client-tls, http-types
-     , HUnit, lens, lens-aeson, mime-types, network-info, psqueues
-     , QuickCheck, snap-core, snap-server, template-haskell, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat, transformers, unix-compat
-     , unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "wreq";
-       version = "0.5.2.0";
-       sha256 = "06v70dpnh7lp1sr0i0fvl2b2cx0z57dfwi8i2fxva0gcdwan0fki";
-       revision = "1";
-       editedCabalFile = "01x430yrqiv02pq7h55h3y70hvz7n62882vnw1m53qqxp667i580";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec authenticate-oauth base base16-bytestring byteable
-         bytestring case-insensitive containers cryptohash exceptions
-         ghc-prim hashable http-client http-client-tls http-types lens
-         lens-aeson mime-types psqueues template-haskell text time
-         time-locale-compat unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bytestring
-         case-insensitive containers directory doctest filepath hashable
-         http-client http-types HUnit lens lens-aeson network-info
-         QuickCheck snap-core snap-server temporary test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         transformers unix-compat unordered-containers uuid vector
-       ];
-       homepage = "http://www.serpentine.com/wreq";
-       description = "An easy-to-use HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wreq_0_5_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , authenticate-oauth, base, base16-bytestring, base64-bytestring
      , bytestring, Cabal, cabal-doctest, case-insensitive, containers
@@ -221667,7 +217555,6 @@ self: {
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wreq-sb" = callPackage
@@ -222673,6 +218560,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xeno_0_3_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, criterion, deepseq
+     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
+     , weigh, xml
+     }:
+     mkDerivation {
+       pname = "xeno";
+       version = "0.3.3";
+       sha256 = "034d38kcgpil1xf32cl131jh7b0x8awhxwv1nnc790x5wn876c0x";
+       libraryHaskellDepends = [
+         array base bytestring deepseq mtl mutable-containers vector
+       ];
+       testHaskellDepends = [ base bytestring hexml hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
+       ];
+       homepage = "https://github.com/ocramz/xeno";
+       description = "A fast event-based XML parser in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {
@@ -223014,34 +218923,6 @@ self: {
      }) {};
 
   "xlsx" = callPackage
-    ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
-     , conduit, containers, data-default, Diff, errors, extra, filepath
-     , groom, lens, mtl, mtl-compat, network-uri, old-locale
-     , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xml-conduit
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.6.0";
-       sha256 = "1a6xvk8b0lsqr3m712879vr3z84snkzcfb9ykikf2azz69kn7y4k";
-       libraryHaskellDepends = [
-         base base64-bytestring binary-search bytestring conduit containers
-         data-default errors extra filepath lens mtl mtl-compat network-uri
-         old-locale safe text time transformers vector xml-conduit
-         zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
-         xml-conduit
-       ];
-       homepage = "https://github.com/qrilka/xlsx";
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xlsx_0_7_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
      , bytestring, conduit, containers, criterion, data-default, deepseq
      , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
@@ -223068,27 +218949,9 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , lens, text, xlsx
-     }:
-     mkDerivation {
-       pname = "xlsx-tabular";
-       version = "0.2.2";
-       sha256 = "0mjmyx7bnbzbwvfiwgsmchl9gyzhn0dbvmr2bwcg4fmddqzmrnfl";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default lens text xlsx
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/kkazuo/xlsx-tabular";
-       description = "Xlsx table cell value extraction utility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xlsx-tabular_0_2_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
@@ -223103,7 +218966,6 @@ self: {
        homepage = "https://github.com/kkazuo/xlsx-tabular";
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -223172,7 +219034,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xml-conduit" = callPackage
+  "xml-conduit_1_7_1_2" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default-class, deepseq, hspec, HUnit, monad-control
@@ -223194,9 +219056,10 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xml-conduit_1_8_0" = callPackage
+  "xml-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers
      , data-default-class, deepseq, hspec, HUnit, monad-control
@@ -223218,7 +219081,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -223337,27 +219199,6 @@ self: {
      }) {};
 
   "xml-hamlet" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, parsec
-     , shakespeare, template-haskell, text, xml-conduit
-     }:
-     mkDerivation {
-       pname = "xml-hamlet";
-       version = "0.4.1.1";
-       sha256 = "0bfhk3hdg70j91g5i9ygz0nmbpffnxa4kh5h828fdgml54i5sv2d";
-       libraryHaskellDepends = [
-         base containers parsec shakespeare template-haskell text
-         xml-conduit
-       ];
-       testHaskellDepends = [
-         base containers hspec HUnit parsec shakespeare template-haskell
-         text xml-conduit
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Hamlet-style quasiquoter for XML content";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xml-hamlet_0_5_0" = callPackage
     ({ mkDerivation, base, containers, hspec, HUnit, parsec
      , shakespeare, template-haskell, text, xml-conduit
      }:
@@ -223376,7 +219217,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Hamlet-style quasiquoter for XML content";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-helpers" = callPackage
@@ -225382,7 +221222,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod" = callPackage
+  "yesod_1_4_5" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , conduit, conduit-extra, data-default-class, directory
      , fast-logger, monad-control, monad-logger, resourcet, semigroups
@@ -225404,9 +221244,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod_1_6_0" = callPackage
+  "yesod" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , conduit, data-default-class, directory, fast-logger, monad-logger
      , resourcet, semigroups, shakespeare, streaming-commons
@@ -225428,7 +221269,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-alerts" = callPackage
@@ -225509,35 +221349,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unordered-containers, wai, yesod-core
-     , yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.4.21";
-       sha256 = "1qqwg9l65m9q3l8z0r1bnihqb5rbbp2c2w6gbk49kx9127rf4488";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base memory
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_6_2" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -225565,7 +221376,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -225694,25 +221504,6 @@ self: {
      }) {};
 
   "yesod-auth-fb" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
-     , lifted-base, shakespeare, text, time, transformers, wai
-     , yesod-auth, yesod-core, yesod-fb
-     }:
-     mkDerivation {
-       pname = "yesod-auth-fb";
-       version = "1.8.1";
-       sha256 = "0y7vl91ih3w2wdv62hpa180l2536778s64w9vqygh7cd9rmikdzg";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit fb http-conduit lifted-base
-         shakespeare text time transformers wai yesod-auth yesod-core
-         yesod-fb
-       ];
-       homepage = "https://github.com/psibi/yesod-auth-fb";
-       description = "Authentication backend for Yesod using Facebook";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-auth-fb_1_9_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
      , resourcet, shakespeare, text, time, transformers, unliftio, wai
      , yesod-auth, yesod-core, yesod-fb
@@ -225728,36 +221519,9 @@ self: {
        homepage = "https://github.com/psibi/yesod-auth-fb";
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, resourcet, text
-     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.6.2";
-       sha256 = "1cydpwy8i5z1ya5k3kn3qx0np3lhv9cka5c6gajwvla8kpgy11df";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent text yesod-auth yesod-core
-         yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text unordered-containers wai-extra yesod yesod-auth yesod-core
-         yesod-test
-       ];
-       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth-hashdb_1_7" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, resourcet, text
@@ -225781,7 +221545,6 @@ self: {
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage
@@ -225987,40 +221750,6 @@ self: {
      }) {};
 
   "yesod-bin" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
-     , containers, data-default-class, deepseq, directory, file-embed
-     , filepath, fsnotify, http-client, http-client-tls
-     , http-reverse-proxy, http-types, lifted-base, network
-     , optparse-applicative, parsec, process, project-template
-     , resourcet, safe-exceptions, say, shakespeare, split, stm
-     , streaming-commons, tar, template-haskell, text, time
-     , transformers, transformers-compat, unix-compat
-     , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "yesod-bin";
-       version = "1.5.3";
-       sha256 = "06q1lnr3q8hplm2fd6blkp2z9awnslyaabjj2pg1cxq2ki9ndvmq";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder bytestring
-         Cabal conduit conduit-extra containers data-default-class deepseq
-         directory file-embed filepath fsnotify http-client http-client-tls
-         http-reverse-proxy http-types lifted-base network
-         optparse-applicative parsec process project-template resourcet
-         safe-exceptions say shakespeare split stm streaming-commons tar
-         template-haskell text time transformers transformers-compat
-         unix-compat unordered-containers wai wai-extra warp warp-tls yaml
-         zlib
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-bin_1_6_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, Cabal, conduit, conduit-extra, containers
      , data-default-class, directory, file-embed, filepath, fsnotify
@@ -226050,7 +221779,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -226149,7 +221877,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core" = callPackage
+  "yesod-core_1_4_37_3" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -226190,9 +221918,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core_1_6_2" = callPackage
+  "yesod-core" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -226230,7 +221959,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -226372,23 +222100,6 @@ self: {
      }) {};
 
   "yesod-eventsource" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
-     , wai-eventsource, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-eventsource";
-       version = "1.4.1";
-       sha256 = "04ry7mzrwxjvgx5y2mcjsjghv6b39dh6zsg834vw5maf0wnph6a0";
-       libraryHaskellDepends = [
-         base blaze-builder conduit transformers wai wai-eventsource
-         wai-extra yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Server-sent events support for Yesod apps";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-eventsource_1_6_0" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
      , wai-eventsource, wai-extra, yesod-core
      }:
@@ -226403,7 +222114,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Server-sent events support for Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-examples" = callPackage
@@ -226473,23 +222183,6 @@ self: {
      }) {};
 
   "yesod-fb" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb
-     , http-conduit, text, wai, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-fb";
-       version = "0.4.0";
-       sha256 = "043k4rzvzyjibyq94vjsk2mvs4l2bwfn41h1jrhfsppw42zh3pcm";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit crypto-api fb http-conduit text wai
-         yesod-core
-       ];
-       homepage = "https://github.com/psibi/yesod-fb";
-       description = "Useful glue functions between the fb library and Yesod";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-fb_0_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb
      , http-client-tls, http-conduit, text, wai, yesod-core
      }:
@@ -226504,10 +222197,9 @@ self: {
        homepage = "https://github.com/psibi/yesod-fb";
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-form" = callPackage
+  "yesod-form_1_4_16" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -226529,9 +222221,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-form_1_6_1" = callPackage
+  "yesod-form" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -226553,7 +222246,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
@@ -226602,23 +222294,6 @@ self: {
      }) {};
 
   "yesod-gitrepo" = callPackage
-    ({ mkDerivation, base, directory, enclosed-exceptions, http-types
-     , lifted-base, process, temporary, text, wai, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-gitrepo";
-       version = "0.2.1.0";
-       sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf";
-       libraryHaskellDepends = [
-         base directory enclosed-exceptions http-types lifted-base process
-         temporary text wai yesod-core
-       ];
-       homepage = "https://github.com/snoyberg/yesod-gitrepo";
-       description = "Host content provided by a Git repo";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-gitrepo_0_3_0" = callPackage
     ({ mkDerivation, base, directory, http-types, process, temporary
      , text, unliftio, wai, yesod-core
      }:
@@ -226633,7 +222308,6 @@ self: {
        homepage = "https://github.com/snoyberg/yesod-gitrepo#readme";
        description = "Host content provided by a Git repo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-gitrev" = callPackage
@@ -226806,23 +222480,6 @@ self: {
      }) {};
 
   "yesod-newsfeed" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
-     , containers, shakespeare, text, time, xml-conduit, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-newsfeed";
-       version = "1.6";
-       sha256 = "05kmnv0by94la3np715j6my41y8wqlvc0h8rf09zvrrg003bqvaf";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup bytestring containers shakespeare text
-         time xml-conduit yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Helper functions and data types for producing News feeds";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-newsfeed_1_6_1_0" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
      }:
@@ -226837,7 +222494,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Helper functions and data types for producing News feeds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paginate" = callPackage
@@ -226907,7 +222563,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-persistent" = callPackage
+  "yesod-persistent_1_4_3" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -226927,9 +222583,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-persistent_1_6_0" = callPackage
+  "yesod-persistent" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -226949,7 +222606,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-platform" = callPackage
@@ -227191,8 +222847,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-recaptcha2";
-       version = "0.2.3";
-       sha256 = "1q7anpls9nczvx65ba64nd1gmqgkznfd1ghv6c7z7pndq5cy91in";
+       version = "0.2.4";
+       sha256 = "1aw104i2v9m6dc5z5iqzihjfybfxg90l0rj0pazb672qzp9yqj18";
        libraryHaskellDepends = [
          base classy-prelude-yesod http-conduit yesod-auth
        ];
@@ -227332,23 +222988,6 @@ self: {
      }) {};
 
   "yesod-sitemap" = callPackage
-    ({ mkDerivation, base, conduit, containers, data-default, text
-     , time, xml-conduit, xml-types, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-sitemap";
-       version = "1.4.0.1";
-       sha256 = "0ri67r3yjngn4m2lj071n2v3r9w7pvsl24rayf41k7w9j3ylk100";
-       libraryHaskellDepends = [
-         base conduit containers data-default text time xml-conduit
-         xml-types yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Generate XML sitemaps";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-sitemap_1_6_0" = callPackage
     ({ mkDerivation, base, conduit, containers, data-default, text
      , time, xml-conduit, xml-types, yesod-core
      }:
@@ -227363,10 +223002,9 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Generate XML sitemaps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-static" = callPackage
+  "yesod-static_1_5_3_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, byteable, bytestring, conduit, conduit-extra
      , containers, cryptonite, cryptonite-conduit, css-text
@@ -227399,9 +223037,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-static_1_6_0" = callPackage
+  "yesod-static" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, byteable, bytestring, conduit, containers
      , cryptonite, cryptonite-conduit, css-text, data-default, directory
@@ -227434,7 +223073,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -227490,7 +223128,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yesod-test" = callPackage
+  "yesod-test_1_5_9_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -227515,9 +223153,10 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-test_1_6_2" = callPackage
+  "yesod-test" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, conduit, containers
      , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
@@ -227542,7 +223181,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -227646,24 +223284,6 @@ self: {
      }) {};
 
   "yesod-websockets" = callPackage
-    ({ mkDerivation, async, base, conduit, enclosed-exceptions
-     , monad-control, transformers, wai, wai-websockets, websockets
-     , yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-websockets";
-       version = "0.2.6";
-       sha256 = "0agfpvm3xig9rwq2rm658ahzv8r0pw6k284s8m1lqgzkl00ij4cq";
-       libraryHaskellDepends = [
-         async base conduit enclosed-exceptions monad-control transformers
-         wai wai-websockets websockets yesod-core
-       ];
-       homepage = "https://github.com/yesodweb/yesod";
-       description = "WebSockets support for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-websockets_0_3_0" = callPackage
     ({ mkDerivation, base, conduit, mtl, transformers, unliftio, wai
      , wai-websockets, websockets, yesod-core
      }:
@@ -227678,7 +223298,6 @@ self: {
        homepage = "https://github.com/yesodweb/yesod";
        description = "WebSockets support for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-websockets-extra" = callPackage
@@ -229078,34 +224697,6 @@ self: {
      }) {};
 
   "zip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, containers, digest, exceptions
-     , filepath, hspec, monad-control, mtl, path, path-io, plan-b
-     , QuickCheck, resourcet, text, time, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "zip";
-       version = "0.2.0";
-       sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr";
-       revision = "2";
-       editedCabalFile = "0vwbgpk6arp1hfndsm9n0f91yhagyqa0byiwvpl77gbiirbzrlwj";
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra containers digest exceptions filepath monad-control
-         mtl path path-io plan-b resourcet text time transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base bytestring conduit containers exceptions filepath hspec path
-         path-io QuickCheck text time transformers
-       ];
-       homepage = "https://github.com/mrkkrp/zip";
-       description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "zip_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, directory
      , dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -229131,7 +224722,6 @@ self: {
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage
@@ -229265,8 +224855,8 @@ self: {
        pname = "zippers";
        version = "0.2.5";
        sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id";
-       revision = "1";
-       editedCabalFile = "0nndhvgkv1v8zg906cblnxb5xiz0ghmvwdwnsn85pyp0rjplcv1k";
+       revision = "2";
+       editedCabalFile = "03vmfmj38sa6pn858wa4fcbn3b0jw5pcypzv0kls600fgdbjfqbm";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base lens profunctors semigroupoids semigroups

From 90696dcb6c05d1691664a1acffd86133fc25f7e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 22:16:11 +0100
Subject: [PATCH 173/203] cabal2nix: update hpack override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 524e73077ad..a9a480668f3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -607,8 +607,8 @@ self: super: {
     haskell-src-exts = self.haskell-src-exts_1_20_2;
   };
 
-  # Need newer versions of their dependencies than the ones we have in LTS-10.x.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_27_0; hackage-db = self.hackage-db_2_0_1; });
+  # Need newer versions of their dependencies than the ones we have in LTS-11.x.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_0; hackage-db = self.hackage-db_2_0_1; });
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; });
 
   # https://github.com/bos/configurator/issues/22

From a13ff71b2148e39811003e34fe30e3338503c9ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Mar 2018 22:16:32 +0100
Subject: [PATCH 174/203] haskell-configuration-common: update a couple of
 comments

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a9a480668f3..602d01d8258 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -845,7 +845,7 @@ self: super: {
   # https://github.com/fpco/stackage/issues/3126
   stack = doJailbreak super.stack;
 
-  # Hoogle needs newer versions than lts-10 provides. lambdabot-haskell-plugins
+  # Hoogle needs newer versions than lts-11 provides. lambdabot-haskell-plugins
   # depends on Hoogle and therefore needs to use the same version.
   hoogle = super.hoogle.override {
     haskell-src-exts = self.haskell-src-exts_1_20_2;
@@ -1004,7 +1004,7 @@ self: super: {
   # Needs older hlint
   hpio = dontCheck super.hpio;
 
-  # Needs turtle >=1.5.0, which we don't have by default in lts-10.x.
+  # Needs turtle >=1.5.0, which we don't have by default in lts-11.x.
   changelogged = super.changelogged.override { turtle = self.turtle_1_5_5; };
 
   # https://github.com/fpco/inline-c/issues/72

From 80b209cf20719afebaaeddbae013dd71cb872014 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:49:00 -0400
Subject: [PATCH 175/203] http-conduit: remove unnecessary override

The 2.3.0 version is now the default.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 602d01d8258..43e2b23841c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -849,7 +849,6 @@ self: super: {
   # depends on Hoogle and therefore needs to use the same version.
   hoogle = super.hoogle.override {
     haskell-src-exts = self.haskell-src-exts_1_20_2;
-    http-conduit = self.http-conduit_2_3_0;
   };
   lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override {
     haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0;

From 41409f634801083d0d2609894ee9d11f95b8248c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:49:44 -0400
Subject: [PATCH 176/203] haskell-src-exts: remove unnecessary overrides

The 1.20.2 release is now the default.
---
 .../haskell-modules/configuration-common.nix          | 11 +----------
 .../haskell-modules/configuration-ghc-8.4.x.nix       |  6 ------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 43e2b23841c..6bf66cd659c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -603,13 +603,10 @@ self: super: {
       ln -s $lispdir $data/share/emacs/site-lisp
     '';
     doCheck = false; # https://github.com/chrisdone/hindent/issues/299
-  })).override {
-    haskell-src-exts = self.haskell-src-exts_1_20_2;
-  };
+  }));
 
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_0; hackage-db = self.hackage-db_2_0_1; });
-  hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
@@ -847,15 +844,9 @@ self: super: {
 
   # Hoogle needs newer versions than lts-11 provides. lambdabot-haskell-plugins
   # depends on Hoogle and therefore needs to use the same version.
-  hoogle = super.hoogle.override {
-    haskell-src-exts = self.haskell-src-exts_1_20_2;
-  };
   lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override {
     haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0;
   };
-  haskell-src-exts-simple_1_20_0_0 = super.haskell-src-exts-simple_1_20_0_0.override {
-    haskell-src-exts = self.haskell-src-exts_1_20_2;
-  };
 
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d216e8a41a0..196888c2883 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -117,12 +117,6 @@ self: super: {
     doHaddock       = false;
   });
 
-  ## Needs bump to a versioned attribute
-  ##     • Could not deduce (Semigroup (ParseResult m))
-  ##         arising from the superclasses of an instance declaration
-  ##       from the context: Monoid m
-  haskell-src-exts = super.haskell-src-exts_1_20_2;
-
   ## Needs bump to a versioned attribute
   hspec = overrideCabal super.hspec_2_4_8 (drv: {
     ## Setup: Encountered missing dependencies:

From 2d3138fc9ab94a5875537dff2bb50ae4d94050d7 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:50:20 -0400
Subject: [PATCH 177/203] tldr: remove unnecessary override

`shell-conduit` is no longer necessary for the expression.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6bf66cd659c..f66cff3bb11 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -352,12 +352,6 @@ self: super: {
   th-printf = dontCheck super.th-printf;
   thumbnail-plus = dontCheck super.thumbnail-plus;
   tickle = dontCheck super.tickle;
-  tldr = super.tldr.override {
-    # shell-conduit determines what commands are available at compile-time, so
-    # that tldr will not compile unless the shell-conduit it uses is compiled
-    # with git in its environment.
-    shell-conduit = addBuildTool self.shell-conduit pkgs.git;
-  };
   tpdb = dontCheck super.tpdb;
   translatable-intset = dontCheck super.translatable-intset;
   ua-parser = dontCheck super.ua-parser;

From 559832d6633510ad60b0fb473e1a5066d0610446 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 14 Mar 2018 19:51:09 -0400
Subject: [PATCH 178/203] isDarwin: make usage consistent

This one was the only one of the form pkgs.stdenv._hostPlatform_.isDarwin.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f66cff3bb11..ee8c65b3d3c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -94,7 +94,7 @@ self: super: {
 
     # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
     # see: https://github.com/psibi/shell-conduit/issues/12
-    doCheck = !pkgs.stdenv.hostPlatform.isDarwin;
+    doCheck = !pkgs.stdenv.isDarwin;
   }));
 
   # https://github.com/froozen/kademlia/issues/2

From 8fdba8ca99b5c6453521b739afe01fd00a99677d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:06:01 +0100
Subject: [PATCH 179/203] haskell-test-framework: disable test suite build

This avoids a dependency on an old version of QuickCheck.
---
 .../haskell-modules/configuration-common.nix         |  3 +++
 .../haskell-modules/configuration-ghc-8.4.x.nix      | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ee8c65b3d3c..b40bd1fbef6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -418,6 +418,9 @@ self: super: {
   HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
   test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
 
+  # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x.
+  test-framework = dontCheck super.test-framework;
+
   # Depends on broken test-framework-quickcheck.
   apiary = dontCheck super.apiary;
   apiary-authenticate = dontCheck super.apiary-authenticate;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 196888c2883..9a987424e58 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -169,18 +169,6 @@ self: super: {
   ## doctest >=0.11.1 && <0.14
   semigroupoids = super.semigroupoids_5_2_2;
 
-  ## Needs bump to a versioned attribute
-  ## Issue: https://github.com/haskell/test-framework/issues/35
-  test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: {
-    ##     • No instance for (Semigroup (TestOptions' Maybe))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (TestOptions' Maybe)’
-    ##
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck >=2.3 && <2.10
-    doCheck         = false;
-  });
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## doctest >=0.7 && <0.14

From 3cf9c63c646ef5cad1544e402647c54e37d07b4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:09:46 +0100
Subject: [PATCH 180/203] Drop obsolete Haskell overrides.

The overrides for the following packages no longer help:

 - HaVSA
 - test-framework-quickcheck
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b40bd1fbef6..9cf1cf6f954 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -414,10 +414,6 @@ self: super: {
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # Depends on QuickCheck 1.x.
-  HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
-  test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; };
-
   # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x.
   test-framework = dontCheck super.test-framework;
 

From 77c16dd7db7c4a267eb12326d8ee482ebfa48719 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:14:11 +0100
Subject: [PATCH 181/203] haskell-hspec: update overrides for ghc-8.4.1 build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9a987424e58..e3169474c03 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -118,7 +118,7 @@ self: super: {
   });
 
   ## Needs bump to a versioned attribute
-  hspec = overrideCabal super.hspec_2_4_8 (drv: {
+  hspec = overrideCabal super.hspec_2_5_0 (drv: {
     ## Setup: Encountered missing dependencies:
     ## hspec-core ==2.4.4, hspec-discover ==2.4.4
     ##
@@ -130,7 +130,7 @@ self: super: {
   });
 
   ## Needs bump to a versioned attribute
-  hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: {
+  hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: {
     ##     • No instance for (Semigroup Summary)
     ##         arising from the superclasses of an instance declaration
     ##     • In the instance declaration for ‘Monoid Summary’
@@ -147,7 +147,7 @@ self: super: {
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## hspec-discover ==2.4.8
-  hspec-discover = super.hspec-discover_2_4_8;
+  hspec-discover = super.hspec-discover_2_5_0;
 
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:

From 6e507784d7f9e60841dc749724e054a493e20b3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:16:50 +0100
Subject: [PATCH 182/203] lambdabot-haskell-plugins: drop obsolete override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9cf1cf6f954..ebe681e6f88 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -835,12 +835,6 @@ self: super: {
   # https://github.com/fpco/stackage/issues/3126
   stack = doJailbreak super.stack;
 
-  # Hoogle needs newer versions than lts-11 provides. lambdabot-haskell-plugins
-  # depends on Hoogle and therefore needs to use the same version.
-  lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override {
-    haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0;
-  };
-
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
   SCalendar = markBroken (super.SCalendar.override { scalendar = null; });

From f0730a1bf57090d06323cf67c1c23046ee4a9e1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 15:17:59 +0100
Subject: [PATCH 183/203] haskell-funcmp: drop obsolete override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index e3169474c03..9d355c74988 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -90,12 +90,6 @@ self: super: {
   ##       from the context: (Monad m, Monoid a)
   free = super.free_5_0_1;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## base >=3 && <4.11
-  ## Needed for (<>) in prelude
-  funcmp = super.funcmp_1_9;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## Cabal <2.2

From 45caa0cf64a8c8b22680635e08ba503cec1ef5c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 16:25:54 +0100
Subject: [PATCH 184/203] haskell-unordered-containers: drop obsolete override
 for GHC 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9d355c74988..20473f4c5c4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -168,12 +168,6 @@ self: super: {
   ## doctest >=0.7 && <0.14
   turtle = super.turtle_1_5_4;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## base >=4 && <4.11
-  unordered-containers = super.unordered-containers_0_2_9_0;
-
-
   ## On Hackage:
 
   ## On Hackage, awaiting for import

From 326e1157a39469913edbcb00c8d8870727a3cdc4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 16:26:35 +0100
Subject: [PATCH 185/203] cabal2nix: update hpack override to use the latest
 version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ebe681e6f88..042d76cb0c7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -599,7 +599,7 @@ self: super: {
   }));
 
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_0; hackage-db = self.hackage-db_2_0_1; });
+  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_1; hackage-db = self.hackage-db_2_0_1; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;

From 2932385b3c5e9bae5c5995344418960704d4d5ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 16:28:53 +0100
Subject: [PATCH 186/203] haskell-pandoc-types: update to latest version to fix
 the build with GHC 8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 20473f4c5c4..4073e4798b1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -768,4 +768,7 @@ self: super: {
   # Old versions don't compile.
   vty = self.vty_5_20;
 
+  # https://github.com/jgm/pandoc-types/issues/37
+  pandoc-types = self.pandoc-types_1_17_4;
+
 }

From 79c2be32adb1d9fe45142f55611c9878bcb54c23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 17:49:53 +0100
Subject: [PATCH 187/203] haskell-doctest: update overrides for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 4073e4798b1..737ed7facbd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -70,7 +70,7 @@ self: super: {
 
   ## Needs bump to a versioned attribute
   ## Issue: https://github.com/sol/doctest/issues/189
-  doctest = overrideCabal super.doctest_0_14_1 (drv: {
+  doctest = overrideCabal super.doctest_0_15_0 (drv: {
     ## Setup: Encountered missing dependencies:
     ## ghc >=7.0 && <8.4
     ##

From 8d0df69f4f1d9c9c5aa83a576d1ee6480bb3d4cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 17:50:59 +0100
Subject: [PATCH 188/203] haskell-vty: drop obsolete override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 737ed7facbd..3879e9f471c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -765,9 +765,6 @@ self: super: {
       stripLen = 1;
     });
 
-  # Old versions don't compile.
-  vty = self.vty_5_20;
-
   # https://github.com/jgm/pandoc-types/issues/37
   pandoc-types = self.pandoc-types_1_17_4;
 

From 080c54cd1c3f090597dea59f49ad21c17d635955 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 18:17:57 +0100
Subject: [PATCH 189/203] haskell-turtle: drop obsolete override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 3879e9f471c..7a96de305fb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -163,11 +163,6 @@ self: super: {
   ## doctest >=0.11.1 && <0.14
   semigroupoids = super.semigroupoids_5_2_2;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## doctest >=0.7 && <0.14
-  turtle = super.turtle_1_5_4;
-
   ## On Hackage:
 
   ## On Hackage, awaiting for import

From e14fa3f2281913f3c24e68c59038191d2c88dacb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 19:58:19 +0100
Subject: [PATCH 190/203] hackage: update db snapshot

---
 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 2f095e49828..c20e56a1711 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/c1b1aa583dc3e3cd2c97c17d865be34ff3e019ab.tar.gz";
-  sha256 = "03q732jxymdxmm9gqfyghjcsscc5qwg7aicx5kk8fkrfz17xd44k";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b09de4efc2a385cf3407072c24c21ec8ec774a03.tar.gz";
+  sha256 = "0yy3k5wgi9zgwz51gxakhlalwac59fkh0flydf334msrxlc3xf9z";
 }

From de7847e683db12611bff58cd6813cef07768ae2c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 19:45:12 +0100
Subject: [PATCH 191/203] git-annex: add overrides to fix the build in an
 lts-11.x environment

---
 .../haskell-modules/configuration-common.nix  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 042d76cb0c7..e2886d24597 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -75,13 +75,30 @@ self: super: {
 
   # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
   # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = (overrideCabal super.git-annex (drv: {
+  git-annex = ((overrideCabal super.git-annex (drv: {
     src = pkgs.fetchgit {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
       sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w";
     };
+  })).overrideScope (self: super: {
+    aws = dontCheck (self.aws_0_18);
+    conduit = self.conduit_1_2_13_1;
+    conduit-extra = self.conduit-extra_1_2_3_2;
+    cryptonite-conduit = dontCheck super.cryptonite-conduit;  # test suite does not compile with old versions used here
+    html-conduit = self.html-conduit_1_2_1_2;
+    http-conduit = self.http-conduit_2_2_4;
+    persistent = self.persistent_2_7_3_1;
+    persistent-sqlite = self.persistent-sqlite_2_6_4;
+    resourcet = self.resourcet_1_1_11;
+    xml-conduit = self.xml-conduit_1_7_1_2;
+    yesod = self.yesod_1_4_5;
+    yesod-core = self.yesod-core_1_4_37_3;
+    yesod-form = self.yesod-form_1_4_16;
+    yesod-persistent = self.yesod-persistent_1_4_3;
+    yesod-static = self.yesod-static_1_5_3_1;
+    yesod-test = self.yesod-test_1_5_9_1;
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;

From 1e8e3d6291c6517cce4cd1111362683f8a3916f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:01:46 +0100
Subject: [PATCH 192/203] haskell-changelogged: drop obsolete override

---
 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 e2886d24597..0496383da2f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -998,9 +998,6 @@ self: super: {
   # Needs older hlint
   hpio = dontCheck super.hpio;
 
-  # Needs turtle >=1.5.0, which we don't have by default in lts-11.x.
-  changelogged = super.changelogged.override { turtle = self.turtle_1_5_5; };
-
   # https://github.com/fpco/inline-c/issues/72
   inline-c = dontCheck super.inline-c;
 

From a11eaf1f04dc4cf75cee430e18a934296b6da35c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:03:46 +0100
Subject: [PATCH 193/203] haskell-regex-tdfa: drop obsolete override for
 ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 7a96de305fb..e5c26439347 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -148,16 +148,6 @@ self: super: {
   ## free ==4.*, template-haskell >=2.4 && <2.13
   lens = super.lens_4_16;
 
-  ## Needs bump to a versioned attribute
-  regex-tdfa = overrideCabal super.regex-tdfa_1_2_3 (drv: {
-    ##     • No instance for (Semigroup (CharMap a))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (CharMap a)’
-    ##
-    ## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:188:16:
-    editedCabalFile = null;
-  });
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## doctest >=0.11.1 && <0.14

From 43d9df52c3cd527a4730daa5c44f6df6941449c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:04:59 +0100
Subject: [PATCH 194/203] haskell-lens: drop obsolete override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index e5c26439347..6fefab4ad31 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -143,11 +143,6 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_5_0;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## free ==4.*, template-haskell >=2.4 && <2.13
-  lens = super.lens_4_16;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## doctest >=0.11.1 && <0.14

From 5c9b3a6b187c1072b38722fc1320acce1d2244af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:44:42 +0100
Subject: [PATCH 195/203] haskell-free: drop obsolete override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 6fefab4ad31..15c37ffbdee 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -84,12 +84,6 @@ self: super: {
   ## free >=4.9 && <5
   either = super.either_5;
 
-  ## Needs bump to a versioned attribute
-  ##     • Could not deduce (Semigroup (IterT m a))
-  ##         arising from the superclasses of an instance declaration
-  ##       from the context: (Monad m, Monoid a)
-  free = super.free_5_0_1;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## Cabal <2.2

From 9254b06b22f6e95aaff755278df8ae1753c80258 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 20:53:03 +0100
Subject: [PATCH 196/203] haskell-src: update override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 15c37ffbdee..a087b66f069 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -45,8 +45,9 @@ self: super: {
   # https://github.com/bitemyapp/esqueleto/issues/77
   esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
 
-  # https://github.com/haskell-pkg-janitors/haskell-src/issues/5
-  haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src;
+  # Need newer version.
+  haskell-src = super.haskell-src_1_0_3_0;
+
   ## Shadowed:
 
   ## Needs bump to a versioned attribute

From 5a1a30becc091c3d01d22e7712d26278470df3b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 21:12:58 +0100
Subject: [PATCH 197/203] structured-haskell-mode: update overrides for
 lts-11.x

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0496383da2f..cff41f865a7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -601,7 +601,9 @@ self: super: {
       mkdir -p $data/share/emacs
       ln -s $lispdir $data/share/emacs/site-lisp
     '';
-  }));
+  })).override {
+    haskell-src-exts = self.haskell-src-exts_1_19_1;
+  };
 
   # Make elisp files available at a location where people expect it.
   hindent = (overrideCabal super.hindent (drv: {

From 81316008f715af84ff3f3d941cfe6d0ba590d834 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 21:16:22 +0100
Subject: [PATCH 198/203] haskell-semigroupoids: drop obsolete override for
 ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index a087b66f069..8dad142ca83 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -138,11 +138,6 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_5_0;
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## doctest >=0.11.1 && <0.14
-  semigroupoids = super.semigroupoids_5_2_2;
-
   ## On Hackage:
 
   ## On Hackage, awaiting for import

From dc7557a2f07d93e583af7f2d25ccf9e102e2b238 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 Mar 2018 21:18:05 +0100
Subject: [PATCH 199/203] haskell-constraints: drop obsolete override for
 ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8dad142ca83..6df7c90536e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -61,9 +61,6 @@ self: super: {
   ##     • In the instance declaration for ‘Monoid BV’
   bv = super.bv_0_5;
 
-  ## Needs bump to a versioned attribute
-  constraints = super.constraints_0_10;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## template-haskell >=2.5 && <2.13

From 520642b6e6056802302f01a35eeb6c75a9413e1b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 18:34:24 -0400
Subject: [PATCH 200/203] atom: 1.24.1 -> 1.25.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index aa3c92da1f7..8c7ff7b5eae 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.24.1";
+  version = "1.25.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0llg2q1hn2wmhi80ddwwb2lir2xwwmrw19i2c1y3qmfb0apynhw3";
+    sha256 = "04iiw0qzl9025l4lasz42w5nfnvsmc7vwcf4a9c2hvl9xsyckajh";
     name = "${name}.deb";
   };
 

From f93d4b6181f5c28b20d63a4d76e182511369c1bf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Mar 2018 18:40:40 -0400
Subject: [PATCH 201/203] vscode: 1.21.0 -> 1.21.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 612932e20c6..a8b38012a13 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.21.0";
+  version = "1.21.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0gib1ljf1zm432cgv9i59dq7n9fblcgy6diy2qy4g1ichi92s2i3";
-    "x86_64-linux" = "08md8q325z8q3afzxbpzvjfwdjw7phqd7cpq2vadwnd2ixvga2nk";
-    "x86_64-darwin" = "0jmlhza48k5amb4phwy8k6xyznvivzd7gjsmsn4lmnasrxj5lask";
+    "i686-linux" = "0c5wh6i4yl601hg0r1c8y25lz7j2p4vhisdnvnx9nzd6v4ib27cj";
+    "x86_64-linux" = "19i0wkl0qccq2cm10khy0xxb53a6g2m061g71y54s4cxb4wimc9l";
+    "x86_64-darwin" = "0d1ws4c3n80gypiarqbylyipg273ssc0m29jnrg7hx1mcy5ljb1i";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From a4a04528e4f5252c0d94dd1ed72405a2b2fca11b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 16 Mar 2018 02:08:24 +0300
Subject: [PATCH 202/203] libva1: init at 1.7.3

---
 pkgs/development/libraries/libva/1.0.0.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/libva/1.0.0.nix

diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
new file mode 100644
index 00000000000..031ac781651
--- /dev/null
+++ b/pkgs/development/libraries/libva/1.0.0.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
+, mesa_noglu
+, minimal ? true, libva
+}:
+
+stdenv.mkDerivation rec {
+  name = "libva-${version}";
+  version = "1.7.3";
+
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
+    sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
+  };
+
+  outputs = [ "bin" "dev" "out" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libdrm ]
+    ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
+  # TODO: share libs between minimal and !minimal - perhaps just symlink them
+
+  configureFlags =
+    [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++
+    lib.optionals (!minimal) [ "--enable-glx" ];
+
+  installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.freedesktop.org/wiki/Software/vaapi;
+    license = licenses.mit;
+    description = "VAAPI library: Video Acceleration API";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56b608779e0..816f0a2b597 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10280,6 +10280,9 @@ with pkgs;
   libva-full = libva.override { minimal = false; };
   libva-utils = callPackage ../development/libraries/libva-utils { };
 
+  libva1 = callPackage ../development/libraries/libva/1.0.0.nix { };
+  libva1-full = libva1.override { minimal = false; };
+
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
   libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl {

From 9c8137ca81fec5db81e0b9dc28055fa02548eeae Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 16 Mar 2018 02:37:42 +0300
Subject: [PATCH 203/203] steam: improvements for native runtime

* Update dependencies using steam-native-runtime from Arch Linux as a
  reference.
* Remove native-only Steam Runtime, just use installed libraries
  instead.
* Mark native-only Steam as broken (due to segfault inside D-Bus). Seems it was
  already broken for a long time. Doesn't apply to steam-run.
* Some cleanups for chrootenv.
---
 pkgs/games/steam/chrootenv.nix       | 112 +++++++++++++++++++++++----
 pkgs/games/steam/default.nix         |   1 +
 pkgs/games/steam/runtime-wrapped.nix |  93 ++--------------------
 3 files changed, 106 insertions(+), 100 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 88cde733176..ce6e86c50b8 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, writeScript, buildFHSUserEnv, steam
+{ stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686
 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null
 , withJava ? false
 , withPrimus ? false
@@ -58,9 +58,6 @@ in buildFHSUserEnv rec {
     xorg.libX11
     xorg.libXfixes
 
-    # Needed to properly check for libGL.so.1 in steam-wrapper.sh
-    pkgsi686Linux.glxinfo
-
     # Not formally in runtime but needed by some games
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-ugly
@@ -68,19 +65,104 @@ in buildFHSUserEnv rec {
     mono
     xorg.xkeyboardconfig
     xorg.libpciaccess
-
+  ] ++ (if (!nativeOnly) then [
     (steamPackages.steam-runtime-wrapped.override {
-      inherit nativeOnly runtimeOnly;
+      inherit runtimeOnly;
     })
-  ];
+  ] else [
+    # Required
+    glib
+    gtk2
+    bzip2
+    zlib
+    gdk_pixbuf
 
-  extraBuildCommands = ''
+    # Without these it silently fails
+    xorg.libXinerama
+    xorg.libXdamage
+    xorg.libXcursor
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libXxf86vm
+    xorg.libXi
+    xorg.libSM
+    xorg.libICE
+    gnome2.GConf
+    freetype
+    (curl.override { gnutlsSupport = true; sslSupport = false; })
+    nspr
+    nss
+    fontconfig
+    cairo
+    pango
+    expat
+    dbus
+    cups
+    libcap
+    SDL2
+    libusb1
+    dbus-glib
+    libav
+    atk
+    # Only libraries are needed from those two
+    libudev0-shim
+    networkmanager098
+
+    # Verified games requirements
+    xorg.libXmu
+    xorg.libxcb
+    libGLU
+    libuuid
+    libogg
+    libvorbis
+    SDL
+    SDL2_image
+    glew110
+    openssl
+    libidn
+    tbb
+
+    # Other things from runtime
+    flac
+    freeglut
+    libjpeg
+    libpng12
+    libsamplerate
+    libmikmod
+    libtheora
+    libtiff
+    pixman
+    speex
+    SDL_image
+    SDL_ttf
+    SDL_mixer
+    SDL2_ttf
+    SDL2_mixer
+    gstreamer
+    gst-plugins-base
+    libGLU
+    libappindicator-gtk2
+    libcaca
+    libcanberra
+    libgcrypt
+    libvpx
+    librsvg
+    xorg.libXft
+    libvdpau
+  ] ++ steamPackages.steam-runtime-wrapped.overridePkgs);
+
+  extraBuildCommands = if (!nativeOnly) then ''
     mkdir -p steamrt
     ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch}
     ${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
       ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch}
     ''}
     ln -s ${runSh} steamrt/run.sh
+  '' else ''
+    ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0
+    ${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
+      ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0
+    ''}
   '';
 
   extraInstallCommands = ''
@@ -91,13 +173,13 @@ in buildFHSUserEnv rec {
   '';
 
   profile = ''
-    export STEAM_RUNTIME=/steamrt
+    export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"}
   '';
 
   runScript = writeScript "steam-wrapper.sh" ''
     #!${stdenv.shell}
     if [ -f /host/etc/NIXOS ]; then   # Check only useful on NixOS
-      glxinfo >/dev/null 2>&1
+      ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1
       # If there was an error running glxinfo, we know something is wrong with the configuration
       if [ $? -ne 0 ]; then
         cat <<EOF > /dev/stderr
@@ -112,9 +194,13 @@ in buildFHSUserEnv rec {
     EOF
       fi
     fi
-    steam
+    exec steam "$@"
   '';
 
+  meta = steam.meta // {
+    broken = nativeOnly;
+  };
+
   passthru.run = buildFHSUserEnv {
     name = "steam-run";
 
@@ -129,8 +215,8 @@ in buildFHSUserEnv rec {
         exit 1
       fi
       shift
-      export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
-      exec "$run" "$@"
+      ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"}
+      exec -- "$run" "$@"
     '';
   };
 }
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 6a6485d4331..b7dbba55269 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -13,6 +13,7 @@ let
     steam = callPackage ./steam.nix { };
     steam-fonts = callPackage ./fonts.nix { };
     steam-chrootenv = callPackage ./chrootenv.nix {
+      glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo;
       steam-runtime-wrapped-i686 =
         if steamArch == "amd64"
         then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 5412a1be518..b3746a50c77 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -1,103 +1,22 @@
 { stdenv, steamArch, lib, perl, pkgs, steam-runtime
-, nativeOnly ? false
 , runtimeOnly ? false
 }:
 
-assert !(nativeOnly && runtimeOnly);
-
 let
-  runtimePkgs = with pkgs; [
-    # Required
-    glib
-    gtk2
-    bzip2
-    zlib
-    gdk_pixbuf
-
-    # Without these it silently fails
-    xorg.libXinerama
-    xorg.libXdamage
-    xorg.libXcursor
-    xorg.libXrender
-    xorg.libXScrnSaver
-    xorg.libXxf86vm
-    xorg.libXi
-    xorg.libSM
-    xorg.libICE
-    gnome2.GConf
-    freetype
-    (curl.override { gnutlsSupport = true; sslSupport = false; })
-    nspr
-    nss
-    fontconfig
-    cairo
-    pango
-    expat
-    dbus
-    cups
-    libcap
-    SDL2
-    libusb1
-    dbus-glib
-    libav
-    atk
-    # Only libraries are needed from those two
-    libudev0-shim
-    networkmanager098
-
-    # Verified games requirements
-    xorg.libXmu
-    xorg.libxcb
-    libGLU
-    libuuid
-    libogg
-    libvorbis
-    SDL
-    SDL2_image
-    glew110
-    openssl
-    libidn
-    tbb
-
-    # Other things from runtime
-    xorg.libXinerama
-    flac
-    freeglut
-    libjpeg
-    libpng12
-    libsamplerate
-    libmikmod
-    libtheora
-    pixman
-    speex
-    SDL_image
-    SDL_ttf
-    SDL_mixer
-    SDL2_net
-    SDL2_ttf
-    SDL2_mixer
-    gstreamer
-    gst-plugins-base
-  ];
-
-  overridePkgs = with pkgs; [
+  overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [
     libgpgerror
     libpulseaudio
     alsaLib
     openalSoft
-    libva
+    libva1-full
+    libvdpau
     vulkan-loader
     gcc.cc
     nss
     nspr
-  ];
+  ]);
 
-  ourRuntime = if runtimeOnly then []
-               else if nativeOnly then runtimePkgs ++ overridePkgs
-               else overridePkgs;
-  steamRuntime = lib.optional (!nativeOnly) steam-runtime;
-
-  allPkgs = ourRuntime ++ steamRuntime;
+  allPkgs = overridePkgs ++ [ steam-runtime ];
 
   gnuArch = if steamArch == "amd64" then "x86_64-linux-gnu"
             else if steamArch == "i386" then "i386-linux-gnu"
@@ -114,7 +33,7 @@ in stdenv.mkDerivation rec {
   builder = ./build-wrapped.sh;
 
   passthru = {
-    inherit gnuArch libs bins;
+    inherit gnuArch libs bins overridePkgs;
     arch = steamArch;
   };