From 02f11bca6095f54dea504a390906b33a033dae05 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 9 Jun 2018 02:10:22 +0200
Subject: [PATCH 01/32] some overrideDerivation cleanups

These four top-level packages were the only ones that didn't have the
meta.position attribute automagically set. This commit fixes this.
---
 pkgs/applications/window-managers/i3/gaps.nix        |  8 +++-----
 pkgs/development/interpreters/luajit/default.nix     | 12 +++++-------
 .../libraries/libcollectdclient/default.nix          |  5 ++---
 pkgs/servers/x11/xorg/xwayland.nix                   |  9 ++-------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index d6668cde2bd..251b893f92f 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, i3, autoreconfHook }:
 
-i3.overrideDerivation (super : rec {
+i3.overrideAttrs (oldAttrs : rec {
 
   name = "i3-gaps-${version}";
   version = "4.15.0.1";
@@ -11,7 +11,7 @@ i3.overrideDerivation (super : rec {
     sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
   };
 
-  nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
 
   postUnpack = ''
       echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
@@ -19,7 +19,6 @@ i3.overrideDerivation (super : rec {
 
   # fatal error: GENERATED_config_enums.h: No such file or directory
   enableParallelBuilding = false;
-}) // {
 
   meta = with stdenv.lib; {
     description = "A fork of the i3 tiling window manager with some additional features";
@@ -36,5 +35,4 @@ i3.overrideDerivation (super : rec {
       Configured via plain text file. Multi-monitor. UTF-8 clean.
     '';
   };
-
-}
+})
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 59394d3ccc8..73b979e9ca4 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -7,10 +7,8 @@ rec {
     version = "2.0.5";
     isStable = true;
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
-  } // {
-    # 64-bit ARM isn't supported upstream
-    meta = meta // {
-      platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
+    meta = genericMeta // {
+      platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
     };
   };
 
@@ -20,13 +18,12 @@ rec {
     sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
   };
 
-
-  meta = with stdenv.lib; {
+  genericMeta = with stdenv.lib; {
     description = "High-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
     license     = licenses.mit;
     platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ];
+    maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
   };
 
   generic =
@@ -37,6 +34,7 @@ rec {
         url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
         inherit sha256;
       })
+    , meta ? genericMeta
     }:
 
     stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index e4e61c94283..4f0ba439417 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, collectd }:
 with stdenv.lib;
 
-overrideDerivation collectd (oldAttrs: {
+collectd.overrideAttrs (oldAttrs: {
   name = "libcollectdclient-${collectd.version}";
   buildInputs = [ ];
 
@@ -16,7 +16,6 @@ overrideDerivation collectd (oldAttrs: {
 
   postInstall = "rm -rf $out/{bin,etc,sbin,share}";
 
-}) // {
   meta = with stdenv.lib; {
     description = "C Library for collectd, a daemon which collects system performance statistics periodically";
     homepage = http://collectd.org;
@@ -24,4 +23,4 @@ overrideDerivation collectd (oldAttrs: {
     platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
     maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
   };
-}
+})
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 6de53faf771..4c728d2e3e7 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,9 +1,8 @@
-
 { stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
 
 with stdenv.lib;
 
-overrideDerivation xorgserver (oldAttrs: {
+xorgserver.overrideAttrs (oldAttrs: {
 
   name = "xwayland-${xorgserver.version}";
   propagatedBuildInputs = oldAttrs.propagatedBuildInputs
@@ -28,14 +27,10 @@ overrideDerivation xorgserver (oldAttrs: {
     rm -fr $out/share/X11/xkb/compiled
   '';
 
-}) // {
   meta = {
     description = "An X server for interfacing X11 apps with the Wayland protocol";
     homepage = http://wayland.freedesktop.org/xserver.html;
     license = licenses.mit;
     platforms = platforms.linux;
   };
-}
-
-
-
+})

From 4239726e0dcb923a40d0870c462ff0fa2dc2f0fa Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 22 Jun 2018 00:01:32 +0200
Subject: [PATCH 02/32] pythonPackages.thumbor: 6.4.2 -> 6.5.1

The current `thumbor` build on master: https://hydra.nixos.org/build/76000076

This is mainly caused by several dependency bumps (e.g.
`pythonPackages.tornado` to v5 in dd936ccdb9bb04436f4e045998f305de12a67eb2)
that broke the `setup.py` from version 6.4.

Bumping to the latest stable version (6.5.1) fixes these issues.
---
 pkgs/development/python-modules/thumbor/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index 94261b10e3d..37d8f3a5134 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -1,26 +1,19 @@
 { buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
 , pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
-, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib
+, piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib
 }:
 
 buildPythonPackage rec {
   pname = "thumbor";
-  version = "6.4.2";
+  version = "6.5.1";
 
   disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";
+    sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
-      sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}

From 8226e0a6a32b216af2b9aec6b07242d58dd0848b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 22 Jun 2018 00:42:36 -0500
Subject: [PATCH 03/32] influxdb: supports darwin

---
 pkgs/servers/nosql/influxdb/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 972bd53d95e..0c549e2b7e9 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -27,6 +27,5 @@ buildGoPackage rec {
     license = licenses.mit;
     homepage = https://influxdb.com/;
     maintainers = with maintainers; [ offline zimbatm ];
-    platforms = platforms.linux;
   };
 }

From 3c8d19fc6914fc65047b001a8c24b9d0eacbcab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 22 Jun 2018 11:50:57 +0200
Subject: [PATCH 04/32] qutebrowser: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 90beb85bbf4..c2f27a0f7fc 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -29,13 +29,13 @@ let
 in python3Packages.buildPythonApplication rec {
   name = "qutebrowser-${version}${versionPostfix}";
   namePrefix = "";
-  version = "1.3.2";
+  version = "1.3.3";
   versionPostfix = "";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0zy2cm85qq095hk94d8jk6yqpyy0f31vb2pfbdpgg93b9vvzajzz";
+    sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8";
   };
 
   # Needs tox

From f13f2434d0431294e0532f3619e124fe496e20e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Jun 2018 14:21:44 +0200
Subject: [PATCH 05/32] Revert "Fix null deps in ghcWithHoogle"

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

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 803ff2b20d1..38e8dfd24c4 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -52,13 +52,10 @@ let
       This index includes documentation for many Haskell modules.
     '';
 
-  # Packages like base and bytestring are null. These must be removed
-  # to prevent eval errors.
-  nonNullPackages = builtins.filter (p: p != null) packages;
   # TODO: closePropagation is deprecated; replace
   docPackages = lib.closePropagation
     # we grab the doc outputs
-    (map (lib.getOutput "doc") nonNullPackages);
+    (map (lib.getOutput "doc") packages);
 
 in
 stdenv.mkDerivation {
@@ -70,10 +67,10 @@ stdenv.mkDerivation {
   inherit docPackages;
 
   buildPhase = ''
-    ${lib.optionalString (nonNullPackages != [] -> docPackages == [])
+    ${lib.optionalString (packages != [] -> docPackages == [])
        ("echo WARNING: localHoogle package list empty, even though"
        + " the following were specified: "
-       + lib.concatMapStringsSep ", " (p: p.name) nonNullPackages)}
+       + lib.concatMapStringsSep ", " (p: p.name) packages)}
     mkdir -p $out/share/doc/hoogle
 
     echo importing builtin packages
@@ -89,9 +86,10 @@ stdenv.mkDerivation {
     ${lib.concatMapStringsSep "\n" (el: ''
         ln -sfn ${el.haddockDir} "$out/share/doc/hoogle/${el.name}"
       '')
-      (builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null;
-                          name = p.pname; })
-        docPackages)}
+      (lib.filter (el: el.haddockDir != null)
+        (builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null;
+                            name = p.pname; })
+          docPackages))}
 
     echo building hoogle database
     hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle

From 9af0ed346d710afbaa37b44b651199381c37543a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 22 Jun 2018 13:16:01 +0000
Subject: [PATCH 06/32] libcpuid: clean up

---
 pkgs/tools/misc/libcpuid/default.nix  | 60 +++++----------------------
 pkgs/tools/misc/libcpuid/stdint.patch |  5 +++
 2 files changed, 16 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/tools/misc/libcpuid/stdint.patch

diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index 410ab454312..5941b8056b1 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,10 +1,5 @@
-{ stdenv
-, fetchFromGitHub
-, libtool
-, automake
-, autoconf
-, python2 # Needed for tests
-}:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
 stdenv.mkDerivation rec {
   name = "libcpuid-${version}";
   version = "0.4.0";
@@ -16,51 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7";
   };
 
-  patchPhase = ''
-    libtoolize
-    autoreconf --install
-  '';
-
-  configurePhase = ''
-    mkdir -p Install
-    ./configure --prefix=$(pwd)/Install
-    substituteInPlace Makefile --replace "/usr/local" "$out"
-  '';
-
-  buildPhase = ''
-    make all
-  '';
-
-  postInstall = ''
-    pushd Install
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/
-    popd
-
-    function fixRunPath {
-      p0=$(patchelf --print-rpath $1)
-      p1=$(echo $p0 | sed -re 's#.*Install/lib:##g')
-      patchelf --set-rpath $p1 $1
-    }
-
-    fixRunPath Install/bin/cpuid_tool
-
-    mkdir -p $out
-    sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc
-
-    cp -r Install/* $out
-    cp -r tests $out
-  '';
-
-  nativeBuildInputs = [
-    libtool
-    automake
-    autoconf
+  patches = [
+    # Work around https://github.com/anrieff/libcpuid/pull/102.
+    ./stdint.patch
   ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   meta = with stdenv.lib; {
     homepage = http://libcpuid.sourceforge.net/;
-    description = "a small C library for x86 CPU detection and feature extraction";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ artuuge ];
+    description = "A small C library for x86 CPU detection and feature extraction";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ orivej artuuge ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/libcpuid/stdint.patch b/pkgs/tools/misc/libcpuid/stdint.patch
new file mode 100644
index 00000000000..beb8890c5a2
--- /dev/null
+++ b/pkgs/tools/misc/libcpuid/stdint.patch
@@ -0,0 +1,5 @@
+--- a/libcpuid/libcpuid.h
++++ b/libcpuid/libcpuid.h
+@@ -88 +88 @@
+-#include "libcpuid_types.h"
++#include <stdint.h>

From cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 09:33:25 -0400
Subject: [PATCH 07/32] android: Use NDK 17 for aarch32

---
 lib/systems/examples.nix                               | 4 ++--
 pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 4 ++--
 pkgs/stdenv/cross/default.nix                          | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 4c7dd991791..2d77a57fbe3 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -31,14 +31,14 @@ rec {
 
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
-    sdkVer = "21";
+    sdkVer = "24";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
 
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
-    sdkVer = "21";
+    sdkVer = "24";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 9541d62e160..a0f684d37cc 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -18,12 +18,12 @@ let
     "armv5tel-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
-      gccVer = "4.8";
+      gccVer = "4.9";
     };
     "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
-      gccVer = "4.8";
+      gccVer = "4.9";
     };
     "aarch64-unknown-linux-android" = {
       arch = "arm64";
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 41b5fd99504..973be983186 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -41,9 +41,7 @@ in lib.init bootStages ++ [
       targetPlatform = crossSystem;
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
-           else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit)
-             then buildPackages.androidenv.androidndkPkgs_10e.gcc
-           else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit)
+           else if crossSystem.useAndroidPrebuilt
              then buildPackages.androidenv.androidndkPkgs.gcc
            else buildPackages.gcc;
     };

From 25ee8e0f70d510c8a828678ae6a0a9782215d0e8 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 22 Jun 2018 22:05:26 +0800
Subject: [PATCH 08/32] firefox-devedition-bin: 62.0b1 -> 62.0b2

---
 .../firefox-bin/devedition_sources.nix        | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index fad5f0bf434..b5e17363a51 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0b1";
+  version = "62.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ach/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ach/firefox-62.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "a87905427f380f4234a76e36f1157c7b4286e71b46aadc84275ec21897a179d2e6aabee553efb3528c9b8a6255ecf6145bd05e96dd1ace096832cd5c724996cc";
+      sha512 = "e8a73275e443ca96a98e7be86aed6fde2d260c679d8e6c6abe14cee34a7cce6546fe2d67e3f6e459e70aa1c24cea4e1fea5989e1e445c010eb09c6c380e92836";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/af/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/af/firefox-62.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1178bdcfbcdb948284847df330666f82ff4347c38d1737177469c7a3e32a792cb9434103adcaefc3773421b5f544ccba0464d4329464ce1dfcefc99eee837e2e";
+      sha512 = "a8840407317ba6c78d8107eed1dda66b1cadbcbb3974408a7591a0b707d48a315d8510bab6745928ff373557b322abaa5004e4ec72ac47a10b8f3e844a739078";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/an/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/an/firefox-62.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0097dbcf6f23251e0328d3966c76e250f9be83a232f9cfb3afcdfa6b445193beea64fe907396bb54a41ab89008dc35304b8de7dc8b7abf7bab8afc703ed71ddd";
+      sha512 = "592cc4f177c6a66c25c1921f15446e2358a2cf248747e7f528b9f0c0bba068454c7adcea39a7c1b07dacb17512ce530bef57015a3c3292fd87a312855209df32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ar/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ar/firefox-62.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "6c26898763eb09341d6b39d9519f4ffc869202fa14b7a16187eec8e736e0575b119e0d4f6dc47eff3caaa1a0e62bdf7b61c729f26463a4dc96a1e6e700fc29f7";
+      sha512 = "8914a43999c7c48bd2d6b898cf809f1a7bffb41f64f12eabf6821eb7bae9dfd47431636976bcd746a219e951ec546b45257d03280e4d1805098d14fc2c2b66db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/as/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/as/firefox-62.0b2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "55a3a9f38a810981538d714d29c2c53cbea4953d187480838fefe5e83e101b0ebf40f4584fcf6e8967b978c54e03ccd59d9c07653aa4663de679438bdf5047e6";
+      sha512 = "b25747a2c9fab1e0137f39d7c620ef8d0f6d997dded045c8c7f8eaa1167393357ad555f7e82597169bd2f61cb88eca83269e3e4f6f4a257a1cf97dbe9520cca0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ast/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ast/firefox-62.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e531fcd3d3140dd2733ee2e62d7b092ab55b96c91a4be6004240a7d505cb64e3b38d8e0b2dab15634d814174e93936b19150d88bfde3bd5af0e322a63cda14bd";
+      sha512 = "d577dbd473dab2fc618ada2d6ebceae37796a5401f5d7dbdf6f78fbd2078df79d612280c816105a6776f8a0f49dd18f46af4def052af351f7e846a90a4dfeff4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/az/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/az/firefox-62.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "00734d67c95010caf326a2e3751564f801225e8d524d94d2cfdb11daf56ccc80b2904e6811b355720434efaa29a58a06c46157527f8d7c148e89ac420ac6d83c";
+      sha512 = "c7713c7464582b96584f4d16f1cb70321503c971052d135dfac46df661cc8569661041b5c9dde1d78e7c9dce7a8f3794210611f961cdafab11445fb8907e606d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/be/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/be/firefox-62.0b2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "326cab9a252bed4bf51d36b53f59f12cea73e7fa9c2b930c86353bea8bbd2ef4ac962bbcfc68f4145fda0de2651db294d42d826c6bb1d7555de514a83010ab8c";
+      sha512 = "4b1129d50cd2948ba7168bec3a9f2e380672da29a5ffd86ba69a7a1fcdc7a154b35192176da97bf0bab284be53f5aff64c7c9d07ddae3f7a38395b97e669d365";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bg/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bg/firefox-62.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "98f3ad0cb0bd02d4107f9799138cb5fd41fb435b0755bdbdedd926c5409427605febbc6fbb060c5f68876fd5b40e0e3b8bec67a9ee3f957611cea922127277ca";
+      sha512 = "be0dd58530cbf5a2d1a45ac83b8a5c6876f27ff603ed7e38c26993ed9730984ad7314d2191494f3e30eaccac19aab24ef0d2148e965162975f24d2dbbe92bce1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bn-BD/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-BD/firefox-62.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "62e2d3bdf24346326831721e9b3e71fb041dba6774c1ad9c3806bec52e2d38dab14c4fb67a78d803233fb40f8ed6e4d2910bfe97ad4711090c87dd81fad2cc65";
+      sha512 = "17d9323b7e6bd65e4af89be8aa7fdfcfe3e090e9d8a911c0e6403f9a8aad4238acdb5e259e958e78b11fbdb51b65d9eb62b1c0e322e8cced623250d921234887";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bn-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-IN/firefox-62.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "21cd75ade9c30a21964d3147b8120d94993bbb406ca9e58643ca78cfe81c9f13bbe8538961eb6b3ced551dc1e80f7060c9a5899c4046db0063513f254789ec29";
+      sha512 = "544f72273a6db0d219878d3ed49567fe2f0e5e72e5c8e3b85ba0ecacb60813a5a3ccdb1466a9c0156ca44622a2d451a6b93fd3303b2512135da89d0430bfb928";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/br/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/br/firefox-62.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a63061938c280c299d54627f979c9ffdf2dec1271b767bad0a972f1300fb150746775e6dcdc86c3dfe184a45afd4e864e08fe78a8c7a63f318c2e227c84d1773";
+      sha512 = "cff328e9154f5c73722f9245f07177a97d46eaed99a03b3177f3eaa83157a9e584caf8731e55c73896eb2f8c01d16e7ca899ac6ceaa8bdc43bbe68c21d90fc13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bs/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bs/firefox-62.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "3703be2a357ce4eb122b70450e1e45054b93d9f9de78a797fab75d1b4125c75e4c8a10c58c40f764631806b070d48536e36b372c168cbc945bf05198cc8dd5f9";
+      sha512 = "eb419f8a8cf848ed8913511c8f7fb5585e4171d9c2062900f693face140d91bb5cdfd7ac413be4df928793f5b5d7780ab3b877da596848b8255d7fc0139efeb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ca/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ca/firefox-62.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "7d5d296e589c5eeedb6e293a55ae9594e71ae034fd58cf5b474f0dbe1d567f0783b4d97336861d4f14a4201302f353ab41a30040bbda30a66f795b640114dba0";
+      sha512 = "6e113bdc0ec10629d285a15dce967699d5299ac82e99744d6b707f338b0e407d0a03803e3c70da94fd13e460887e66919edf7d5ed07d12b9d0d1c21de811dc40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cak/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cak/firefox-62.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "884554722c3c019bc7e1afdb14ac26eedadbec8fa7b1f7efee99e5c4bfca0ea52969d122632bfc17e54ce91731e9577270c74d5bbc86adcf252de2732aff3685";
+      sha512 = "639a98dc336f0b11dcb9b98c4c3e2a81f47086cc6ef4eb9f22eacb232832a3fedb071302bafec8df0c4f819afb4b0dc95c8c709be69a06ac16eea50dd44c8f9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cs/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cs/firefox-62.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "5f8c14bbf0090b6beb8b10bdf2400511347157aa329659fef174c0e8d651bc3ab43282c5b4492aacefba0a19230d55b8a90412c6bae7d7c70de9ce104169ac5c";
+      sha512 = "5fdb22988c3f04be8974e8746c2b3f3b794d5dc5c317830883e3ffee67c82a2dca21f45c2e8b695be3612c906d03bfc54db5fc086c63a35eb9b204eb7177e18c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cy/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cy/firefox-62.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "90bb43395d0257bd1f48d9c673465850ad05c5e5b80a337d6438394defcde211ea35a164bd5ae9a9b80980bb955f686ef73a6c50699d209c8bec7df7c1b72be8";
+      sha512 = "2c89c1ab0808d85cfb148690265c51a2c5af3a507799cca510c3c1901d2561a27a077d0f7f1136f61b7db1a0eee1ef98da61d6c16718d0effe8621c71368264e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/da/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/da/firefox-62.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "6f4aa6e27afeef8424a577cd7d5d67fc51636a71d2f4243f703ef327d9e5b69d835d6dba4eb7a7a2e3aed444903f457e944da787549401cd1ba3bad2cdd38bdd";
+      sha512 = "40544a20f4826d7b91904690ba0c3e2a37b422309447adff63515405ee46a73ee6e9741f42a29e36055420bfd917fb732c179174f7536c97fe8e745aa791eb77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/de/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/de/firefox-62.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a533e81e2935e33606ca579a4c70d56be07ab70352a6ed37509a23d3e36d0041a053d7117bd495f2d944c0d5ce91848f99ac397c399af41813e469289ab028ce";
+      sha512 = "4b2354b069925c77e3cca77c49013ff3f5fbf8586c0158b83762dad1ab3028a35f26eb3f80cc79f8f7c729adf23d1ad8f28f81b1210f2a79c01b3ce0b8e9bdfb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/dsb/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/dsb/firefox-62.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "4977ef29ad99e13f98156f2ab4f29c2e36cfe1c07bf4bd2db19d6e2af005c319d00370480c15cd56db4266d3922da3456fea18a85fea534f3fe7848d50cfc683";
+      sha512 = "ee0922e704593acda845e4d5e211e364625fb5749794e1d945178462a2351d12617823917d0f79fefbe9dcee24f4dafdc174742d12a778ec6959471e31bc1005";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/el/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/el/firefox-62.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5fe84e58b746519b9ad95294443dc112186916c7cba6728c955f8d986f587dcf3542bf3c3c5b5b2eb862b5ba22849ff870a178be70ccd5f9807db0a5b83a98af";
+      sha512 = "f07de19cc17675c777e66341d771a3271b558318358af1b379dbe90ca23c01451217680fab80980fbbadd9a82bfc6bea84f8b8568dad00304b22cab19ba933f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-CA/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-CA/firefox-62.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "f16ff6e47ef02e83e2dd73db8a559bd1ccf871d545a3fd744addd7c4c034af5329d17ed253b77c0186f29cce3f84b7ebaf4539df533c783defabb1527d7fbd94";
+      sha512 = "ceed256dd96a3b356f3cb89e01d10450f33f5dae8f4224145cea553fc825c315c2f3b9bf670c80cd0648e31be56cf2f988ec62d95f0bc554684baa35f59294bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-GB/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-GB/firefox-62.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "69383c1076d7ec8a88c1b8b4ff9a42c9fd6d6a615fe729e11f5b2d45d52df9b51e1ccfb953ac5e62dcb54ba6c806f1dca5cc24c76f586dc4c74c70fa768d7edd";
+      sha512 = "723cb9937c49bb44a425c4a8f8ea4379ca97f11ab1aa4d7108204211925aefe370a7ca3fa2ed68dc38ec4157b866c0c2988c5c1b375bda07e9acd8b3b40c53d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-US/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-US/firefox-62.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d36f78be9b830596356017348d3e0f30d55f6da6f37d54719e06b5d49a96e171c14af457febc8e8dabe88752833f8ac700ddc2c5bcdbe92bf9593b4938f847a0";
+      sha512 = "386a86c641c225508d7efa4a467b981154ea41c06a5948d09e7d6c3ebe4e8cd9236e52ab6a5ec1e543b80f9402b1e0aea26d2a7b2bed81b742f3923e2420e92c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-ZA/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-ZA/firefox-62.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "dd106e71d05e801ac6c1b127dff07bcb2d10b235f075ad85e7d1acd3ab583eb76ec88ee8e1698382b35b407604ce5d5b74a7afb6ac491b57e925c957cb419f61";
+      sha512 = "60138c99ad5413379646ae8939be17bcf4bdc205c850a21d759b1b15a53740326cd4bbdacdc86e1affb7a6f522064b3f6a61a14c0590b5a50755c5a5713d3703";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/eo/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eo/firefox-62.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "7bdf3e44663c9665942a88ea3ada22cb178b656e036b8a20ad7b14b78f38334cc3aa34489622eee180ec52e2474c6a89803e676ae83cc509290cb6394b228930";
+      sha512 = "f03d76e59a2ec73cbefe815595febd99225b3a88b6eaee721dd714c6104122f7d6380f43270808ac7d58a958bca77f346941a88cca0ce8d280988e3e7f8b56a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-AR/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-AR/firefox-62.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "241e516324dc6003d6944a3341532192ac8dccb33e128fec57e0026c5e24b5e9e533f2f5cd995cb0543f84ca2f10c92e2464ba0946eac115ea3e615866dc8122";
+      sha512 = "43b3d2e06b37e41bdade831238d025bc9ed244ae47c05c97059136926bc07cbf5468ae18d31479daabd57200a03cee3e076dbe2fbe9c82393b649b74dc640aea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-CL/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-CL/firefox-62.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "3c51d5fec1074ad4d9ef0dd1617b183ef3550b5b6b653bbc529c23adb59ae7e11081adf554be2924d9dae1a483403d7bc570379cdbaeaa3bb262c678def252eb";
+      sha512 = "50fb64e738d45199b7244586093f939392d9a4aa4b94f34724d8390a749f55b0da32278a7b239f48802fad45a2e497cff5b745d6bd805f98de5c214057192d4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-ES/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-ES/firefox-62.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "45f0c26958718df7ae9d7c25e9e7dbd0a2358a02b46e8927f38b264325b2baaf936ff371713abf334afc3eb99a069372ba53efaa6514384f225c1e5353b4afdd";
+      sha512 = "d0252a66a1222b1fcbb3fcd57cbd5e11da901409b714911da4642961e854174f9b082bd0694da0afbbc6864fe6df16a60c7a02087c1d4ebd9443306ed63cd292";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-MX/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-MX/firefox-62.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "9d17ccec770e1004149bda6622a27c5ec9fe72ea6c8e0c43adf20d2afd6f417a8a89ae737b3e1bd51dc520747996eddb1d489db0557b825fa15ada232af58e92";
+      sha512 = "1a989fa0f586bab19a4b4247e11fc9a74280ee8c66e6655c309fa8413864628742e9d41f60a3f4097523aa90f0ea5176e84c38daaa34853509e38596339690a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/et/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/et/firefox-62.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "c1cb2baa3f4698818f2b914f66e95f0d09755d28b416499f046d5bc043cd8dcb07fdd01a302cf898fcf80fbb88848bde740a18bad0feb08c046f08f44ac58f30";
+      sha512 = "640a65fb860b8678e547c79a0b5c2063a87473ff2813662eccac2e9a47ba57fd41ca20bcd200cda8fd9e01e86ebfdc2a8510534c1d4a4e22ad6f100a9533f2c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/eu/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eu/firefox-62.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "05e7a366441e6672d424391818fa662473a30ca6b894e928ebd77c918989346f12bd37b03ae442b765168dee4499c92fad460941b11d21373411530771fa093d";
+      sha512 = "0fd6c238fdda13eebaa18784e78158427fb94975943f0b0a8d07ff1d8d16d7ecb2d34b95417237cfbf2ae3c63652c5b1ff39350de2fba38a959b5d8b6b7b469a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fa/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fa/firefox-62.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "c36a4962eafe222db6b320a2d5477ea37b7f9e79db1ad9ce0e13c879b876d3adf790caa148e5fddcaea8890bb6a2c1d0489d202842868aa1851312ff50e6cead";
+      sha512 = "1f9fd5d3c6987a3ce9a10aa057d9334e3b2dd050b1b240c4a704e3e3599f6e2b98bb776f31f46284c16109b0eb89e533bda4b48dbfb22dc5a804df631a60f22e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ff/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ff/firefox-62.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "2321bc75c84f5700157a5b774437ae2ce63b791fb8e4d9dbc5c66df39b6a513f1b2669c605ed5ae0ac1890aa1429b4f342099574e89352dc24e270ce1ee99a36";
+      sha512 = "9a11342c02298fbc3f8fb3bd0daf38796f70db7aacc5f2d127d3b2102d9c732347fe4bfc9ca368b7d6181c294091ad2cf7d8bb7017eeb3abbd2fb9180ac6597c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fi/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fi/firefox-62.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "4982001bafabd64ccf7c761efd142b02e88c03fe5c8d245a8918f4490436fd8778c149211bde5bdabe6f19d30ff3cad48a1c6462557008a3cde6df369f96007b";
+      sha512 = "4b8ec3d78c38db9078e128c0c7b37306946053c1073972a8960a3299e0419e42526c762e6fd8da95b14dd521d334b85bd61290e3759df186bf305ed1c7b2cbad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fr/firefox-62.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "2f68665bc1e0f933dd5cebaa76133d32d1a729520022ca76708ecdaf9e7bcbb27f365f95cc725e0da44b20239cf60039526850858f9d2102a1736fdba7dbdea9";
+      sha512 = "96ef7135fa52202ef8a6aef9ccaa0a2e29a43fe1175d0be889a41ce92c731a31cd7c1809dbedbaec2e16a832da5f3d73a3c77a0703d8985a62e1ecddf8a267e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fy-NL/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fy-NL/firefox-62.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "90866a8c0e7c1f4cc27d69e03b24d47505d34ca07d54f1bd5718ab8b440ff869fc1e2b359f200f05ab77b5360b96b2a1ae4a5cc1981edac41c9db0f187264041";
+      sha512 = "767da4cc0d82efe65c1c740ba8d604b1d50f920daeee5fea2dcad5efea5f46f168ac8d27a15fcfbd0af30d6df2c3f0210301df2c7006a5b39a207c190c0f7e0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ga-IE/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ga-IE/firefox-62.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ee503cd31998e51cd9353129ceb204879c3acf24bc6cf5f09a4cb81a223cc62a360190d6ff6a8742bff8a37c7740a475f20cca723d7afad48ea6acbd1e67d376";
+      sha512 = "1828c79bc6d80649eddb9d8fdfb7b395e66f3ef5fc900fbeb3d727955aed292a782fe8a413038c037fb699b49d93b72b645c699868f55c823a68e7a5abd468ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gd/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gd/firefox-62.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "4fa5938eced70ca43010b6c390e3dd97e5cd27e0355d217f100823ba5c2d324795be340e71d77dcd2cb0f213409f04c51866a31fd1f913524869f4899414d0ea";
+      sha512 = "ab3f9798ba035a33bfc4cfbd576b883e2d677932e6f8f75cd1c129cbdbd02323004fbabd69a26ffeb34d4eb2197d0e079fe1fde8044eb1b4c626e87cbc800219";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gl/firefox-62.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "9c958f29ecc41a631985edb6a3744ca2ae132832b743fe9f43b5b308b115e509dff110f61da057780708d2a998110062f09a135b2e53e896f3d938ef9c821c33";
+      sha512 = "c9e0d513265faa304d17ed8471da5ef42b84e6eb8b992a22e267b29545eeb72042061f575b5085d5c25d7a1f9dd222da53535670e5a251eb6dc7d2cd3b700e79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gn/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gn/firefox-62.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "94efb1247d9ceaa1b1c2e79d1163dff31b8b87794ebdb22236f111e0bccede73cddc1ccddda387d8e7606c9dc0295167d0941af6a56b456fd2776481ecd7893b";
+      sha512 = "f0d2117c871fe61a0b3c4f2b08bc1a35b25f892ed08231f48c84fc4d88180b7d37fcac08550eb06b49fcfb76188ff08e89fc23933ce3205e3e7f628f242df826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gu-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gu-IN/firefox-62.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "876a944f415aa830b5b7231d6feb765640ff4b7cc0bf6c40f12a4d03acca6feaef7d7cfbdb0de8ebbdab112663323b3adb08b92b32bc241515b433640431e7ca";
+      sha512 = "35d62c047992a5ad288e905fc4f386f3d3618df2c42f617cc7c2be777604a8a30d17c14e4e7ee21f06b35657d6cc8b2743379836d433652c7509f6c0455956a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/he/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/he/firefox-62.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e04deddf11b82bdbdb0f98be9144423735bbbd467b6f2f15c2f6609b1ab3a3024e7205c2397faaea1d817feb9f71843458c9c4e054c57e72cd6e0215c0151783";
+      sha512 = "05c9481db1ecb833774f808a33db96f4848fc260751f35d8e9328916a5c298c8c174cdb55845bdf5838edd7ba323d9c6dc6566609e359a5746ea09ce2566f8db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hi-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hi-IN/firefox-62.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "80d4d38b725696dde0f0e71aa325a4be9c34993fa0a98f1a05eecccf1e34e6d7c850d94ff2f14578a0dbce9e697688f8af959e4d9fd54e6530f1dea0d037a0c8";
+      sha512 = "8a92fa9b24e54fda81d15b18dda8432dd94e26164d58e1dd7f65d5f744c905e8790693557ac15bfcbcb491032ef436b3c7c01651767d4b43dc663193ba47ddbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hr/firefox-62.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "5f4da7f2b75bd963783ca0570377477407fe5778be2f1727488b26933960ff473318be2e92ade00d7bd0996db1f87636a800e6bd94052e2c4ab8972bfebc8fad";
+      sha512 = "432f9c7429900cc929afdf8e7e4905606a7f83652519d8f0e5991aedc99b7eb56b73ad7820efca20250df19ed68c0b4c409a4fe2595961a23df6f3982447d3de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hsb/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hsb/firefox-62.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d89f2dbb3e4934f750f5ecb7a90a76aad2804f44744f6925ba2a805df2a55bd3ed6390ae889a9569bf266f06d2dc92a38bb4bb4c125a3164f574e1edb00eb1cc";
+      sha512 = "ac9b1b4053cfef117b4ab4218a5e27c390f6eca3ed93bae5067e48863512e93ecf037e60efdaf1cd5e162f89915d35ae5740c77b4ac91b3f4204c3e4de250629";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hu/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hu/firefox-62.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "76dea45f4f224bcd92ff82c3f0b9967ea6cb9b0d9b60079ba8a3d105965dec539c50723d5203f254e6d1fa43cc80da0605880625bd79cfec541d3dbc85fa8cf7";
+      sha512 = "5ed2987282e18a35ee024b6fac92ce28ef0d195c8747b1072fe03bbdb8eed719d070b2ad74549d74f9ec0fd88b41a83d22c5dce9d1a9e09a6bd9397f99bd4db7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hy-AM/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hy-AM/firefox-62.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "2d21caf978ae853c376d94d9dd0b14f50f3ac5415bef319ebf5131d8b14bc496d8f8da09f3529e4b910971042965f07650b8b82e6b9b1d41eb456845dc52714d";
+      sha512 = "419aa9d8513edb65c3ce94cea7ba95bf44f8ac38e24f3b0ca63f0b02c01dd2719d54fd8b8f4128be5cfcdd8cf4c45d709b5b74679a9419fabbb630fb8708e4b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ia/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ia/firefox-62.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "8a463b132e199dbc7a6c14a054e23ce93e466e1b9ae43d16c41ab6eca8d31dfabc5caf0aa9068244f23d158da6e0e69920a21c77caa6074d18f8572cb8c847b5";
+      sha512 = "fb6f815b6e0ca4b8f4da7a423186b1973222bc1512461944aa6cf1cd1393bbac274cd612b7e17f19a27e2229c6a594d50f7d15cb9acd21932c5a5871cf24d04b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/id/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/id/firefox-62.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "57ac16932a18617f068242fb2266f48ac0fed528be46a327641eebb8740022f032c76981c526e659b0a81d0c68d5ab2b69c40b154800e98b72cc9140afdb182b";
+      sha512 = "c1f9166df40952b2b933bc900bb8db65c1c744ff7007cf93efb8c8e9d5fc886d4e97db92e7b0fe58ea245b6239b109f297b6b1c5e8751aed1fb7bf7c8549b218";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/is/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/is/firefox-62.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d7fcd1795c577ba6db8535a2ecd11f3f5184752b96b2227dd62cc0520e2be72d7e4c75e7506cba1ec4b6e131b64d8fe42a1e8ab05471e2b87400a88547b4224e";
+      sha512 = "d8f60fc52faaec8a02154826db63a8b7e976cb8667bf05bb8485f61ac3b29862d9a0d4953815e876d6019d99c89b76ef45f6d1be14a1286b7bdc57cd06d1cade";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/it/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/it/firefox-62.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "11022485019bc02b316705d5d178fc5d32e2e3161dee676acbac326e2a80d70905d2b8b743b1bce733e97208ebe9393d5a0f852fdad15fa464b5773a6ded2116";
+      sha512 = "5b2815fd990934dc49d750311592413c7458349e890d3a74d0d342ef86a1cadee8d870bd515b454d566d0d51866dca894e06580228a437f59ed793ca8df9de0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ja/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ja/firefox-62.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "57efa4365d3da6e69bf2fed5f69b148585ba72f21c515dd4ba3bc4dba4ebdc56975b74b60ceb5451027d1244ebef83f397822e93900c86b1cdd8e18056d36a32";
+      sha512 = "5267ac59466a24cd3b07b33ffa3a503b907e84cf58e87d682a8173b826a7d7cf587fbd52d0d8be7732436f6cae5a638e0d0ba02d1f614ebe828514cc67457209";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ka/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ka/firefox-62.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f3976a6e621fd63fa405b3b0e513842ae2de1e1943f5a1c5d26a447b0d9cd934a8a13f4b9a7bbe69365de4669246417671463bba2399ba1b8f98023083bc5003";
+      sha512 = "920a6be8aa3d0b3557e170a310496a59555a49833d27c777e2ff446f001570b299872d807e0512a6c37e42d44d6c92cb213138170a04103a9b2169c84744bf25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kab/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kab/firefox-62.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a16a5eda06f2cc7257b780bc3403b01cb4f183e520f43599b33030e5157a3dbb664e738d90de037bb7e14790f7b87683ef6290a75a984fcc8f7b87802ece8b55";
+      sha512 = "5667c3cc41ef58e816de3212389d61d9cdd02f577915dcfedfed9a55bd050873578f9d45a05357952f7b8c77a218d68164fb71d04bf669d5fe4e948cc81b8752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kk/firefox-62.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "efc2c1b2dec9554cb099d9d415d9edce10525a5c82ed011c82032b89ef23b330c360b22c70deee4fcf2704d8121b2f7209cb1069fe415df17135cc23988f8d8c";
+      sha512 = "17bed6ff7dcfeebc40c6f703c1881ddd872e7ce212ae560d3da27f14f140b72f7fe61fe59dca41bd198a7499e64e74b0775ea0a95200dc2270cc5f5ee6fe67a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/km/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/km/firefox-62.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "11bb2c1e223eac93956979f12ce8046fc4046820623894cc0284ec758ca677cc25faf5dc913000840527d6c39ca3e05ea4ad1d67e2c896a00df3b3e42f8e08a7";
+      sha512 = "11bdf73fb720d05d6952825c496d77e2ba3bfdaf07250912dcadb79d954f63eafbddedae2eabaa7639c17a6437268c4924e48a07790ef57f1ebe2734723c5d58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kn/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kn/firefox-62.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "456289e3c99016e5ebee2c393bd727205488228a4b52673d2e658d8071a9cc2a6382f9e5b08d25d70d319d1900cd6c0e31519b52be561a35ebbdec5c6a3c6d21";
+      sha512 = "9375a349ebefe25a02ea74f7ab14616dbff8542970f09b9bda5df521d7ccc48c6aff48270b6123295c77848c8fd47f3d985bec88a37b2188456fd57d89d2510f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ko/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ko/firefox-62.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4fb02aa4d05477e8f22c8821ed921b2961ad6ba4bb1b049f24b1a6f255903c8c6260eda4f0f30cd6fc17a7836edf7fa48d3d7cfc56056019636284a92dd0520e";
+      sha512 = "cc5be1a62f69d92c48edec8e471565001a9a62dd9d4e9d1415e0cf5e4a1853e0a63c161725ff3c21d5fa58fee826bc90442f107012e1da71e1b4b353247edb71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lij/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lij/firefox-62.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "7c52a19bd02d7daa83ceec382891f345a376fbd9a8627f5e6f9312663d7a544a382f2e2c23d1eaa8bdffeedacef11ed5e1dd052d7c52ad527b840dcd419d35ea";
+      sha512 = "5ce170b3e6c28a0d2d2efac7b0db94237ab9f8051c5f799ad7b07fccefcdc6072826781b96c6470f8d1a78b2821338bed58cfd43014ee8e23b7241119451a74f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lt/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lt/firefox-62.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "77dd939383cb68dabce5a29ebc66ee701ed4ff521be891f6140f88e384234ed0f134aec2e6fb40e3e09d451d0501820a5b0b700388f7ce9708d6f39ec210a17f";
+      sha512 = "1dd418f20c4cf2d268c39bc3bb91018a60fac6c284e1967d26eff30728ae706b528a79b47ad91104e8045e428a47df17ecffc6ab91beb1a83bc76465be7bf7ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lv/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lv/firefox-62.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d7761cf119cd718b1862dad2bf2d24584836a1017c161d342e8d68ec036695097fadbf166338be07a7a48093bb29d45cec0650e973d33ef4886781383760732d";
+      sha512 = "227994d4be37899de8ac58019b79dac43191b4e46dcfda40f28691b87e495f42ae83d00586d7c278122e6cda09a18b8b41189ed084927013033070247f24d47f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mai/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mai/firefox-62.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "45c87b9ea504e47f7467198f35ee906bbd22375aac1e75b0e3102f4312cd8aeaf4affa40eb2620733d30ebede743b0dc7875fd5f7dbf2de9e702e86d917b483c";
+      sha512 = "2811471b87a09360b70075e4dfab80cf3dc29d298ec50e8a9d516bc7e3dd2af57ad9c23929c2c7eb7253a27f47404a4529aca2af5d837e43807c24f184338e23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mk/firefox-62.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "284302019c6d499431b4ec1d7cfaeb1bd344720cb41b1ee3da937d07ac38df278099116ddd5b160b4ee9e8084c58712aea1e1eae2f93c5e9d330a18af733b770";
+      sha512 = "2c48afe3b8decea6832634bb861559e156c1617b64320b57a028c9245b61ec2681e8a9b2ffb24681fc42e34c2b3176d98133e24d6337fc8e450d267646065eb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ml/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ml/firefox-62.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "c3631e69c78fb2f759ca20f59f4378703c9a21d62c138a628c7b5e7becd7d680c444b5a997ff518279cafee82da0dfd8f2f2d728ed53620123bcf7eff6ab1d1f";
+      sha512 = "92009904ea47702f0119fb17c7ced25a7b1da937ca9f11e18565e5848469a90eea4260e2cde370fcf8ec1939498cba84d48b4992a70cbc79a5be50212dcc2601";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mr/firefox-62.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "38ad3b359b6cf39d4ff74afaa88fba269499c5eb5c5d3fe6622f3d63a09d797637fa4a8f9ef6df79dc6145bb782ba1b0af9f26745cee34e1269601e93dcdc035";
+      sha512 = "6790c045ed9c73ac0426df2091c14054740eb8386c0f4b6ceebdfb65cf0c4cbb39f31a389da74b3adc922fc6e62ea0eb38482f7800023e7b28a4071d539ab978";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ms/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ms/firefox-62.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "40c09a877ca3606749997bfbd8cd71c38aa050e4b394983dac75d6d4c060c613aa3332f1e96e1ac809363c9166d1a263afde54550578f657df64f69ed1bff88c";
+      sha512 = "8204ebe6cc36f76c1385c73df1c4d4e966caeac6207ddd85cd6f000908677d219e6cf6821df1ae92150695cdf4f2fb811d2f649f21d3aca35349284dcfbf3edc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/my/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/my/firefox-62.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "9ce0e16e123cbb0cbd370124225391eba5a3e657c008492ec4675b431ad47745299e73075907bdbba532d029052d9522359764122678f92b137b59133cbecf98";
+      sha512 = "05e4fd1dbc9bcecd1980071cf953c5dad0993e718bea9c01e6e62c8f9b8bc4d8657009da1d99cef75182d15d3d8b90f306bd62e7e641c5a19c873877e713eeeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nb-NO/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nb-NO/firefox-62.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "86e0880350b015e77c0acd480da9a20d83349ce3dda110880565025fb6875e887025856cd17ad87c1193eaba53d8ab04c2b69f39235f555ed7ecf76d4299d08d";
+      sha512 = "26f3bb008850b84f77b13ab68759e929eb92a33fa68e226937a6d4a2e17b854d741b9863a37375f97a7d89602437a414c8b4c0f76a4f71bf8c86c9054730948e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ne-NP/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ne-NP/firefox-62.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "13a4291276baade6d8ddc1de73b9222fc121549e0b52d2bb86838a5b4c7d1df3ed494c4c8d739ea3fa39264419888676a8aacb8e7501290a182efdea8f41fe16";
+      sha512 = "b1f09b3976e5db99d55836f664469ab0d89849130b5ae1c73d9d772ead471f6c9ad96ccabe440f1479ebe60c0fb4ac52bb365e5d57f0193086bdd03fda2937a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nl/firefox-62.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "fca0002264ba3e6f4a661bfa2f257bb71ecdce5d17875fc85a914f9c33f02809b79def6626fde8f659b81aa61da60600edc5e094a71e3d0673a3faebdd1caf6e";
+      sha512 = "b4f90d601cf101ce6b99371100a92322f19448d8fb208d415be12f7f80d30547bc962b30a455cc1c5efa6eb2e69985e194a83a98a7bd7e69bdcdde126169c142";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nn-NO/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nn-NO/firefox-62.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ba286362b9a13b069c4eed0cbc473d31e8ca3a85b791e60eaa09ee354b9f2fed3c62b3a77c01a85b68e33f30e23f8c6d9adc6c6f7ecbe3146a0401d248ffe77e";
+      sha512 = "3fec29703a1b76817616428706c42dd240b05a4c0729c4aafb2bcee1942144234ab3b4e717006b3613b14df831fd7dd9edf318d46283c3260243e42eced1e63e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/oc/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/oc/firefox-62.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "5949a4fa66a8f783170b4deefe07c0fbf73790c53ced93c30553effa03d2942ef00c2af7bb2bf1b83dddd2a08db72a2c305c4535d4bb60666fecaeb4ac418ec4";
+      sha512 = "4e60f8a294d4da610d8ba52bf1e2cd0d4e76ba2574afa0cecf8b3f657015868b53e15a0462efd571975800055f91b8f70c39ad36a17a37857344ca14b23568bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/or/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/or/firefox-62.0b2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "31bba0616cb9ef68f9d2bb451bc5d02d67adb8fdf4e8214cd5a1ad49644060fb23beeaf1b17d19217d894ed0127208cee2bca2b031b08b837ed3ea7b1fb0cf81";
+      sha512 = "1d309ccb6e0f53f8a8dc85c1c2c691f8728be063875a169560cecfb3feb11c4e5a0a075602e0a2aa97e939df98d5538d96fd0cd0736370c841cbbdb2b930ab30";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pa-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pa-IN/firefox-62.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "8961151c03a1d3bd3a72cc19cba4491a0173189125305b30f984457668af55f76a609f78ef2dabf14f1b5d66a3ce2d0f332f2cb4a8e78b8f1cd7245fb2c232c8";
+      sha512 = "56fb76551693f0c739bf0dd42ed10c5cb4ef8be33e4f229e6ba42b83e2111bfa420666327176219f45177db7cb216007296c3abbd000c4426cdb8e2b4107dfa7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pl/firefox-62.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "58ff6108e529ac5d7d2a19a8b9d8d2ecfe5aeb0ec7fbf52b80033e40b2d5d79c33950149cd275238072604a460abee9bd7d499464f1c4dfb615334b516dc5407";
+      sha512 = "ea8a5f453e78e3df32e56991a2bd940b1a104ef857af83552c5a7b7d85223a3dadb7c2b10d08903c515de1f11c207108249d1a4d868ea2174bd8cc4acbbdb76a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pt-BR/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-BR/firefox-62.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "39782bc11d81c9ec558da43237915ba1bef642187b6747d550cc58677103745f125703b909e757cf3b41a0706bd4a1ddc408eadbc01a8fe2fcc1daf827ccd730";
+      sha512 = "97d564ca87b0d1978c1aa96616714d208797bdac9b608500df3a3658a3724248f731265c3ecbc1adcf518a47577ff6e9cd150a96f75307a578e9e37b8ca4cc63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pt-PT/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-PT/firefox-62.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "2b2ae5086952de1761459083605260dcf1ec4ca94f15a40bd2272e43145516b6e7115f2d8d17926399a563b1d25e8477174564af9f697606df85c816fbc1e1e4";
+      sha512 = "cff3873a8e66f03b9bde42ed27361761a04455c755f2f4b4780e92d0819aa08c851bcffbce937584164eed68bddf560c21e4d273147e3e2db52fcc376f12f5fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/rm/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/rm/firefox-62.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "42fc889ca0fcafb143725bb616ce6b8f70dbf802b024f183b8a9470c72119b7793e275648bfbc94433875a97197b913d7942df361ad0b6f8395ec17c3be6e2d7";
+      sha512 = "4e46719324957027c1659e13da8d2c306ce89c85db2698a8af00142ffeaedda648639f562035ee3c91b16cdef44834a059b76b0a7ff8645026fccc832aa5209d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ro/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ro/firefox-62.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "86fea7512cde6a583303f6ad700bb26aaf5181ad90596b952df5a5627d2a78b5aa88337d68ff31b914146c474c92020d9359fa2243b336987e03fc003c135439";
+      sha512 = "99f21fab8546dec02584972d1917a7b72fae6eab929a27e2823ed3f4f53865703acfdca5ca81443b9a7417635a2d7a0e49ae0b24248ba4781330377255a0354c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ru/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ru/firefox-62.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "8baf71ca8b18ddf6c08d469d41c0b8c7d9ed815adef8fa8c8d312094bc55f863c574b3e8990630aed79b4ec2b4965182eaf8ac6c105e68f82dffe143118ffad8";
+      sha512 = "207b795615e39357b9349d5985519328ebb493d4bc29b43abf1f7003bfe75fe0fcb21d3a8553083cddff049b5d7d46b15428c58d862c7cbb7096b162bd1c5df2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/si/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/si/firefox-62.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e5cfade7c16e0c04f0ef12f5a867a9cfeb8570439dd16d6ab8109bdfd3b6cb45db60f7e2cafa9e3a3e18a7e634d4491a72050e54d3988c64744063c20cb50532";
+      sha512 = "e96d47336868e7df0ba39e8036bae96b8883b6f4ddf90b3fa6353e46bb61580efd46b97ea3bdde8f3af53dedd072abdacf72fba747b98ebe46c6955be6910165";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sk/firefox-62.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "66ae74fabbc2079a14e10297bc2ecac3578274adf4e67532a14a8ccd49cdd043a5f6c3d6a91bb3ed78b2d087dadf11bcd75f1ea504e32f183949e512b9eb72ea";
+      sha512 = "f1f3785f5ea509bdfa05a5dfbf41689d029d06af3bae1e143311397158bb37d6f232f06c82900a853470d2411f47d974fdef318f9082c46aa62299afbfbbb5c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sl/firefox-62.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1852ac0d4de217a4531bf70302267899fa94144801d10bd8f41694016a66e0662cefe45765240990c3747baa39b10cb8b23e7efb647c6cb72dc59c7d44216802";
+      sha512 = "ea0d91574603c06ce9f2fadda962ddbf1ab45f11618652d6c1f540119dcf41b904e2ca809bba8537e380525c2698eabe7be559539bf650b792baeebb118f72e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/son/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/son/firefox-62.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "22707848521ae418a620255174790907c96ed6301a2d2a032f095ae17af1eada2b0a87c7a39a27ac3a63b710e7c96638979ce47aae613e4d0b1ae9c1728c4f07";
+      sha512 = "338391b220307b5e13822c6bc6ebc46da07530a6bab71305b3aff7e3d938494db0877d19b9a2dbee6706798402d93ba83db0c9c63061b063d15b25ebe2013df6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sq/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sq/firefox-62.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "0c27782b9aedf9fed190ad95e9c8e194ed0971cfcbf62741e5032dfd95f80dc7420a7364e0fd614587094de98ac24e4c06cbb4eac43ddb0efeab0d0dfb42c996";
+      sha512 = "74801d764972326f1c96197ab2f4e8a20b481a33638c9b54f56f6d627b8610f7d22fb9ad309d04e84b9f9a931a2a40a0afe473136ca1d0de6c0f809169cdbe96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sr/firefox-62.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "d8d9b0e082b002b99a8aeee8b23885bdad9d405a58eda2180b5f46c26544c3cc4810882e1f347953900588825450b3e6b9d4b0d913a2e454ca45857f9f2bf5df";
+      sha512 = "17fcab8886c7d3cae3ce36af19ad7e3066ac45dc4f91b57cca7936cbd34fed1e9c0250d220cf02804298ad07151e3e247eafb398ca6d4a18076f36e4de431db4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sv-SE/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sv-SE/firefox-62.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "7eddc9c3cda027c8a824f67f99ea5166397362a4305f6fd6907d15542c5fa8a1ba34b7f5c90b83eab18ca5c610643622702332df103373d7a99a954567cc5def";
+      sha512 = "8caf5d927039be97bbd67183f9e92828732e6d9cd5abac4ba0b29de8097402f0080c827b73ae244bbd1e3a99532c4e9f3e961d6a172426d342f9c9a05133b459";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ta/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ta/firefox-62.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "58e601d01ce339b4492baa48be9e708c243f65949eca881b6f2d65902965ba0c8548bdd5ca92b5139983e0a451db516ed1d04ed81c159bad2b4d37cb3c482f7a";
+      sha512 = "53311054be09b410e9a5c4e319e35239b70ef5f08a7f5f127f437f627dbafd5938d7f41410dc0179768c167e4f4a84ad78b6d9d3b2b2e5cd40692e1c162195a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/te/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/te/firefox-62.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "bff5f9a38f36e825ea6cde6a7dc332ec9f82dffade16be0fa1bba14758284664ebe7d8a3564f163368b0b0b3cdb28b97b7f3bbf335ae6b7872cb958b9a7b78ff";
+      sha512 = "3cf97c0a96806671d4c78af3a928a373ae4883c1c49bdb59730b74bd5f19cfcbaceec81ec48a918254dd35263b8a58c3e1b3ed2d443a9f58e3a6aa7c83934637";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/th/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/th/firefox-62.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "6290c4899ffd2ee6d42888b7a1c4b1e9a53b9bd038d64b64aa21b07a79fb256d80fe0621ba9a2bc4c98bef600c66cdd5e7c9c4d5c0e196617ccaa114bae56ce1";
+      sha512 = "0baa020a46e27660644b2baeb299c466ff77d65fdab54001060ebe4682e6959128d7aa8c1b008821b777fdbbd20b36f40bfe8c099072df3bd0a0b4884c484ec1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/tr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/tr/firefox-62.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "ba235dc6154a27f2351764900bd22f48b3cbd1eef854bf930be59e0d7d251bcf47d41a9c94a859427acd4d3db669b8d07e4e867422e3d002ca0405fe74cb4ff9";
+      sha512 = "36a7668168dea9a0995a416d1c0612930c4f3d2b66622f04b89e22c438d0e95adea57de6ae766d1c22dd81fe7d4cccda9c7e6abd77160a36edc2d505451aa139";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/uk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uk/firefox-62.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "74637192055d2c3c3a75ad49147485d97f865026f43af3933830d513f501b255b1280349a7e554c4060b5b030947a8ae987e57e9465eeb83ae59d316d434fa01";
+      sha512 = "48086676df822883aa7e193af088d15988ffd5034eb526a4656ab02477dd1832d3de3d12680d2bd7b25f1bd771a0c87c10aae421f9020f09c4fcf527267f538c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ur/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ur/firefox-62.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "f5ee9bd844fb230c445dcee9e615a75b9ceced1e6e15fac214a0d7f0c511ed1b177ad11885cc916b52b6556930827848dbbb22457717eeffd8e4683074fbae14";
+      sha512 = "a7e2024b5721e70c0118f13e4cbb45108054fa3b2f7702b7e219287d0a380f6e769d4e6d1a65c766653e7014c223edc607d5962cc62e6a0a18559cddfc7247fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/uz/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uz/firefox-62.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "1e4a2af576bfaf3bba1c9e54216015ee0fca177112ad5cc444c064d020cb1d5da1d63b761c6f63b0528bd073582ad3f106caa6cac4c3c56cc81687e235ad8b94";
+      sha512 = "f88b75d07f5ceed0fd0dcdca03f30ef866c367a5656f1cba5a6bdcb8543bd65791c51e1763a333ced20b4b0b10b292b2d4e04f81b8dfab68607f5e9e97d5e53e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/vi/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/vi/firefox-62.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "bbbb982f4924074efeb0b3a0aa998246275e9dbebaa2208bddd400a3ef367f5a6cf4377453a3e2ade02401699ea6149d39b65ad4cb88cc32da05488f5466051a";
+      sha512 = "15dbd0458d883e0ebfbecae7d6d506a1ec4695737373deb881f3a10895f4777927ee1f6454507bf995db9bbbfb5eafe71aa7883939e1ad1dde28cfb8cecf9103";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/xh/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/xh/firefox-62.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "d60563ae6e359eba3a1be3d84c89705c13d30abf30b45b1ba7a1ecaa10e9e3520d4801317d48ce3b6b7c4d2cc2ec79e5c14041561cd3c5664a27120afc2a45b4";
+      sha512 = "c6f9a216713fe8cea1231cd2caaf32bed366c961f8c03eed4d80689a00b28e6a61c945e7bc4458a30a438c797f6a576eafae5536819fa98b70e0422a081db4dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/zh-CN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-CN/firefox-62.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "9152ffa08f60b1474650c41188d64eb7239e9a78ae8594982d1e37ad84e6a3ccad04e78f2f8e13d263d8d3336f4b385a9ffd60015ad0d5326b453a4dac838779";
+      sha512 = "59fefb1f8a2218f9ff1022a37b15f9adaae32031a2869e9aef0bb48a1dd44133b812573dd0cf63edc68abac4c5bcd30be9ff44d8ee7c49348d969cf456cffdea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/zh-TW/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-TW/firefox-62.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "24148a13ef717ed36a9787e433b9f9b6262912009df2649920ae39a04dec3b68959b2e9abc15d376a64f8720669a9ce9e155c856698897a7efa97b0b45042ca4";
+      sha512 = "8efd164392d3309be8fbb7fa2718f11fe877d78070818c0a443b89a0f9bc3ef3689fdca2c7b02bf69783542923fff9c482b6d2916a90b40cb68b3951204c8a65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ach/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ach/firefox-62.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "2a69bce7fcc5691f5150b8077d01b5fce140113eb74e2934d2851c76642ed7c2e173ab35271d3cab11f94fc8f3971cc23d5159bc90d525614e6a759e1d7c72b6";
+      sha512 = "629a3a267deb22985d2ac17645b004b6a8732c694e8d5d42d533ced212df0b36e74ed31a2870e11a841193ffee3d9c7d56f092c623ab3328f9e683a0a2c39e39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/af/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/af/firefox-62.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "443eb00d24ff3410b1268ba9e469239246dea7d4b989ea4d8b0f15b8e29911675244b9df76f6f38a3341b3385fc32a5394c5b9f2272257d07cd662c1d0397159";
+      sha512 = "fa0cb4898b4b09e592f3326517459a356e41edd53cc28e5615a7883311b43ae728f9c80f7c0c3e114186aa8ab9465e21af38e3a75215e184e30e2a31014de1fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/an/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/an/firefox-62.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b89d592d03667289b9582114726e175cbb38f2c17f16da4e3d28d89d12868bdfaa1edd2109cdbeacdb50c54ab27467926d5dbc3f9cd364670cfa6df5f45ef552";
+      sha512 = "ea862964df4a53e2a57b858f8b6a6d26743de5a49a68a6807cc86ac3eb68330eba2e71c193b8bf3fa70a267258825db588c4da43b2c0f4b0fb002d4d9f5b21e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ar/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ar/firefox-62.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "5e18d15894477db914cf42af85b4e4d4676f93574c4cc04418ab32803d5709ceda37b283a4e0bedf5e374a54968b106f8d9211f302c7085a8abab8b02512da71";
+      sha512 = "79956425e3086e74fa4e693aef7f7a8980b5ff8d2660f98d9f1738c538651fac13f1decf76b124c5a8e6b61f8b1e7b9a11bcc5a451b832f38449a00485e82577";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/as/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/as/firefox-62.0b2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "92c26d4084ec2fabcd7c1ca3b5b69c1ed9396bfd7d6b1432f41a1c07aa10e292c0ff4b5ea509d2503cbe815a165dbf3400a39067dad2c266a92629cc5bc285ce";
+      sha512 = "efd784691330dfc8601e145cc8b537d26505f533e453f771629414adcd4da1f4c047811acd5e628dc40c1d4f32d6db38ce92b0fe73730e131a87ffabe15b49f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ast/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ast/firefox-62.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "882c6c30f681b495b971ec4499c79da7da6e51f2ec1c954071bbe674f07280066cbf66baab4d9de950b0073b7aa123d2bb2aeb69203e54dbfe40be66a6552769";
+      sha512 = "b588d2b98f573b578986f1b5639e4b8e5cd6f38427c8bdb5a31377148772d2e0c843c2e89765b9f3d75e3efcd1f228cc84f47da5df67cb71061058472d3d3b5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/az/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/az/firefox-62.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "1e5271ef465c28ba10117b8d9cbb02c29c26c287045121c111a8576d1edbee1fc66b16764ba18c197c6648fef40146bf01dced7a40b9e643ba925f4f6b771925";
+      sha512 = "3aa4592c594d548d779a2282de16672ce6a836b49e7dcddee75e1d528ed7c9b687f9ff380e7a3f0f1dd94c9c23ed8889eafdad1bf79404f54b5b6e73d219e922";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/be/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/be/firefox-62.0b2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "04211608dddae59c53a678a51f8f55061479be40426745fd5b6ce2c10cf6a6f5f6aaf97fde1754101e9824b1de99a767649b7eea06e94fc4b8777575f77c63e5";
+      sha512 = "b692bae3de9a79bebd51a700174030dd7c7b8e4d6de34b9d7ad6224dfc476226d7eab1149202a4337bc5661fcf8f23ae3e76cf07a5a182c9e066dfe8cbf13889";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bg/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bg/firefox-62.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "c7ea5434cdfbe05be4c99a46564d199207d3dcdaf817da34b3e4d9e66ae4569c91b79b03cf5ca49855c3cd6754f42c63130c220afe4ffeae67ed0ec38844103f";
+      sha512 = "541e62c2dafdb1176a15034dda155be75a5f96278e6052266529078332d9e89c95245c9af8880ee033d4a5d40a6a1ccfbc3ed0f8c1c1e574927841d3e2fdc8e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bn-BD/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-BD/firefox-62.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "6853afdc3e36ee170e4c58302e6d02f3f21881395d0630b35087dcba417e62af36e193a82f6b95bb27526ed39f817a7da61d04e34c29eaed57b946dfd0d2a83f";
+      sha512 = "ee598835112d2369f496559afab22ee91599bfac35e26bf177bf7d645c33acdfa5f0f2c4defde697e36709b8b65d512226d18046b10536b73852a7e6279aa8a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bn-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-IN/firefox-62.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "e26c6c4a7d9eda29cf030be82432fb2acb8c7a63de441f10d8ad4b14ef63010ace42376bf6768fda952645d203487cf8251870944b2816f68d1d59a098edf5c5";
+      sha512 = "5c4141ad1f91755d02e06cb0c1c9f39b49aefc6b43f35c2bd4eca92ac855dd316b290f799065de995a73e2415e2a2c3c78e82e5aee44f50e02b3f44b49017136";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/br/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/br/firefox-62.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "b84d2da5aca088b147327dd22d9ad63a381e4024d046663cf85d9cfee1234cf39c0fecff6e7fb5b647c13ab40b270489eb0fa92e56c5cae9bdb8e9b91b7f61ac";
+      sha512 = "7a58c8fbf96984fb0d77700918990f083993498c284a4e38a2b24832d6cecbd960b71131a3e0da3410a9be9199ac63f939a278249fb38143e2a5eb1cec41378e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bs/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bs/firefox-62.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0097b0144eca625affa1228ceb27d53d41a8ac8d75edf74dbfbe33a2f00834c8430dd0a936a0ab47d85ce6b173b60a10e21d59e20c7f8b17350d3f6b08e7cadb";
+      sha512 = "649a526b35c4b0b4dff5fe8fd4928fedfe63e2efde8d97dc1672ef469caa068bcde72f9a176f8768d240739bce37b1d26264f2115bda6d7f95c9b37e0aa184a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ca/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ca/firefox-62.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "93f28382bb11907946bf66e7272219fc43cb1dea3d63035308f533072c768bc4c5d7b8be1352272f1f7ada77f1224932cfd028d6bc507d04dfff515c6cd61f96";
+      sha512 = "36ae7093d941e0523107593d466de2c42c2b8cb293ec491ec75e824cc2ea34d579b57f06e4c0bd563ad5ac44484fb0ddb2679aaa195aa1e0d6f823042b502fa7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cak/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cak/firefox-62.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "0952433b064ebc8c347e187e616cd7a884e1947bd602a2fc396de898d8351c11f2f79a709ddd1fec962299d279bb15f2435fcb88319104fa2dd92729e34c94c5";
+      sha512 = "d81dc145819bb8211559f42958434b2fefd9891144e4d4024e7196be70c549483f8f25e34863643095dbc65a182ccbd1cfa7b1fdd46cb0a7ae5dcee1a3d4c6a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cs/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cs/firefox-62.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e4142088780249441c19989ef3bbca2b2d32bc09eec9ea32142fbaf87e416b7b6317b168706f161f8e9c77e2c924d41cb60b6682d24d1f899daf00e5c8a4c646";
+      sha512 = "75c7ccaffaa13d563a79c71dd21bb262ea128e8ac12d81db18255d2073910c78e264a77f3e7e9d022d316293bec91d4209738b805a49b421f88ecc992049fbf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cy/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cy/firefox-62.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "59ace20cd22e6d251f0f3de856201feab581d068dbcd0bfa4ec33ab6015613e52dd903e41fec8bf4e74aebcaba3fe7fe3b6778a2ea04e567a9446e8b125fb92c";
+      sha512 = "818f430ba479e5287df5833c4222b65b7fe733805a1e55d664829032e8933419012ea4dd01e3c6ba3f02fec7c954dd4d999cf55b49464c040d0649d7a81ff455";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/da/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/da/firefox-62.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "a9b0c3479917a7ecbb6501398d19f6d2345267772a3999f484e59addfe10bcfba458fb28aef319461fbd78c388412b6615f1d581eac40894e250eb49c8f9ff61";
+      sha512 = "a9bb147b35ba5da74dfa2dce3c8422d8d6b224aed390b1f2438a3a523b3ab6c182db6a2a15ca39db8a3e730e4104b7c5a8043557bc9d91d3c6d116bd8411690a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/de/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/de/firefox-62.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "a9d9bce5e8ea0ee67e158424be3b8cb9fd0057b784c6bdfcb9ae40b20d155f4a717a9e83f9425e3dd831c4c54fc2120e4c3f92473c06a30f7f619fb3062d5147";
+      sha512 = "1976bb7b371fe9e9da812e76fdadcc6d1cf95f303cfe7f6f72fc1b98f2ddac3af1bf0665d74c22f5a2cc41046b686cd59819b2bba923d5c02ed956577cc80682";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/dsb/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/dsb/firefox-62.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "8f39109a68ef0f8a2860e36ef271963dcf9d71a0030bd53e7548f49f0378f678766bfe7d1217ec55f06cd02e14279edabb7b04631d2642a323e94ce0637f0990";
+      sha512 = "6be5e34ef9e5a28d0a92c5e7c638c0e902b59a596b03ce03af2f86d88e4567f01a25005284af49cf1143bf1b3e3cec2480dd04b0ac0cbbec7b85e8876308a02e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/el/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/el/firefox-62.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "5c17db7de7e441b80f55650bdfa5c6dff90fa26eab0bd139301a81e41b40bf382bc1fd981e014bce195e0e9cc45a366bc4f35da8d5187c042ec6335382ab82fc";
+      sha512 = "a119500ce6aa1f2c26041aec8609b88cdb1e87eb3cd8f56148a0894fc273f3899a3923b765c8b46e25010893a55acddc24b96c15bcef2553702fdc0d4bbe05ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-CA/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-CA/firefox-62.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "f922ca74cf91aa74b0e7fbdc550a2236333d501db5f9993a1d6de4bdfb825e33e3534788295dab0353516db698a753bfc3414f25f691d3547aa375967beb7f2a";
+      sha512 = "83bd5fd70859ac58f142f837ee96e9241ef7ef58f603bc88b82b5272d296ebb4eed8d8a84a64f105e99bc97ae739e00591f45b46bdc9d369e8c613d196e864eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-GB/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-GB/firefox-62.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "2013c63b9fa8c3a3f53d8aac2c47c8c23d7d27bffe5ce7ac24becfdb96e90d200883a0ed8a2aa130b2d2f6c86d9f47db26a5fe1b4e9b4e8357f502c5ec3d84e5";
+      sha512 = "533a54c96f7ffec3978cf02c3bef945b4eed1bb81f4c5831b8b85901f84d262869e184620e470ff41afdef75dd3f3340ee904632304dba285ba0d4c13a6e3ecc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-US/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-US/firefox-62.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "22a95c85c16430d0c4ba06f96727483e1d5adfe41dcef95e4107e80cc669f8c802eeec6dc16934473c33b822d2ef1cf080aa4ebff1706ccd4dee9b21d4107a3f";
+      sha512 = "294fb79215d8f2d0fd2a5bc721acdb3c3062554e3172161ca71e5a64534ff01ca61c637d2dff4a5396c64cc88f40b493e96f07441aa6aa297d14ea9c5be88f29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-ZA/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-ZA/firefox-62.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "4cb771c4b43b07707b760526f068d2d41a622f7dc2c9abcdd5e5501149355d9d5ab39d8d860bf6a1b1c0f24a8d850198faf3127463158b4e62871774b023b28f";
+      sha512 = "1b8ff2d6c331e1e5888c50aff0529487c918114de850d8d8d60e3dbbc45b3669b56272b3163d7ac15a9c56a939935358ebb7761f21184513bd3dac4dd3a7113c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/eo/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eo/firefox-62.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "51ea9e1339e19a889b9f3edf067a5560f7398d68cfaf7f10cae113b498db87770b280644ad18bb7e1774195b9ba0ca2b8e27407b7f25a641c6b0660b76da6699";
+      sha512 = "0ebcf307f388ee3a6f58a9383207f3235d29fa240a797af4d7fe6d94e552203c1d46a1a94b4dd5d30d98d12ffe4a33b322947c684619459e86e0d4af5952ff8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-AR/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-AR/firefox-62.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "9bad5b12fe67391fc8e9c1acd519344700a5d5f798590d7c861eb5a51b7dba8a4a1ce6b30d617872aeef5d8def0fa8e2378e47dec9e8da0df3a113ee5aaf9e8d";
+      sha512 = "24f2b7beb26ee6bde3c47a71ef5ca547c276217044e05c8f13a2be35ad96f8d387cdcaf0a8401fe348034f322ef4392a8f77711b0d43dc02eb74cce9be262e20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-CL/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-CL/firefox-62.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "2c80c7d3c817bdc6e3003cf6bc14b5d05537d1f90e1646116bfb3f21f75e21b7dac7ff6485b469b8993f7719687f90d46375d4ad8f607849ac64ad9135baca33";
+      sha512 = "3d33ee9df1712971a1dd4bde372e36b15e81b2ca841fc3c2096c3ba45119923ae3f1bfc37b9911ca751a161b90393722b8af0ab196ab92607678316d349e3acb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-ES/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-ES/firefox-62.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "c7a90515291dbcd86f357392d73bcd90e31bc919f192012b3b91588ef6ef2ace9ba7250c62ab54f6e94c8ceea190e940e82a7bac89c14118095917781c23bc45";
+      sha512 = "206eefa522da06712c655955420bf7aec89ad0174ecefe132741e0d84cffccd4bdb72f448cfcc5c47e1100ca9c532cead8b50627cf18575e53e2c383bfa23226";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-MX/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-MX/firefox-62.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "6efe529d1aebbdbe28266574ef9ffe93a0866a8f4d43f73d8712d97e50632318b01deab082a421229cd11424f4c8a6bee00ee11f9a32c68362c798abbbdd3ee7";
+      sha512 = "1e4c3a10e7d2f34aaa1164c7e92d79d3f21928d5d1d800f9cf329b0016d7a2468e76c37eb2038363863d8ffa1d2da0248264d1dc7dbf21ac3c41d03b793ef4e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/et/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/et/firefox-62.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "82f0dea819f21ba2f8def3c7ca5157c839463b6e2d544b64acc1a798fe7aaecd9c173150dcc38cc5236e0f3626f1012af33287fec1f5f825b1f9b3074b261ffb";
+      sha512 = "770fc7f02278d0e7fa9d3d18bd943c6d1bae90eb8b4ffd1c2d9087c49e6e9a990a361d168709811aa7de5c34f5923efa7d1e44d70a66c2e0b126e4776f10a0b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/eu/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eu/firefox-62.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "0750f68158c993a30d1551c0218d0480cabcc53c21987458784751277e84525acd673fa930d34847eec5400e4fc0038982a336ca5d06e2e9c40ae342e3ed5f99";
+      sha512 = "760c630e156d3ee0dd5a9f836326f47a9adf88dcbab14eea48520bdc656cfe4d5722655cf2a64e4235a2407453e2f3a40e57a05d53773e1827083ef9ee5224cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fa/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fa/firefox-62.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "6812e82c39bc9635bc58ec0db38259062c118a8dcc2c2f55e8d8ade72db4146e4fb70509f1a7631efbdef90d34b016f93f775e4941dd0b395b0bee90d395447c";
+      sha512 = "55bc4f4cd68a9cadc0dc225e017f29d1b631a31d9b62e2731a199455e3fcbaa7a67ad41a40d8eff7848a69c659dc8226656ee848328924ab214ce360456f42c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ff/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ff/firefox-62.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "0dc650e5617432b162beb981dfe86cb76291c30b58bf9ba635eea7a8395ab3c8c83db81c61e0585574e37fcf1481d953cfd8d2b36c48f6d64cbdceea8c90971e";
+      sha512 = "fda4adbd6b98533d348368095fcfd9e2a268e0824387755448a737c17a8b7b1d82a9de4c1081756eddbb9ac6bb33ed2a637f826217c0fda3ae6c61d88800e963";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fi/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fi/firefox-62.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "c6d04dd3abb11f717f23599d4f62fc2dea8d36c7fc05da4050ecb226409ff34c7f2180941fdb178d4ed6871b290c743d8b6b47cb1c10f88f93575fb1ca53e1e1";
+      sha512 = "c4a93e9769ca4a88687ff5d050d425345aea97d9d15cab4ab89b4ee9263df6ed7c30ffaac17434e35c6b3574f71a24ebe1c3c7aec53d81870caf4884696aa878";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fr/firefox-62.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "4eafdae8fb6cc36b2d85ebc478aeaf80fbfe85359d955ffd7c9e34046b27aaf8d81f5a91e67d0ce1f9a0a593d7df258c9fe479fa4eb3a16dc01788f0aac4e69c";
+      sha512 = "88df0803f1a18ef0da2f5b2480c6ae039b3f079eb2894db760170a3a535513e847aa92a70f8f42925ea5732a91235b0a3ccfeb7cf055406bafc13c308e45887b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fy-NL/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fy-NL/firefox-62.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c16b78bbdb512a194d785f67c6a910fafe24b18ef3e9bfa3b3d3eafc411e264ae61c34fd8d02efa075531b694cc79bb14586be3b0a69af974f042b03d40344ea";
+      sha512 = "445b24fa7a74e60e97bc870cdd94ea2f9ae120d6a788bd4b44c2e496f62395f89e7112c0b309ef27d66d76da1b3e22b72c780c189275ec84a511c7d758c81bd4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ga-IE/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ga-IE/firefox-62.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a9ee9bbdae4a32b1d350da589b5c47f9eb258636ebeb6f1c00c90434c2d26fb9ca70041de64f7d45435d098c8c6d145cd1d7d7c4788acfc88e1ec9dbb0ff17d9";
+      sha512 = "6ea507929c6d886aa7f9c55b097f732bbc38dae75cea14943d1db43f11aa5501e0b99821ee33816cd72e8ee9bf138071fd75f7eab400e5ac04f424a591f3cd52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gd/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gd/firefox-62.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "6f115c9246ce800e64cc5c65164fb60c1752e847df326a41199ba674131bf4d2b49d9c2c62bba6ffd19b15bbb717dfddce3a0ff8f64ee0179f8c176d5c530f9a";
+      sha512 = "82b4a68795af8fb47c024a9675c75d4ac5d4e6f09217493ac2dae1fc0f4fd2bd9f5ffdf89f5338c943d26e250ad546203a0604427d0d614c04f1cf191b1c4c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gl/firefox-62.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "dae7fef780ea737978253f92bc0c10f2f708e4206ee7ca02eb886e73a6a06509e3426498a35349197d758dca5bc4b899297d3713817c47e7b440d175e11b42b2";
+      sha512 = "231777e852a8f09a99aadabae38a16de21939bd492ce239c6e112e148b84c9742eb0dfaa12354aed277322d763c1d01d5f946477d9608eb8dc8fc6942f6bda4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gn/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gn/firefox-62.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "a98f3c244b828fec424f2c41a0e26590654ecf58e6216cf279be1c455afff1fba605182dc9b1c75a09be93df60b4feaf46b5f0c9471316c692549125c603154d";
+      sha512 = "9a01dc496021e351bfc1169438ea23ab5e01c5e29df95b12c2b0085403baf076e29ede5afc906311a866069695cafb5ad911098a1826bd1078cbd1ccba048fd7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gu-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gu-IN/firefox-62.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "00b30be562063f65383750fab39fb66f67c1deadd9826cc8aa6e20856aa129ea999c1f0660cc4d6680c343cccf50f9d60a0b16c062ff932a06dcca3d79b195e0";
+      sha512 = "e453eba04e32a850db6884c65616d0c33f5926b6c5f8e791dccfed565ba15a6d07878ca5bf91e4d7e329233e74ec7f9bec37052e5d57c37b257f47092634419c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/he/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/he/firefox-62.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "e3179e17d961f8d8ed29189e5e89e249ba18f2cd4b084cd1b47ec965af7f5403609673d477df0ba418fd1c2cabc7e92afe43123fb247f41a535eb4a34a899e8b";
+      sha512 = "12c9ca53789b1a72dcfc311017fc3e4ca286da7595f0198da02a6217b0a4ae1c1e517822cacd7e63df7481771141cb505421e65fc872a0665578bc5b8bec5bc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hi-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hi-IN/firefox-62.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "bde96bd5f8225bc5ee7c3e304c39c5f36ca06ef3a7d9d0a0d56db0782b9ddc64b4024b26c1b79c23caf54a219521145030e2e4f019448e434e234e058fb81328";
+      sha512 = "da90ba70059980d76b342be7561b81fc1f1d95c04995f8a72827ba7009b4652b057b2dce1f359cb6ef5eab2ca67dbe2bbb8cc9da3df436cf68f9073412aedb44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hr/firefox-62.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "983e6fca9dc9d505bfd1fd41f3a69f54510087180182f4fa07d4ad4b9ce180b3674eae6efd5f6be36be5c02f555bddbb81a52e21c6f94968395ff86ad7d98c43";
+      sha512 = "cb7295b08bc58e989067f65143644b5716689a4d5878e24880fa54f77b455ae9af5de310ca087ce78d7028eb8da856a25f87d162e7f0f061b6f2d061cee2e91e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hsb/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hsb/firefox-62.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "f2d76467468d62cbe0b14f056654bff256ff6ace2de45d9b957424022feacf6afa385841b7763443b2a7e4033a14693616d1a1d117ecdb7cc6da6ea34c285d0d";
+      sha512 = "36cb530230d00c7b0b78072a2c9017431d93296a291ad6436088564e099298848639e86bcac3062d056dac9d7b985b4717a167b037b17e925fc269430b1bfe95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hu/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hu/firefox-62.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d2a2d116083cb1519502a5c8d42f6c8b6a82e3fdcc6a43cce388d3c39fe766a2eda0f9355565ec503f83d18f2993d5d2ef22fe8e72a469594344ec878fc34f3a";
+      sha512 = "b91a1efb194ec8cfb8ba9be21cad49eeb75c273b3af5c78b887ca44211ce5a678aa1b307b4c15fd4c5e1e24ccc4b5c1d1e758bebbc20d4302d3ba06c2da39146";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hy-AM/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hy-AM/firefox-62.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "e16153be498984c1d86aa5d409ab20f24864a7cad5dd682e7274853366a8f91db1d9b3adf3c0025d657004282f6eae736c3a6fb1f98700b3d8d86696d9b27766";
+      sha512 = "5c52fec228d283146654741b634906d5ea5a172f99e5bbcf9233a330473df4123192ffb44318c3399d35000b8533b9542d5567df24558b2d312b0e9565a961d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ia/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ia/firefox-62.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "413e252c2e7e1fd31c4c39ce6e05cf31d47de79d25b43113d9b64e3ddabe35e2a292052c1f3e32628e617e5bbd4121905fbc8e7899aaad6297dbb8b08c286b0b";
+      sha512 = "05ec2b4348a2bcd25d1c0110a6e86cfebd0bb1c62c8d2b931ae8c3fd9ffcf39a41cbd3be52b3522d62c5f9bffd41f3a47ac6fe6c2602a784aa184146aa698232";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/id/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/id/firefox-62.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "0e602ce9a799ecb08196dd22fd00226ac0efb1a95d2fed43d69846cf1c1d810ffe2d08c39fd9564c4e133bcf94fb8642a836fe6760e9d0a4e86b0df0bf3f250b";
+      sha512 = "ba2931615fc7468acf361a722df435f6eb6e9002c57c1cb30439343b16b166fd78e17571e250c4aa8f2cc803e34131fa61afd582b7d78f59ef858ef3ac8c10fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/is/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/is/firefox-62.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6896efe5a1982e2b5126891f7da40c43cf2eeff59c76d4837d0327ac873dbdb190609ef2e84130bfb38d111e4232b029a713bac6c9bfdee5f397831b68fc9c50";
+      sha512 = "a2f05aaf639f22427872d84ff3b03893b2681984f52142d8451ce211f1f0c3ebaf8cdc0fe11c7ae6189b5e2aa21c82fa4dc4060196eaeea944b0a3aac7929bea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/it/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/it/firefox-62.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "62bb8fa38d8ea96af516d9c69c981ed959e66824785040bffa809ee7a1c6ba2e4b6e324beba263e5627183e660d97943960a2fba31f72b7d751a85a963538787";
+      sha512 = "749f03441d05b11ce5f1db1594d56c3dac530876a179c6b98a3932d082637e70102281dbcc7f988545f7b455fde4e20fd99657b1a318fd5e953fc225b08cd699";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ja/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ja/firefox-62.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "a968827ec6d07ea4a88722faba0deb26c633e755278a32072737f139b02309aff3b8da18f48949e0ed737a04755138c8594b6c10bcb4e65d09aa9dc73a045174";
+      sha512 = "6bd637bccae955eb543e648329061546e1a847a0dd3a7d730f73cbe9ffb2eeee0e1ee1cfa900ad6a2e2988a5cb70e3a7284c3e13e8be8e9620bca6d35805eee9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ka/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ka/firefox-62.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "767b550e392e5547c269cf04e06de184e08fabaa3a1a06bcfa1932411589c7bf661817038e0969b8f1ea51c99b676f304d1308142d0eba8bc5b6338092e06c8b";
+      sha512 = "f4a0bad9c3ec2f45039f87265eda6d1c6b318316147c0cbbbe0c4acf066ffb2051070420edc21c9d005d06e9d7d5b2b97347816cfc4386aabdf5ac7da7bd1010";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kab/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kab/firefox-62.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "d3204991c980728d23f01690041439d25deb6f338bd88c9c9636bd773a726af7327609da029a766c0d65c9a2f8f0801ff656ba195996bfaaf3a3ce2f050f23a1";
+      sha512 = "ee9023d4c7485810bbf8d506672083813643ae477234b4aaa2beab0049f12aab83c069bd0a74fb4d7248f398c3f23e9514191d093dd8e40c7afe12ce5896a57d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kk/firefox-62.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "650ef47cbc485304ed84ad674a0f6c0e724f612a90694eb20df7bbd9a88f9be4aee5acc9dc3c3079a95b11061cd34f0147c39dc16a0d49710a270c7e519d369d";
+      sha512 = "8dbd5851b1c3e26b69cdf5176f752ffa39eb3c10449d6e28cb4be7472969550599e939c84d16fa600fe33bc329141d0f4d64c77e74072b154da9ec83f186cafd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/km/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/km/firefox-62.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "35eaced569719c0877a3190b49163a3b5cca8c9aeed2ba868401f1dc2b5ddc28fe60e5235258ef4d9a2b5e7cd25aecdbae008636e389dc2663f0a10d225179bf";
+      sha512 = "629c95765741b39acdd44cc3bcc509e7adb3c2538a1a3786fdef3f856276a6a876b1a42df1a462f27b4d949e5b2c11adecf49ac196cd834f24c3bfeea9737825";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kn/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kn/firefox-62.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "8626cc39f2b65543a9dc7cfa090db7883294a47692740b123413dfd223543c83c961a47968f02597411e236d2bcb7125f0899db52c78041d830ce89101c7bf8e";
+      sha512 = "f4bd52a1253e5f8d258e16051de1da8aeeb13e79a79b8b6e674253b1b69d3f153e75c75b9def32053e7b65f4d2de154ab83f5bda3dd7d7dc6763e2eb858ee3b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ko/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ko/firefox-62.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "d8904507cbabd5e89bba2ed3d39da6f2e7327710af5390f75c9a2c8f99489512ab54f884231616469ed989248c384aa3ac1d086dcf42d02b92d2b44e75cba556";
+      sha512 = "bb68ef96316f2e7960e80c2351d08f98301da66f257db5c3326c7daba7d352b07ae6a408f7569f1b88f1ea35e060a6e75b2c253f8905078d7e48aaa6e9a7f9d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lij/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lij/firefox-62.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "f3dfd0195283582ed07e697c3f9996ca20c887909bd4f1972bb49a980afcf41e77df18fc81e0bd9f52519acf3507080a1e58512a0e50b7978acb8a17269fdf35";
+      sha512 = "b8eb9855fbd1cd4f8bd1ef9a033925ec7f355a9c053369798203742b31c0b077618a7f31a2534c6e802f2d48744b6b08edc3024d30dd1a8ffa2dec10700568c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lt/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lt/firefox-62.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "53d0481730b86a6b964e769f6d3fa849d833328140fa47ac5d31a7988060bafee5a5309678740df15ce8ad864f9731fc3277a6a58f8577a857193709f09dd033";
+      sha512 = "e2174d2aac6f82cdea13a8a9b60710e149eda357a10e084bd566b336fecf63a04b34372d343f54cfcac4ec03781f1cf67b1baf5945e9c51b65015e3487dcad85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lv/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lv/firefox-62.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "283f3f9345d8d7bd186ced0f417c5dfc02b788d357bb45f366fb8e92fc5985e83cd80bd7ef8b085fcc23e276fc3411395f976731810edccad61c63d2edcefb7b";
+      sha512 = "467cebfc8deac42eed8d8d8882ca75ac8c4686bc98afb04edfbf6657eae2ed249cca4d718c328c14994961582b79f32ad5badcf43b7ab542226f80f288fbf87a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mai/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mai/firefox-62.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "fbbaca82dbb5cc794a852bdbb2a766b5f90f5c061222c4154200641540ff6f1d9bad5cfd5f3acceb5fabd69fb500ab7c21c43186820601d089a7cc1bf5168042";
+      sha512 = "930d9ee5f07e4b23a69af055524fbd20380fe17692424db8e34f356607592a100e58045e0e90f76256b4c00cc5c09f1baf2807a98669ef3ac3827a024a6a5f14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mk/firefox-62.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "39f0c19e563ffe0ef44596429ebef45aa4176ddcbef35ef1de4e7c006ce93dc21afa5512cfaf343ae46e774a7e92a471c2d0052540d3704c5dbd30def3b86abe";
+      sha512 = "95500e1e99f10145e380de987616b8635219458cffa0b776da9c912eff3844b0912f6d58aa9964ce7d455e07de599628aef8875eb3175fee9ca057267eb679b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ml/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ml/firefox-62.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "eabc942d8c49bad4a9a1ca55aca4762d56c58992a37247aacc6ca2426713e9116925827216386140160649dd86005452b3411cc6158ebf3191bee6cddf621240";
+      sha512 = "2a38a511e7dfbee4ad96ab5d1d01e56a3243136826b46419ec3b19495ebc942adee52e9b3f369d7168fdcd5ce239f957662ac16b289c71fc14690f87f08403f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mr/firefox-62.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "56bf7ab49c79aceb18c6c11949a72813bad2589480a865d0da0ee3986869004bf544cd2d66510a022d60fac8b4456162bbdd479f846bbc0f0434ce8e00146cb7";
+      sha512 = "4d62cd91c4503f3aa4fb807ce4947784e37e5e55818e65ad7de77b49ea8c9949a514b489f0d47545c3e6705d4b1d38fa417df113b2b1cae93bb143cb6bd09a26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ms/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ms/firefox-62.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "19be62f3476f136f34660336ea7e96058ddd8699a71c5b2d1be8c444b372205fcd8f16d5d852ec33bc848292b346883fb065837711ce28bb5b16cad65a62a5ec";
+      sha512 = "48a6762fc270b6666f972d5f5000450741aba4845e7857a8fa609819765f9745fe295b1d491762d39b73e717fde7bd0d9fea24f3b3bd5aece28d82dbad7e10f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/my/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/my/firefox-62.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "293c80b252f9a6102d7d259e493cfa4a263917fe1204bfbb0f82215bb17905055d99923fbce4dd029d83faf92d29327e2b8326b082cbceb15dc18dbe0b041976";
+      sha512 = "c48c372b20515cee56138313556a4a2156b1316b1586b563e50b5e153f22da7387436563f2869129d7176e2df2f030169789342b1604e48e2185fdddce7bf31a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nb-NO/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nb-NO/firefox-62.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "acf870d40309cf7fb39c30ddf41a88555bd037ba2ecb769b30d41094efd1e29181df91337286c0d8db76bc0bc3e2da915e74e409f5328a51f2f73e0f8ed05cef";
+      sha512 = "0152559b76592e30e672af3cc333dcca6fc928e6224a96daff3a01dcc404ab9b18600678ea87a59a28ad0366842c025942e672ae7011f777a2ac170cebaa17b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ne-NP/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ne-NP/firefox-62.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "bf47317457835eb796567bf21c41b5cd4e88e8f5e3623022b8fb3a6975604e5e0f637a4297b68cb03d88b08ad58cfd6bdc81523a349738a12f10b6ec005e17ab";
+      sha512 = "aa6226d0f0e1f3550ab4103e583d1a3a38b509ddabceab46ae3a7c02e7403884d08c7084e49b626e2d06581eb6b5192de913f245998f516577521ad0beb43b40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nl/firefox-62.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "d489b412aa16d31f1e81a9715ef8efd852803b1e8c26bdc1aa496c5c0a73263826affdf721694213c638a1dbf37333e9f45d5ee0286b39c236cdc3a4e1e6b4ee";
+      sha512 = "1cb3f8b0e7634dd978640d0f080086d8fd071180c0266f94db6cfdc1c6d33ee79776b8d2c8bfdbadd2e102a78fc01176a16ad29a101d58c716de800cfc6db42a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nn-NO/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nn-NO/firefox-62.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "ef1660457ffb2cbe6b266b8d6295bda784759027abf8afa5179d12ef302374809b8c03ca8cfd028444cb727089008e75ff15042e12f2f883aa18cf27f9baf76b";
+      sha512 = "f30751ad1c02ee9fb7f4dd442cbbec9ae217700b6d35b619cbc12e00f58eb25f37fb5c98908dcbe0b82c81f6790c3334265d28c1bc882d0a772cf45c8ac48a33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/oc/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/oc/firefox-62.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "b366368985b0491a3fdae463c114c60147d080e8347ad085d5db82d65b2a8d720f7dcc7486e0b9e576a83e335ee1eb3c8949949a49463ec7eb2dbc43b6c72f98";
+      sha512 = "1b1c5f822f119f114d8a68d2aa098b398b70c420d4823203694d4491dede84d4d096a652faabbf4905108663da87235bddf1075c4fb54a8017374f01d99da34c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/or/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/or/firefox-62.0b2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "ced81741353263836d9bbbe13d3e981fb7c83f55f9a2095d1bbb9bc06a2221e5e125578096bfed54b66e3707a6c659b9a4736ba1552be1809ab7708587a79115";
+      sha512 = "285b27aad7065e9bfb75d70662512916f000f5fb11637a34413e4f67043bf35beb3e13960b88b67ce932b2aef879c802a88a0cf19dd7c8d7b89f0303a47c4142";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pa-IN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pa-IN/firefox-62.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c3e11f3580dda5b4a11c50277d9da81fc94c23ca1ec40e2c48ccb828579a9443b3a4dcc1bf3ae24ffd78b8aee9288e0edd00eaeb0f44cc89ed06f45c03e7ea41";
+      sha512 = "bca37e2c65a0341a9a695edfc99444b761eddfeae95ee168ea65583c2511864e1cc1070a53fe73392e2a2e091a270123be9a18b09de54f142803674bc2ed4f8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pl/firefox-62.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "882f35dd369488c3d2c7dfce8205d3a165e8fc2ffd057166d6ff4e61e1726a4452d6a5acaef5e65571f6247718c489e0bec0a7e5960708f44cbf5ddf08dfc39e";
+      sha512 = "8ce19ac1311fc7305ecdc5304918bec16dfc3d65a7edacdd06494ef7486537f1e1bf139c7dff2b9d16e6b72ab41110de0efe2b39f5b956774d9dca9169006aee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pt-BR/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-BR/firefox-62.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "9b03a2fefd05f986878e55bcf88991273112a44bdb216598a9a5a56433580a8e5c344be75cc13fe6799e701127bbed67e5d768520611e981c6b54a569f281b0f";
+      sha512 = "910a36d7175d576fde413e9749c406c734c33ae15c8fde5129468a76c48cd604491c3be9480bdf768d90d910d4c0c82bcf32a5d92f7c442e42edf07c445f6879";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pt-PT/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-PT/firefox-62.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "565c9fd3eeb044e56da27897c20959e65d17c653521d2ba848ef73b0533519e0e01ff482e4bdf352974a584d654bde23d0e58c929722554125473f420b286e25";
+      sha512 = "7e4acdabdf73291ca35d20575b7a6d367a9b874310937ac8a5adaaf89328decb85d23aa41c0ed088607387e36a86ea9c79cb51b99e12622422917565d9d6bee2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/rm/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/rm/firefox-62.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "66cb8e518d7f794341afe9310efd5588bd88a81eff38dca36311a60b3140fac1f83b30eeb78ec7f9c8f999e276eab50964b31b5923fec58ee0b32c333285ebff";
+      sha512 = "639b0c0d80fbb3a619565bd86d1ddb7078412c667f37f4758048b444ade16328f79f6c40da3fd644cc8f3290f93ad2c1799a16e952066dd172b46fbae2e6bbb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ro/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ro/firefox-62.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3a4cd4037f51347cab0b198cefd3fcee5c201fde671ed2b781553ea336a20e1a57809844ac3806f771603693ba9f118416cb4af5ea0cae029f99f4286a89d22e";
+      sha512 = "6ff276594b9aa3c5d0459db8cdbd2fb4a78c19fa7bd6a7f6dc1aee0e8e01c2238750f9d923925271f6ad6eb67c3e1fe93c1874fa2a39baece42e5d00c0e1957e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ru/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ru/firefox-62.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "f44fd98115173deb2d05804842413ee4f05629e07d4362346a51f97a1ed0ddbdd6f6c79cc01bd89366bce2f455cc27af56de2807954c913be8a26fdae9495c82";
+      sha512 = "5579599f5013abcc7302a32aca58a2011a319de08f7e24d077496a4b19f9f9a631c839929d33a1a6804caed23c62787e354e71db974f0a3eacd73300b9b803c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/si/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/si/firefox-62.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "c2b3473fe2994e57c5321d4cdce60c250e0dfd11915449afe2d3033be2f082817e9dd6c2ea64a000ee4f20ea4fe51b642dfa6abe1faee976ca2dfee754d5ffd6";
+      sha512 = "b07a113f81af2f53500de22b9cb99989ce2c26b01a26f0d1448efbcce8e7052f53ddc07ceeb638305caacc7fc3a334b06e7eadf34a73a9a7d8bfd95fc22505ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sk/firefox-62.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "eb0cbb65eff38e20371930ea56450478172360a85c6692b14bebeffaca47dd2c1bbf07446294e210a52e14749c31dfc6dc34c36fca8312bfa4267ac17f2e5d98";
+      sha512 = "41cd851dd8d54e0a8cd128b37b4170bd657a1cc9ab1e59080f477e4b0a12f22b37385106892e5f67bc52b6ceec938b05268a723d4cdb801289bd64d18ec8fd75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sl/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sl/firefox-62.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3328939bf37de6646df07b2f63fd6bbe14638587c9f5349b2899ae1bdd11d4d57d7fa8d43c9bd6a915f95815717b1b9cb7b028be250428651ac5c73d9bcd3686";
+      sha512 = "e3db0de96e71579624f3b7b243853fa83adf5abe7cb78306598a5cf03b22d480ab4ad780e71c1d91e1c7a7a1bacd753ebcc4c3e7a33c04c40e0315c943a48bce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/son/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/son/firefox-62.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "2b833d57529f58a2a34ca6f3770cadcb14cb4b7758dd3a3c2f5ede33b22fe3759483b3af7db17b87272a255a044403b4b8c8946c6e6358c3edb699347c6caf03";
+      sha512 = "eacf707cb6c3da50d0739fe5f26c35c10679d54265b9528ba3cd805621cd304e0d1a58cc7568a6822543283210f86b7fa85074d21702cba173f83e92ac0fcc5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sq/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sq/firefox-62.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "96413625445c9afb849ef34dfed5f7445f61038b27c136add1ab43632a3e01e645804aa48cc0c4df8a89942e8a4b3ee41e6999433ca8f35d38b411358d12656c";
+      sha512 = "c164f2ec8af034ba49aee7e4d85bbe5c19721ac3d090cc0f82b2d8a0683f2d5dadc9507bdd23fd0f7b7882151b28ec8f0dfd0cfc293f07bc1ec4bcb5e63dad6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sr/firefox-62.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "a1f9dfefbf53f8b3583e318d9e7bb7c6443e302b54db220dbbd7f24369abc3c556d49aa07174f979c565f81a22154e8d340a76746854e09af2c5beddb345dec6";
+      sha512 = "4893138ff776f85a67d6983de06dbb5dc7b799968ce277b0bee7b3e534836552e9ff82e551b9a013473189e457370036aadb9366e18eb14f124d2b18536f4db4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sv-SE/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sv-SE/firefox-62.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "42f99df87e0b45ea29c51ab9a4d3147f9956980bc62429a6cfe29a51d394b2b9515a0c042722305b31f5d3834502b6d032a4eca9f060a3fc3c6ae9bcf5efc128";
+      sha512 = "b612b2c01f072ff4c242fbd91612b0a7d3aeaa6635c0c1a66f4934726a8b8332119f6d96971aa056fa57d091d66fb71192b72bdc943bc788f59bb3a142b58852";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ta/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ta/firefox-62.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4342517a40d246676c57aa1da4baaba44af63ee8fb5919d0c040b2e190efe2ace068da4955525dafb42f55bee84c5c7d0fd27347c6743c84b677c6a76b50bf86";
+      sha512 = "4f431d7702f7dba2223084c567284acec2cd741d29db8888ebe8632ab849f3cbe12165ea3cd4d0f725ee24d9383e7e908826da6fa336a3cb68c616a599083e25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/te/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/te/firefox-62.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "a37b00cd8fb297a67f57c0e493d112a31c7d51da45f63312b1afb689bbdcb7c73ccb93b24c721137534dc6d2f4d4a08dad6b9cdd6f075d35aff3cf3b88b2bc89";
+      sha512 = "67c89777963c76fe126431521d8b9a80bdf2bec8ea6e6f231840f99099cef0188fd06017bd4f3391aef64c99a8b2f0eace0a3dc466e1d25c82ce4b0783723884";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/th/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/th/firefox-62.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "23bb835d03d8ecf73f474ab20b9af4d0064e794c93be320eb1902635f8ddf63b83425e4aaed9457b949bb97f15999a1aafa3a831af45eb7937a5f3f497bb409f";
+      sha512 = "736a96e4b772bd34108e173c15f41aab1676352435aa17a333f259733e9924af16226ed1b7d639221e538e8b48c224ff27f0b09a5bde1bd0700d005cfbe20055";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/tr/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/tr/firefox-62.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "25b11eb970a5bb5889cfd36e14865bf53de05de53fcec21ffc44e4e57889422ae668061110d6c23fa94282619a7fea69aac1baf2e3db075b61f8aef68ba0a00b";
+      sha512 = "34d33d7503948ad26f40ec3c1defb96b962f07b8d9afff569421168d35a8666345abb9c23a0125bd103448ed86bd22e361b716608a42bbac1482035d2fa48ff6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/uk/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uk/firefox-62.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "d1ccb9277f72d2b575bd1bdeb26b05f8be1fb7dc7aea801f51ae1e63684c541cde9e203ef2bc0f01c48b01ad9b85701b40117573c5b44b2f8fafcb3940993576";
+      sha512 = "f2df840ef644f5ae344c6e88faca3af65c6c24147f5867e87b9c09e8f94f18747ecec7f0d76dbc9e640224988f1924845b820847dee9983769e09fc5b4f47081";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ur/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ur/firefox-62.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "9fd5a14da1c5ef7f508c0852428d7657ec646785cf21d8f381b16f8bece68699081b85507fa7e69b186533f4653ca27038f0f976899ea8220a97cf8e199d22ef";
+      sha512 = "4d8f591cc72adcb6cd31b14b11bb47911f1c566e6c66c93f08ef07a5608936aa2bee54a5929e5238a218e8080daea8a4c83c3135b789bad85123abd03cf7a6c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/uz/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uz/firefox-62.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "24ea3aed72b06fcc84d4e4148ef7a766594f94de11d49a67239f3e454eeffcaaa74e41b93d76a256ac0f9bbd302de2e82f02356f4c650c80e9bcb2ab01bafb65";
+      sha512 = "86ebc113a76905813795d451d7993be8f1c6f0e9b928d25b5f1e4e651f8e2c2492baa01e00af594d1edbd0948f6173e91a37cc5595f62dd7c82c8b6ffffe25ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/vi/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/vi/firefox-62.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "580fa2bd0d5a5105bdf37f855ad67e12df04cb556f03911e252f1854b7749e407b0dee93c643d44371f4e03a9cf4c1522389c7fe4b36ab3c27bd5f1729f0d942";
+      sha512 = "3278d20cac4b0311e0bb5d0034bd697eebc3ce14ed1099ca04f646e6fe04ed1ee2aae03d118a4cb447ca4c0253b127a275410cbab70bdd671f1e5fda28618cd7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/xh/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/xh/firefox-62.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "8497ee2217b0f0588579f56d64e56c7e17352b0b88d7d3fb98d46ee67889f017bf69ad0c79480c24108445d8c9a171d047c3d4c0363c9f447f50f4863c8104a0";
+      sha512 = "cd65c0c9abe5d90bebc3eaba01a45fd15cc31d115648fda0c54e662183cea9e41557d629a282620dc0867850e99dbaabfd1c213df6fb839883111602d105d40e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/zh-CN/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-CN/firefox-62.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "168268f4cf22dd22c64fecee16ed619c6adfc5370e022554b000e92c052356b31492a10733f55fee3c37d45b08a3ab63f66545f4e502101f0440f9c683837e33";
+      sha512 = "3cc975c9880c2eba033954c8caf828144ee0002fe4be9df68a9de1bb183001b572515dd063961f998a4a7b4fffcf285568f979ef0d44cd34788dca8b41c5668d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/zh-TW/firefox-62.0b1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-TW/firefox-62.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "0c9b3475773dc7669c2408c8533a23330f3c3f49d6b07a807a16eeab946ef933fcf505f43835237f690f49045489e3ad294a2db74622cd09ab2b4473e8eac42b";
+      sha512 = "2a5a1ae121819be9df3b2d0c95e2676c72f3094a09dce797d23cdd4e9d2326560bde37574d48ec8eeb973c41e07a4ab12d49cf53324c70cac1d2b881ea22a4dd";
     }
     ];
 }

From 18231121f409057547a6b5c9bd9db13f9ca9b53a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Jun 2018 09:12:06 -0500
Subject: [PATCH 09/32] git: 2.17.1 -> 2.18.0

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 4e9b7d2428d..18bb1a2f93d 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.17.1";
+  version = "2.18.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr";
+    sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

From 5f27396e8f6fd53f76638484331599461842f0cf Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Jun 2018 09:15:54 -0500
Subject: [PATCH 10/32] git: remove symlinks-in-bin patch

---
 .../git-and-tools/git/default.nix                   |  1 -
 .../git-and-tools/git/symlinks-in-bin.patch         | 13 -------------
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 18bb1a2f93d..875590484f9 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation {
 
   patches = [
     ./docbook2texi.patch
-    ./symlinks-in-bin.patch
     ./git-sh-i18n.patch
     ./ssh-path.patch
     ./git-send-email-honor-PATH.patch
diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
deleted file mode 100644
index 0a581a61d46..00000000000
--- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -2609,8 +2609,7 @@
- 	{ test "$$bindir/" = "$$execdir/" || \
- 	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
- 		$(RM) "$$execdir/$$p" && \
--		test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
--		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
-+		ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
- 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
- 	  done; \
- 	} && \

From e65e6cad23d3880e935fe378b633952c841d8551 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Jun 2018 09:56:20 -0500
Subject: [PATCH 11/32] git: disable working-tree-encoding tests on musl

Makes assumptions about BOM.
---
 .../version-management/git-and-tools/git/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 875590484f9..fb66b5396dc 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -280,6 +280,8 @@ EOF
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     # Test fails (as of 2.17.0, musl 1.1.19)
     disable_test t3900-i18n-commit
+    # Fails largely due to assumptions about BOM
+    disable_test t0028-working-tree-encoding
   '';
 
 

From 4136cb5ba92c4fc81146758b578d5f0f203bd961 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Jun 2018 09:59:27 -0500
Subject: [PATCH 12/32] git: disable "editor with a space" tests due to fails

Need to investigate.
---
 .../version-management/git-and-tools/git/default.nix           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index fb66b5396dc..8ba7972d197 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -277,6 +277,9 @@ EOF
     # XXX: I failed to understand why this one fails.
     # Could someone try to re-enable it on the next release ?
     disable_test t1700-split-index "null sha1"
+
+    disable_test t7005-editor "editor with a space"
+    disable_test t7005-editor "core.editor with a space"
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     # Test fails (as of 2.17.0, musl 1.1.19)
     disable_test t3900-i18n-commit

From 1190af39b97fa88055c6c0b2775d9b08ff573b79 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Jun 2018 10:02:57 -0500
Subject: [PATCH 13/32] git: disable failing completion test as well

---
 .../version-management/git-and-tools/git/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 8ba7972d197..4402825360a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -280,6 +280,8 @@ EOF
 
     disable_test t7005-editor "editor with a space"
     disable_test t7005-editor "core.editor with a space"
+
+    disable_test t9902-completion "sourcing the completion script clears cached --options"
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     # Test fails (as of 2.17.0, musl 1.1.19)
     disable_test t3900-i18n-commit

From c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 10:21:43 -0400
Subject: [PATCH 14/32] android: add ndkVer to resolve ndk ambiguity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.

/cc @Ericson2314
---
 lib/systems/examples.nix                             |  5 ++++-
 .../mobile/androidenv/androidndk-pkgs.nix            |  2 +-
 pkgs/development/mobile/androidenv/default.nix       | 12 +++++++-----
 pkgs/stdenv/cross/default.nix                        |  2 +-
 pkgs/top-level/all-packages.nix                      |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 2d77a57fbe3..108996206a7 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -31,7 +31,8 @@ rec {
 
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
-    sdkVer = "24";
+    sdkVer = "21";
+    ndkVer = "10e";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
@@ -39,6 +40,7 @@ rec {
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
     sdkVer = "24";
+    ndkVer = "17";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
@@ -46,6 +48,7 @@ rec {
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
     sdkVer = "24";
+    ndkVer = "17";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index a0f684d37cc..5c42f7bc328 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -18,7 +18,7 @@ let
     "armv5tel-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
-      gccVer = "4.9";
+      gccVer = "4.8";
     };
     "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index d6d6b8a0cad..3e1f00d6ad5 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -246,7 +246,7 @@ rec {
     sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw";
   };
 
-  androidndk = import ./androidndk.nix {
+  androidndk_17 = import ./androidndk.nix {
     inherit (buildPackages)
       p7zip makeWrapper;
     inherit (pkgs)
@@ -256,6 +256,7 @@ rec {
     version = "17";
     sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds";
   };
+  androidndk = androidndk_17;
 
   androidndk_r8e = import ./androidndk_r8e.nix {
     inherit (buildPackages)
@@ -276,7 +277,7 @@ rec {
     inherit androidsdk;
   };
 
-  androidndkPkgs = import ./androidndk-pkgs.nix {
+  androidndkPkgs_17 = import ./androidndk-pkgs.nix {
     inherit (buildPackages)
       makeWrapper;
     inherit (pkgs)
@@ -286,10 +287,11 @@ rec {
     # but for splicing messing up on infinite recursion for the variants we
     # *dont't* use. Using this workaround, but also making a test to ensure
     # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk;
-    inherit androidndk;
-    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs;
+    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17;
+    androidndk = androidndk_17;
+    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17;
   };
+  androidndkPkgs = androidndkPkgs_17;
 
   androidndkPkgs_10e = import ./androidndk-pkgs.nix {
     inherit (buildPackages)
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 973be983186..ab42dd319a6 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -42,7 +42,7 @@ in lib.init bootStages ++ [
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
            else if crossSystem.useAndroidPrebuilt
-             then buildPackages.androidenv.androidndkPkgs.gcc
+             then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
            else buildPackages.gcc;
     };
   })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47c8f1e5872..837995fb61a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8695,7 +8695,7 @@ with pkgs;
 
   # TODO(@Ericson2314): Build bionic libc from source
   bionic = assert hostPlatform.useAndroidPrebuilt;
-    androidenv.androidndkPkgs.libraries;
+    androidenv."androidndkPkgs_${hostPlatform.ndkVer}".libraries;
 
   bobcat = callPackage ../development/libraries/bobcat { };
 

From 26f24fe09a4b2bda6bff25261ae5000740613b4c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Jun 2018 10:10:20 -0500
Subject: [PATCH 15/32] git: indicate when last tested to "still" fail, for
 checking updates

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 4402825360a..522a6fcd6a1 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -276,16 +276,20 @@ EOF
 
     # XXX: I failed to understand why this one fails.
     # Could someone try to re-enable it on the next release ?
+    # Tested to fail: 2.18.0
     disable_test t1700-split-index "null sha1"
 
+    # Tested to fail: 2.18.0
     disable_test t7005-editor "editor with a space"
     disable_test t7005-editor "core.editor with a space"
 
+    # Tested to fail: 2.18.0
     disable_test t9902-completion "sourcing the completion script clears cached --options"
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     # Test fails (as of 2.17.0, musl 1.1.19)
     disable_test t3900-i18n-commit
     # Fails largely due to assumptions about BOM
+    # Tested to fail: 2.18.0
     disable_test t0028-working-tree-encoding
   '';
 

From 2bd8148b951230cc3fb7dafc4875d9c065e11d3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jun 2018 15:22:34 +0200
Subject: [PATCH 16/32] LTS Haskell 11.14

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 437ff2d9d65..5e389655cca 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.13
+  # LTS Haskell 11.14
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -66,7 +66,7 @@ default-package-overrides:
   - aeson ==1.2.4.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
-  - aeson-compat ==0.3.7.1
+  - aeson-compat ==0.3.8
   - aeson-diff ==1.1.0.5
   - aeson-extra ==0.4.1.0
   - aeson-generic-compat ==0.0.1.2
@@ -203,7 +203,7 @@ default-package-overrides:
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
   - assert-failure ==0.1.2.2
-  - astro ==0.4.2.0
+  - astro ==0.4.2.1
   - async ==2.1.1.1
   - async-extra ==0.2.0.0
   - async-refresh ==0.2.0.2
@@ -216,9 +216,11 @@ default-package-overrides:
   - attoparsec ==0.13.2.2
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
+  - attoparsec-ip ==0.0.1
   - attoparsec-iso8601 ==1.0.0.0
   - attoparsec-path ==0.0.0.1
   - attoparsec-time ==1
+  - attoparsec-uri ==0.0.4
   - audacity ==0.0.2
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
@@ -296,7 +298,7 @@ default-package-overrides:
   - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.1.0
-  - blaze-html ==0.9.0.1
+  - blaze-html ==0.9.1.1
   - blaze-markup ==0.8.2.1
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
@@ -325,7 +327,7 @@ default-package-overrides:
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
   - buchhaltung ==0.0.7
-  - buffer-builder ==0.2.4.5
+  - buffer-builder ==0.2.4.6
   - buffer-pipe ==0.0
   - butcher ==1.3.0.0
   - bv ==0.5
@@ -568,7 +570,7 @@ default-package-overrides:
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.4.2
+  - deriving-compat ==0.4.3
   - descriptive ==0.9.4
   - dhall ==1.11.1
   - dhall-json ==1.0.13
@@ -588,7 +590,7 @@ default-package-overrides:
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
   - distributed-closure ==0.4.0
-  - distributed-process ==0.7.3
+  - distributed-process ==0.7.4
   - distributed-process-lifted ==0.3.0.1
   - distributed-process-monad-control ==0.5.1.3
   - distributed-process-simplelocalnet ==0.2.4
@@ -880,6 +882,7 @@ default-package-overrides:
   - grouped-list ==0.2.2.0
   - groups ==0.4.1.0
   - gtk2hs-buildtools ==0.13.4.0
+  - gym-http-api ==0.1.0.1
   - H ==0.9.0.1
   - h2c ==1.0.0
   - hackage-db ==2.0
@@ -892,7 +895,7 @@ default-package-overrides:
   - hamilton ==0.1.0.2
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.6
+  - hapistrano ==0.3.5.7
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.1
   - happstack-server-tls ==7.1.6.5
@@ -986,7 +989,7 @@ default-package-overrides:
   - hmatrix-backprop ==0.1.2.0
   - hmatrix-gsl ==0.18.2.0
   - hmatrix-gsl-stats ==0.4.1.7
-  - hmatrix-morpheus ==0.1.1.1
+  - hmatrix-morpheus ==0.1.1.2
   - hmatrix-repa ==0.1.2.2
   - hmatrix-special ==0.4.0.1
   - hmatrix-vector-sized ==0.1.1.0
@@ -1018,8 +1021,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - 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
@@ -1027,7 +1030,7 @@ default-package-overrides:
   - HSlippyMap ==3.0.1
   - hslogger ==1.2.10
   - hslua ==0.9.5.2
-  - hslua-aeson ==0.3.0.1
+  - hslua-aeson ==0.3.0.2
   - hslua-module-text ==0.1.2.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
@@ -1066,10 +1069,10 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.11
+  - HTTP ==4000.3.12
   - http2 ==1.6.3
   - http-api-data ==0.3.7.2
-  - http-client ==0.5.12.1
+  - http-client ==0.5.13
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
@@ -1167,6 +1170,7 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.5.0.1
   - io-streams-haproxy ==1.0.0.2
+  - ip ==1.2.1
   - ip6addr ==0.5.3
   - iproute ==1.7.5
   - IPv6Addr ==1.0.3
@@ -1180,7 +1184,7 @@ default-package-overrides:
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
-  - iso8601-time ==0.1.4
+  - iso8601-time ==0.1.5
   - iterable ==3.0
   - ixset ==1.0.7
   - ixset-typed ==0.3.1.1
@@ -1235,7 +1239,7 @@ default-package-overrides:
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.17
+  - language-puppet ==1.3.18
   - lapack-carray ==0.0.2
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.0.1
@@ -1327,6 +1331,7 @@ default-package-overrides:
   - markdown ==0.1.17.1
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
+  - markup ==4.0.4
   - marvin-interpolate ==1.1.2
   - massiv ==0.1.6.1
   - massiv-io ==0.1.4.0
@@ -1463,7 +1468,7 @@ default-package-overrides:
   - netlib-carray ==0.0.1.1
   - netlib-ffi ==0.0.1
   - netpbm ==1.0.2
-  - nettle ==0.2.0
+  - nettle ==0.2.1
   - netwire ==5.0.3
   - netwire-input ==0.0.7
   - netwire-input-glfw ==0.0.10
@@ -1610,7 +1615,7 @@ default-package-overrides:
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
   - pinboard ==0.9.12.10
-  - pinch ==0.3.2.0
+  - pinch ==0.3.3.0
   - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
@@ -1669,7 +1674,7 @@ default-package-overrides:
   - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
-  - prettyprinter ==1.2.0.1
+  - prettyprinter ==1.2.1
   - prettyprinter-ansi-terminal ==1.1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
@@ -1722,7 +1727,8 @@ default-package-overrides:
   - QuickCheck ==2.10.1
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
-  - quickcheck-combinators ==0.0.2
+  - quickcheck-classes ==0.4.12
+  - quickcheck-combinators ==0.0.4
   - quickcheck-instances ==0.3.18
   - quickcheck-io ==0.2.0
   - quickcheck-properties ==0.1
@@ -1788,7 +1794,7 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.11.1.0
-  - relational-query-HDBC ==0.6.7.0
+  - relational-query-HDBC ==0.6.7.1
   - relational-record ==0.2.1.2
   - relational-schemas ==0.1.6.1
   - rematch ==0.2.0.0
@@ -1860,6 +1866,7 @@ default-package-overrides:
   - semigroupoid-extras ==5
   - semigroupoids ==5.2.2
   - semigroups ==0.18.4
+  - semirings ==0.1.3.0
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
   - sendfile ==0.7.9
@@ -1915,7 +1922,7 @@ default-package-overrides:
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.1.0.0
-  - show-prettyprint ==0.2.0.2
+  - show-prettyprint ==0.2.2
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple ==0.11.2
@@ -1931,11 +1938,11 @@ default-package-overrides:
   - skein ==1.0.9.4
   - skeletons ==0.4.0
   - skylighting ==0.6
-  - slack-web ==0.2.0.4
+  - slack-web ==0.2.0.5
   - slave-thread ==1.0.2
   - slug ==0.1.7
   - smallcheck ==1.1.4
-  - smoothie ==0.4.2.8
+  - smoothie ==0.4.2.9
   - smtp-mail ==0.1.4.6
   - snap ==1.1.0.0
   - snap-blaze ==0.2.1.5
@@ -1966,14 +1973,14 @@ default-package-overrides:
   - split ==0.2.3.3
   - splitmix ==0
   - Spock ==0.12.0.0
-  - Spock-api ==0.12.0.0
-  - Spock-api-server ==0.12.0.0
+  - Spock-api ==0.12.0.1
+  - Spock-api-server ==0.12.0.1
   - Spock-core ==0.12.0.0
   - Spock-lucid ==0.4.0.1
   - Spock-worker ==0.3.1.0
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.7
-  - sqlite-simple ==0.4.15.0
+  - sqlite-simple ==0.4.16.0
   - sql-words ==0.1.6.1
   - squeal-postgresql ==0.1.1.4
   - srcloc ==0.5.1.2
@@ -2006,7 +2013,7 @@ default-package-overrides:
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
   - store ==0.4.3.2
-  - store-core ==0.4.3
+  - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
   - stratosphere ==0.19.1
   - streaming ==0.2.1.0
@@ -2132,7 +2139,7 @@ default-package-overrides:
   - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
   - threepenny-editors ==0.5.6
-  - threepenny-gui ==0.8.2.3
+  - threepenny-gui ==0.8.2.4
   - threepenny-gui-flexbox ==0.4.2
   - th-reify-compat ==0.0.1.4
   - th-reify-many ==0.1.8
@@ -2248,6 +2255,7 @@ default-package-overrides:
   - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
+  - urlpath ==8.1.0
   - userid ==0.1.3.2
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
@@ -2257,7 +2265,7 @@ default-package-overrides:
   - utility-ht ==0.0.14
   - uuid ==1.3.13
   - uuid-types ==1.0.3
-  - vado ==0.0.9
+  - vado ==0.0.10
   - validation ==1
   - validationt ==0.2.0.0
   - validity ==0.4.0.4
@@ -2340,7 +2348,7 @@ default-package-overrides:
   - web-routes-th ==0.22.6.3
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.5.0
+  - websockets ==0.12.5.1
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.3.0

From 503e5c3f2780a01a01dfa0cde2146ecedca89602 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jun 2018 18:48:36 +0200
Subject: [PATCH 17/32] hackage2nix: boolector has an unfree license

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5e389655cca..d87a84c3c77 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2652,6 +2652,7 @@ dont-distribute-packages:
   accelerate-fourier-benchmark:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm-ptx:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-yices:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boolector:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ccelerate-cuda:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cublas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cufft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]

From d94d27c2ddc0cafb9734b638710b8c3b0639380f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Jun 2018 02:31:32 +0200
Subject: [PATCH 18/32] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c9934e673b43c0c1af223aa987d035f46ec8bf1d.
---
 .../haskell-modules/hackage-packages.nix      | 2354 +++++++++++------
 1 file changed, 1492 insertions(+), 862 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6042f24771f..55cd821e1a2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2492,6 +2492,7 @@ self: {
        pname = "Cabal";
        version = "2.2.0.1";
        sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
+       setupHaskellDepends = [ mtl parsec ];
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          mtl parsec pretty process text time transformers unix
@@ -3605,22 +3606,23 @@ self: {
   "DOH" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
      , filepath, http-client, http-client-tls, http-types
-     , interpolatedstring-perl6, lens, mtl, QuickCheck
-     , quickcheck-instances, text, time, unordered-containers, uri
+     , interpolatedstring-perl6, lens, mtl, network-uri, QuickCheck
+     , quickcheck-instances, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "DOH";
-       version = "0.1.2.0";
-       sha256 = "1l70h2213lmpy8mkac4iy9wfcqiqcsp1dvgx9lby470hn77jmg3w";
+       version = "0.1.4.0";
+       sha256 = "1rpmsl07m4qy33axhw39qxay6bw299cs4zqa8nq6w4bcqz44fqav";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers filepath http-client
-         http-client-tls http-types lens mtl text time unordered-containers
-         uri
+         http-client-tls http-types lens mtl network-uri text time
+         unordered-containers
        ];
        testHaskellDepends = [
          aeson aeson-casing base bytestring containers filepath http-client
          http-client-tls http-types interpolatedstring-perl6 lens mtl
-         QuickCheck quickcheck-instances text time unordered-containers uri
+         network-uri QuickCheck quickcheck-instances text time
+         unordered-containers
        ];
        description = "Complete API bindings for DigitalOcean API V2";
        license = stdenv.lib.licenses.mit;
@@ -8069,13 +8071,19 @@ self: {
      }) {};
 
   "HNumeric" = callPackage
-    ({ mkDerivation, base, normaldistribution, random }:
+    ({ mkDerivation, base, math-functions, parallel, parallel-io
+     , random
+     }:
      mkDerivation {
        pname = "HNumeric";
-       version = "0.4.0.0";
-       sha256 = "1vr2i6xm4ix9iym41cp04ipf38hv6n76baf38c8mf25b5cibfblf";
-       libraryHaskellDepends = [ base normaldistribution random ];
-       testHaskellDepends = [ base normaldistribution random ];
+       version = "0.5.0.2";
+       sha256 = "1z6r9z7s89z9bihiy37scjrb8k3gb6zi7fl77d3sdldy2x0ajgrh";
+       libraryHaskellDepends = [
+         base math-functions parallel parallel-io random
+       ];
+       testHaskellDepends = [
+         base math-functions parallel parallel-io random
+       ];
        description = "Haskell Numeric Library with pure functionality, R & MATLAB Syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8574,28 +8582,6 @@ self: {
      }) {};
 
   "HTTP" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
-     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
-     , network, network-uri, parsec, pureMD5, split, test-framework
-     , test-framework-hunit, time, wai, warp
-     }:
-     mkDerivation {
-       pname = "HTTP";
-       version = "4000.3.11";
-       sha256 = "0idnclf1gnvqsygppanr0gj6dfvxj1rsz8q7hhahfw82v0wjplps";
-       libraryHaskellDepends = [
-         array base bytestring mtl network network-uri parsec time
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq
-         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
-         test-framework test-framework-hunit wai warp
-       ];
-       description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HTTP_4000_3_12" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -8615,7 +8601,6 @@ self: {
        ];
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -10005,8 +9990,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsYAML";
-       version = "0.1.1.0";
-       sha256 = "1dih7i0c1fayqrz9x27hfhvg0rb0w1m70a702qhbyjr5jczlh6rb";
+       version = "0.1.1.1";
+       sha256 = "1qxblx2s67n4jmnzai00hqp92iz3kvmzl1pqyx6l9zgllmh94zrh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10237,6 +10222,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IPv6Addr_1_0_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "1.0.4";
+       sha256 = "1hgb0jygywhz74mndbk94v7pw9h4wfy902wxhnhdd9rb51dcb0d9";
+       libraryHaskellDepends = [
+         aeson attoparsec base iproute network network-info random text
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       description = "Library to deal with IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IPv6DB" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
@@ -16967,20 +16971,6 @@ self: {
      }) {};
 
   "Spock-api" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
-     mkDerivation {
-       pname = "Spock-api";
-       version = "0.12.0.0";
-       sha256 = "005ydqf5nq527n3axm8mdi3igsjx76kghabxzfawa9m45yyvrzcc";
-       revision = "1";
-       editedCabalFile = "0w0xah0lirgrs1xvlw5z6saa3wvzdl5r3yq3zxipg7kmrfxgbfbz";
-       libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Spock-api_0_12_0_1" = callPackage
     ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
      mkDerivation {
        pname = "Spock-api";
@@ -17009,18 +16999,6 @@ self: {
      }) {};
 
   "Spock-api-server" = callPackage
-    ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
-     mkDerivation {
-       pname = "Spock-api-server";
-       version = "0.12.0.0";
-       sha256 = "1kiin49jgdbw38cf4x89f00hpdxd2bq4plfasxqyqx9qh8344wr9";
-       libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Spock-api-server_0_12_0_1" = callPackage
     ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
      mkDerivation {
        pname = "Spock-api-server";
@@ -19086,6 +19064,8 @@ self: {
        pname = "WordNet";
        version = "1.1.0";
        sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k";
+       revision = "2";
+       editedCabalFile = "08i5izbni7xism94h6ncmdvfy88gny2vybapv0fkzgw3wyf6arhq";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -19098,6 +19078,8 @@ self: {
        pname = "WordNet-ghc74";
        version = "0.1.3";
        sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8";
+       revision = "1";
+       editedCabalFile = "1wdx2xv6zxvwkz3jkkd4vcdf9hyyivbfwyln9dd30m67ip7illp3";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -21818,34 +21800,6 @@ self: {
      }) {};
 
   "aeson-compat" = callPackage
-    ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
-     , base-compat, base-orphans, bytestring, containers, exceptions
-     , hashable, QuickCheck, quickcheck-instances, scientific, tagged
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
-     , time-locale-compat, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson-compat";
-       version = "0.3.7.1";
-       sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r";
-       revision = "3";
-       editedCabalFile = "1smql0v6b9f4pb3jnrm8kspyq2ygvznk1wkhzp0x7bjd7psrnmy9";
-       libraryHaskellDepends = [
-         aeson attoparsec attoparsec-iso8601 base base-compat bytestring
-         containers exceptions hashable scientific tagged text time
-         time-locale-compat unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat base-orphans bytestring
-         containers exceptions hashable QuickCheck quickcheck-instances
-         scientific tagged tasty tasty-hunit tasty-quickcheck text time
-         time-locale-compat unordered-containers vector
-       ];
-       description = "Compatibility layer for aeson";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-compat_0_3_8" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
      , base-compat, base-orphans, bytestring, containers, exceptions
      , hashable, QuickCheck, quickcheck-instances, scientific, tagged
@@ -21869,7 +21823,6 @@ self: {
        ];
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-decode" = callPackage
@@ -22004,12 +21957,14 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-filthy";
-       version = "0.1.1";
-       sha256 = "1jv3avgbjrpgp7sfamvrlk04gbiczbjbqw6m88i9b6m45gxs7zaq";
+       version = "0.1.2";
+       sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8";
        libraryHaskellDepends = [
          aeson base bytestring text unordered-containers
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         aeson base bytestring doctest text unordered-containers
+       ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23102,6 +23057,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alarmclock_0_5_0_1" = callPackage
+    ({ mkDerivation, async, base, clock, hspec, stm, time
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "alarmclock";
+       version = "0.5.0.1";
+       sha256 = "0l357h9admskcqap4dq5niafpvr1dkf3wvrw166rd2568dp061a6";
+       libraryHaskellDepends = [
+         async base clock stm time unbounded-delays
+       ];
+       testHaskellDepends = [
+         async base clock hspec stm time unbounded-delays
+       ];
+       description = "Wake up and perform an action at a certain time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alea" = callPackage
     ({ mkDerivation, base, optparse-applicative, random, text }:
      mkDerivation {
@@ -23199,8 +23173,8 @@ self: {
     ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.3.1";
-       sha256 = "11b7lw8kzzkpaqr6rdh5rcdh21mj5xz2qd9m04rsryvqlxa2y87g";
+       version = "0.4";
+       sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -27415,18 +27389,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apecs_0_3_0_2" = callPackage
+  "apecs_0_4_0_0" = callPackage
     ({ mkDerivation, async, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.3.0.2";
-       sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i";
+       version = "0.4.0.0";
+       sha256 = "0wpjs90q9nwknbn6shk7bazc0kdhllhvg13432h2hckqbmrfp836";
        libraryHaskellDepends = [
          async base containers mtl template-haskell vector
        ];
-       testHaskellDepends = [ base containers QuickCheck vector ];
+       testHaskellDepends = [
+         base containers criterion linear QuickCheck vector
+       ];
        benchmarkHaskellDepends = [ base criterion linear ];
        description = "A fast ECS for game engine programming";
        license = stdenv.lib.licenses.bsd3;
@@ -29524,23 +29500,6 @@ self: {
      }) {};
 
   "astro" = callPackage
-    ({ mkDerivation, base, HUnit, matrix, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, time
-     }:
-     mkDerivation {
-       pname = "astro";
-       version = "0.4.2.0";
-       sha256 = "1bj7zmgr4i23ig5jwc9w2sc967569325gdjwyrf6xm100hzw5zc6";
-       libraryHaskellDepends = [ base matrix time ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 time
-       ];
-       description = "Amateur astronomical computations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "astro_0_4_2_1" = callPackage
     ({ mkDerivation, base, HUnit, matrix, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, time
      }:
@@ -29555,7 +29514,6 @@ self: {
        ];
        description = "Amateur astronomical computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "astview" = callPackage
@@ -32297,22 +32255,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_4_0" = callPackage
+  "backprop_0_2_5_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, directory
-     , hmatrix, lens, microlens, mwc-random, primitive, reflection
-     , simple-reflect, time, transformers, type-combinators, vector
+     , hmatrix, microlens, microlens-th, mwc-random, primitive
+     , reflection, simple-reflect, time, transformers, vector, vinyl
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.4.0";
-       sha256 = "0l53ixz171nv92wgmrj7zcv458svg3b3zrxn3a8rx5aphb3m9vwc";
+       version = "0.2.5.0";
+       sha256 = "1xbbmv6cp9n21x2bqpr0p4cls994mchxp7hd7k6ib83avr0vwbda";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection
-         simple-reflect transformers type-combinators vector
+         simple-reflect transformers vector vinyl
        ];
        benchmarkHaskellDepends = [
-         base criterion deepseq directory hmatrix lens mwc-random time
-         vector
+         base criterion deepseq directory hmatrix microlens microlens-th
+         mwc-random time vector
        ];
        description = "Heterogeneous automatic differentation";
        license = stdenv.lib.licenses.bsd3;
@@ -32634,8 +32592,8 @@ self: {
      }:
      mkDerivation {
        pname = "barbies";
-       version = "0.1.0.1";
-       sha256 = "1mflfgwcz5krncfx5gx60n1j5x624y55kskmrp3nns4ihlrk6m7a";
+       version = "0.1.2.0";
+       sha256 = "1n8m6qi30fz5xx67v0l7dsirrpd8h0smb7qd8d1q3w83yi606kvl";
        libraryHaskellDepends = [ base bifunctors ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Classes for working with types that can change clothes";
@@ -33137,33 +33095,31 @@ self: {
      }) {};
 
   "baserock-schema" = callPackage
-    ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors
-     , flippers, gitlab-api, hspec, microlens-platform, mtl, QuickCheck
-     , rio, yaml, yaml-pretty-extras
+    ({ mkDerivation, aeson, base, etc, gitlab-api, hashable, hspec
+     , lens-aeson, microlens-platform, QuickCheck, rio
+     , yaml-pretty-extras
      }:
      mkDerivation {
        pname = "baserock-schema";
-       version = "0.0.2.0";
-       sha256 = "02lz48177jrnn7fwk7kjlh38a6kv7f197skf69mx0xgs88xjwrn9";
+       version = "0.0.3.4";
+       sha256 = "19r072s5032wcs4j647naixmk3j7h4ppniar78f6hxlkcz1hsc10";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         algebraic-graphs base errors flippers microlens-platform mtl rio
-         yaml yaml-pretty-extras
+         aeson base microlens-platform rio yaml-pretty-extras
        ];
        executableHaskellDepends = [
-         algebraic-graphs base docopt errors flippers gitlab-api
-         microlens-platform mtl rio yaml yaml-pretty-extras
+         aeson base etc gitlab-api hashable lens-aeson microlens-platform
+         rio yaml-pretty-extras
        ];
        testHaskellDepends = [
-         algebraic-graphs base bytestring errors flippers hspec
-         microlens-platform mtl QuickCheck rio yaml yaml-pretty-extras
+         aeson base hspec microlens-platform QuickCheck rio
+         yaml-pretty-extras
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {gitlab-api = null;};
+     }) {};
 
   "basex-client" = callPackage
     ({ mkDerivation, base, network, pureMD5, utf8-string }:
@@ -37321,27 +37277,6 @@ self: {
      }) {};
 
   "blaze-html" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
-     , containers, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "blaze-html";
-       version = "0.9.0.1";
-       sha256 = "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf";
-       libraryHaskellDepends = [
-         base blaze-builder blaze-markup bytestring text
-       ];
-       testHaskellDepends = [
-         base blaze-builder blaze-markup bytestring containers HUnit
-         QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       description = "A blazingly fast HTML combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-html_0_9_1_1" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
      , containers, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
@@ -37360,7 +37295,6 @@ self: {
        ];
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-contrib" = callPackage
@@ -38321,6 +38255,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "boolector" = callPackage
+    ({ mkDerivation, base, boolector, c2hs, containers, mtl }:
+     mkDerivation {
+       pname = "boolector";
+       version = "0.0.0.1";
+       sha256 = "00ngv3asmn58bli7hb3033yn98zj0680m2skid2021p3kv4km3c4";
+       libraryHaskellDepends = [ base containers mtl ];
+       librarySystemDepends = [ boolector ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base ];
+       testSystemDepends = [ boolector ];
+       description = "Haskell bindings for the Boolector SMT solver";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) boolector;};
+
   "boolexpr" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -39117,8 +39067,8 @@ self: {
        pname = "brittany";
        version = "0.11.0.0";
        sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
-       revision = "1";
-       editedCabalFile = "1v5k1gsy9d1xrw1qw1mdhm00ryalnd3dp531sc44lx8brgxypywf";
+       revision = "2";
+       editedCabalFile = "1f20w6zzbygnpa7f6xbaqxx34l62r53ikywg2snn0zkfizf3lcgx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39479,8 +39429,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffer-builder";
-       version = "0.2.4.5";
-       sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc";
+       version = "0.2.4.6";
+       sha256 = "0r2xn5rc9kg99zcx5x8p15mm6isk0vdr4szc0vyywbj1k96kwf2l";
        libraryHaskellDepends = [
          base bytestring mtl text unordered-containers vector
        ];
@@ -39933,8 +39883,8 @@ self: {
      }:
      mkDerivation {
        pname = "butter";
-       version = "0.1.0.2";
-       sha256 = "13by76xgxkjqfdgsfdsc20r8nfcjwg00wp3yr1jwcjq2acqxm3ak";
+       version = "0.1.0.6";
+       sha256 = "0r215qycck6w6286w0y69ghpzmcp1bl23j44arabrh2p39lb4h46";
        libraryHaskellDepends = [
          aeson base bytestring containers forkable-monad free HUnit
          network-simple stm template-haskell text transformers
@@ -45878,8 +45828,8 @@ self: {
     ({ mkDerivation, base, criterion, QuickCheck, random }:
      mkDerivation {
        pname = "cl3";
-       version = "1.0.0.0";
-       sha256 = "1a15nbx0q260bs5bh10vckvlbzfgjs5f676r3drki77hggkidvjh";
+       version = "1.0.0.1";
+       sha256 = "0wgmzygjwyb6djlmxj9k7ffwp60jf3lai8jki525r4as5rggyypi";
        libraryHaskellDepends = [ base random ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -46916,8 +46866,8 @@ self: {
      }:
      mkDerivation {
        pname = "clifm";
-       version = "0.5.0.0";
-       sha256 = "1j3a3d17y3cxzq5c01j2vylgdc4380vg2bs2s44k9yxjpry1dv28";
+       version = "0.5.2.1";
+       sha256 = "0prbasvk804mzdwjzprj7v1s1wjzlqjih0pdzi1vdskfqjcyy9n2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49685,14 +49635,13 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_1_5_0_0" = callPackage
-    ({ mkDerivation, base, cpphs }:
+  "composition-prelude_1_5_0_5" = callPackage
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.5.0.0";
-       sha256 = "01rbbqnwmm615af1yrg4afk4dvv24y2k52m6c1rz9xkyyg8ii0hq";
+       version = "1.5.0.5";
+       sha256 = "0nap1qfvp7zjw2z0fz1z700wx27wlgihavp2x4h5jz9jc80ssmra";
        libraryHaskellDepends = [ base ];
-       libraryToolDepends = [ cpphs ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50473,6 +50422,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit_1_3_0_3" = 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";
+       version = "1.3.0.3";
+       sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
+       libraryHaskellDepends = [
+         base bytestring directory exceptions filepath mono-traversable mtl
+         primitive resourcet text transformers unix unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory exceptions filepath hspec
+         mono-traversable mtl QuickCheck resourcet safe silently split text
+         transformers unliftio vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       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, criterion
@@ -51670,15 +51648,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_5_11_0" = callPackage
+  "containers_0_6_0_1" = callPackage
     ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
      , ghc-prim, HUnit, QuickCheck, random, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
-       version = "0.5.11.0";
-       sha256 = "0j29w09kvcn1c0yi4clmrdbgs2gqmpxs2m7q80ib2ix1smm25kaq";
+       version = "0.6.0.1";
+       sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -51737,10 +51715,8 @@ self: {
     ({ mkDerivation, containers }:
      mkDerivation {
        pname = "containers-verified";
-       version = "0.5.11.0";
-       sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
-       revision = "3";
-       editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3";
+       version = "0.6.0.1";
+       sha256 = "08cwfn71ffvjfp252l3whic90rqyq1jvrk0m9xp54kh3g2rdqma9";
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
@@ -59928,14 +59904,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_9_1_0" = callPackage
+  "dejafu_1_10_1_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.9.1.0";
-       sha256 = "1bkyy3dsd24gwzng87w85j42wkmycjkqg78nvcragdhvjh1bsv3v";
+       version = "1.10.1.0";
+       sha256 = "17ib90sy40ynlpjagq7f2r2kw040qjgrhwnbncyicaravips3vva";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -60331,8 +60307,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive";
-       version = "2.6.3";
-       sha256 = "06m3m1jsvms1nvgm6b83p28ma61h8ldagl7a3fsjp8hswpr0hgpj";
+       version = "2.6.4";
+       sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60480,8 +60456,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.4.2";
-       sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz";
+       version = "0.4.3";
+       sha256 = "1c3m6x05q5d0vzkjp2x3m8nlfl9qq6qglncsz69cmd637nhjxp10";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell
          th-abstraction transformers transformers-compat
@@ -60725,6 +60701,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dfinity-radix-tree" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter
+     , BoundedChan, bytestring, cmdargs, conduit, containers
+     , cryptohash-sha256, data-default-class, deepseq, ghc-prim
+     , lens-simple, leveldb-haskell, lrucaching, resourcet, semigroups
+     , serialise, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dfinity-radix-tree";
+       version = "0.0.0";
+       sha256 = "1ksxg3qf7g5hnsrcl3bfcdq81v05xk787g4ry4qj3vlkwss5pcnc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base16-bytestring bloomfilter BoundedChan bytestring conduit
+         containers cryptohash-sha256 data-default-class deepseq ghc-prim
+         lens-simple leveldb-haskell lrucaching resourcet semigroups
+         serialise
+       ];
+       executableHaskellDepends = [
+         aeson base base16-bytestring bytestring cmdargs cryptohash-sha256
+         data-default-class resourcet text unordered-containers
+       ];
+       description = "A Merkleized key–value data store";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "dfrac" = callPackage
     ({ mkDerivation, base, scientific }:
      mkDerivation {
@@ -61317,10 +61320,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.4.1";
-       sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl";
-       revision = "2";
-       editedCabalFile = "1q5h4gsin9p6cx0nypjyp6a1rmpr76n4dvw8hscack4gp9a8pjvl";
+       version = "1.4.1.1";
+       sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -61624,8 +61625,8 @@ self: {
        pname = "diagrams-solve";
        version = "0.1.1";
        sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
-       revision = "1";
-       editedCabalFile = "1aabxq020ycmwynm96dvqh9xbvcsw7s4593kca35i4zl2kzg14bb";
+       revision = "2";
+       editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base deepseq tasty tasty-hunit tasty-quickcheck
@@ -61983,6 +61984,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diffmap" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "diffmap";
+       version = "0.1.0.0";
+       sha256 = "0i6dyvp8ds1wz9jm7nva076pc18mz24fiz50gqgq3xv76aghl0i0";
+       libraryHaskellDepends = [ base containers ];
+       description = "diff on maps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "difftodo" = callPackage
     ({ mkDerivation, base, bytestring, diff-parse, highlighter2
      , optparse-applicative, pretty-show, process, protolude, tasty
@@ -63094,30 +63106,6 @@ self: {
      }) {};
 
   "distributed-process" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , data-accessor, deepseq, distributed-static, exceptions, hashable
-     , mtl, network-transport, network-transport-tcp, random
-     , rank1dynamic, stm, syb, template-haskell, time, transformers
-     }:
-     mkDerivation {
-       pname = "distributed-process";
-       version = "0.7.3";
-       sha256 = "1m771siv3dvrc1i3pxl3iqrnz63wvq6i80wyvi5m64m16xgiisg5";
-       revision = "1";
-       editedCabalFile = "0vrk3lrrsc7rrzrkfqcc5q36clr8cy51v6dv4hpmi89fyngx6lz5";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-accessor deepseq
-         distributed-static exceptions hashable mtl network-transport random
-         rank1dynamic stm syb template-haskell time transformers
-       ];
-       benchmarkHaskellDepends = [
-         base binary bytestring network-transport-tcp
-       ];
-       description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributed-process_0_7_4" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, exceptions, hashable
      , mtl, network-transport, network-transport-tcp, random
@@ -63137,7 +63125,6 @@ self: {
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -64194,14 +64181,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "docker-build-cacher_1_9_4" = callPackage
+  "docker-build-cacher_2_0_0" = callPackage
     ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.4";
-       sha256 = "1p62q8hq19zgjwaqgclkjqh6ylpbr5jxw82f36xzqximws1jsmkp";
+       version = "2.0.0";
+       sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66274,8 +66261,8 @@ self: {
      }:
      mkDerivation {
        pname = "eap";
-       version = "0.9.0.1";
-       sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab";
+       version = "0.9.0.2";
+       sha256 = "0bgx7sxpmvhd84j7kkqznazw7p1fl862w7jxlap473g2q5365kqc";
        libraryHaskellDepends = [
          base binary bytestring cryptonite memory mtl pretty-hex
        ];
@@ -67556,14 +67543,14 @@ self: {
      }) {};
 
   "elf" = callPackage
-    ({ mkDerivation, base, binary, bytestring }:
+    ({ mkDerivation, base, binary, bytestring, containers, hspec }:
      mkDerivation {
        pname = "elf";
-       version = "0.28";
-       sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy";
-       enableSeparateDataOutput = true;
+       version = "0.29";
+       sha256 = "1b4g98fk1p8mk0zdh6fwzm3vnzcrhvpysx4g4ahcbgbr4bqhjra2";
        libraryHaskellDepends = [ base binary bytestring ];
-       description = "Parser for ELF object format";
+       testHaskellDepends = [ base bytestring containers hspec ];
+       description = "An Elf parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -68168,8 +68155,8 @@ self: {
      }:
      mkDerivation {
        pname = "emailparse";
-       version = "0.2.0.9";
-       sha256 = "13fg4sly6a3v8xy9prrn9nh3ly14y8k2jghr9b7dmyi7pvmlpss7";
+       version = "0.2.0.10";
+       sha256 = "0w6jkimaiy1ld6aydmq5jz4g248awkj4wnpq6knpn0wfxjsqz0r8";
        libraryHaskellDepends = [
          attoparsec base bytestring either either-unwrap mime MissingH
          strptime text text-icu time word8
@@ -71350,8 +71337,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.7";
-       sha256 = "0pg5hxnxj0zm4s4miw9xjqw2yipd29lqj00svhrsf1pqkb5n98x0";
+       version = "0.1.8";
+       sha256 = "18ys1937sf8lw07mavg4r7f5l6j9sygmx7szp5lxvs12l95x0jfb";
        libraryHaskellDepends = [
          attoparsec base containers free lattices singletons text
          transformers
@@ -71368,8 +71355,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.5";
-       sha256 = "07ah8bb7pv1jzj4aa783s8axh909hnysfy21x9slwgc8nwlx6rcr";
+       version = "0.1.6";
+       sha256 = "0la7acpr9vd67crgj87920wlckyhzvilz9jv86ms1hiwwmvl1c7a";
        libraryHaskellDepends = [
          base containers expressions list-t singletons transformers z3
        ];
@@ -71759,6 +71746,17 @@ self: {
        license = "GPL";
      }) {};
 
+  "facts" = callPackage
+    ({ mkDerivation, base, exceptions, mtl, template-haskell }:
+     mkDerivation {
+       pname = "facts";
+       version = "0.0.1.0";
+       sha256 = "12ifja6vgm8hafs23fzb2jfk0jiz4nss1if5b86950y3mc995rfx";
+       libraryHaskellDepends = [ base exceptions mtl template-haskell ];
+       description = "Refined types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "factual-api" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , curl, dataenc, hoauth, HTTP, MissingH, text, unordered-containers
@@ -72289,6 +72287,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fastly" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, bytestring-lexing, hspec
+     , http-client, http-client-tls, http-types, iproute, mtl
+     , old-locale, text, thyme, unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "fastly";
+       version = "0.1.0.0";
+       sha256 = "0b23dh7cfbjmynqbzc44kz5809dg3zx8i32sdglb1b0nxhabnp7b";
+       libraryHaskellDepends = [
+         aeson base bytestring bytestring-lexing http-client http-client-tls
+         http-types iproute mtl old-locale text thyme unordered-containers
+         wai
+       ];
+       testHaskellDepends = [ base hspec text ];
+       description = "A highly experimental Fastly API client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fastparser" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, containers
      , criterion, kan-extensions, microlens, thyme, transformers
@@ -74140,6 +74157,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "firebase-database" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , generic-random, HsOpenSSL, hspec, http-client, http-client-tls
+     , http-streams, http-types, io-streams, lens, mtl, nano-http
+     , QuickCheck, split, string-conversions, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "firebase-database";
+       version = "0.0.1";
+       sha256 = "1pwf4jb2kajs21dlq7qz90s3xzv05h1mblra1yszq3gkvz8afalh";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring generic-random HsOpenSSL
+         http-client http-client-tls http-streams http-types io-streams lens
+         mtl nano-http split string-conversions text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring generic-random HsOpenSSL hspec
+         http-client http-client-tls http-streams http-types io-streams lens
+         mtl nano-http QuickCheck split string-conversions text
+         unordered-containers
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Google Firebase Database SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {nano-http = null;};
+
   "firefly" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
      , case-insensitive, containers, cookie, http-types, mtl, regex-pcre
@@ -74823,21 +74868,22 @@ self: {
      }) {};
 
   "flat" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, cpu, deepseq
-     , derive, dlist, ghc-prim, mono-traversable, pretty, primitive
-     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, vector
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , dlist, doctest, filemanip, ghc-prim, mono-traversable, pretty
+     , primitive, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "flat";
-       version = "0.3";
-       sha256 = "10kn80qydxmfkbgx0j35f478i781lhn52c76ijsww5iccm889ykw";
+       version = "0.3.2";
+       sha256 = "0489w132m6j47m0jf1svwvql3fmw58iz9l2rqnhn4c5gg91wj53q";
        libraryHaskellDepends = [
-         array base bytestring containers cpu deepseq dlist ghc-prim
-         mono-traversable pretty primitive text transformers vector
+         array base bytestring containers deepseq dlist ghc-prim
+         mono-traversable pretty primitive text vector
        ];
        testHaskellDepends = [
-         base bytestring containers cpu deepseq derive ghc-prim pretty tasty
-         tasty-hunit tasty-quickcheck text
+         base bytestring containers deepseq doctest filemanip ghc-prim
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -76176,8 +76222,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "forkable-monad";
-       version = "0.2.0.2";
-       sha256 = "19a4wagdj2d66w7ka9s480rq3d0i3n5q0zyi2v9sckb6lj3lx175";
+       version = "0.2.0.3";
+       sha256 = "0qnl3bvqiwh6d7lm3w06is5ivh025c7024695m7fzajvzbpk67jp";
        libraryHaskellDepends = [ base transformers ];
        description = "An implementation of forkIO for monad stacks";
        license = stdenv.lib.licenses.bsd3;
@@ -78326,8 +78372,8 @@ self: {
      }:
      mkDerivation {
        pname = "funflow";
-       version = "1.0.0";
-       sha256 = "1lcww83dzhbmml5l4yrypbw18l8x1m3pzblcnmgd90a9874gmq0f";
+       version = "1.0.1";
+       sha256 = "114fi0z54cl93ympb1vir1fc55q8ijbg09ax4v8k05nmb916p2s0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79084,6 +79130,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "gdp" = callPackage
+    ({ mkDerivation, base, lawful }:
+     mkDerivation {
+       pname = "gdp";
+       version = "0.0.0.2";
+       sha256 = "1gqs19wjyng0nacwvi7sjxnhnxjy2az0jwjyy6w2r5g4w9dgykr1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lawful ];
+       executableHaskellDepends = [ base ];
+       description = "Reason about invariants and preconditions with ghosts of departed proofs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gearbox" = callPackage
     ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }:
      mkDerivation {
@@ -80879,8 +80939,8 @@ self: {
      }:
      mkDerivation {
        pname = "geodetics";
-       version = "0.0.5";
-       sha256 = "1fpfdn4bhdqjnrhiqd8yg5j4vs3rwlsr6nav3cjrvrhynlmqlcaq";
+       version = "0.0.6";
+       sha256 = "0hp5p6m6szj1h5hzmrs3pyj4cfvcvkgdc95s5xa0lcxc3z8bn7g2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base dimensional ];
        testHaskellDepends = [
@@ -84404,6 +84464,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gitlab-api" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-conduit, http-types
+     , microlens-platform, rio, yaml
+     }:
+     mkDerivation {
+       pname = "gitlab-api";
+       version = "0.0.0.2";
+       sha256 = "1lfwsqhncj3sp7h6ixmm0yv9vnby9qfi2y4q980d9d473mzvy7rv";
+       libraryHaskellDepends = [
+         aeson base http-conduit http-types microlens-platform rio yaml
+       ];
+       testHaskellDepends = [ base hspec rio ];
+       description = "Gitlab Web API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gitlib" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, conduit
      , conduit-combinators, containers, directory, exceptions, filepath
@@ -84743,6 +84819,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_3_6" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.3.6";
+       sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
      , libglade
@@ -88937,15 +89034,15 @@ self: {
   "greskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
      , greskell-core, hint, hspec, semigroups, text, transformers
-     , unordered-containers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "greskell";
-       version = "0.1.1.0";
-       sha256 = "1mf1fgp1i3pxayhgkc4jmx3fjx3s16vcn9n2jbg750d6nif6yyxi";
+       version = "0.2.0.0";
+       sha256 = "0zj7gcj4a4msgnzafhy7wh5npwfc5rnn4lnmr5h33q7impws1fgz";
        libraryHaskellDepends = [
          aeson base greskell-core semigroups text transformers
-         unordered-containers
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring doctest doctest-discover greskell-core hint
@@ -88957,23 +89054,48 @@ self: {
      }) {};
 
   "greskell-core" = callPackage
-    ({ mkDerivation, aeson, base, doctest, doctest-discover, hspec
-     , QuickCheck, scientific, semigroups, text, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , doctest-discover, hashable, hspec, QuickCheck, scientific
+     , semigroups, text, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "greskell-core";
-       version = "0.1.1.0";
-       sha256 = "0in0ilj337zm00qg0qxcmiai8xvlni5vz4sz0h0dmc3pmg57zmh0";
+       version = "0.1.2.0";
+       sha256 = "1246z4zz5jzwbjikkrld3j667kp26v1b135xd62r3akcplxagzd9";
        libraryHaskellDepends = [
-         aeson base scientific semigroups text unordered-containers
+         aeson base containers hashable scientific semigroups text
+         unordered-containers uuid vector
        ];
        testHaskellDepends = [
-         aeson base doctest doctest-discover hspec QuickCheck text
+         aeson base bytestring doctest doctest-discover hspec QuickCheck
+         text unordered-containers vector
        ];
        description = "Haskell binding for Gremlin graph query language - core data types and tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-websocket" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , greskell-core, hashtables, hspec, safe-exceptions, stm, text
+     , unordered-containers, uuid, vector, websockets
+     }:
+     mkDerivation {
+       pname = "greskell-websocket";
+       version = "0.1.0.0";
+       sha256 = "171pr07dlsvkmj0jqr60dc6a4g8sfqaz0hvwwfagzklg31m961mq";
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring greskell-core
+         hashtables safe-exceptions stm text unordered-containers uuid
+         vector websockets
+       ];
+       testHaskellDepends = [
+         aeson base bytestring greskell-core hspec unordered-containers uuid
+         vector
+       ];
+       description = "Haskell client for Gremlin Server using WebSocket serializer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -89731,8 +89853,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.3.1";
-       sha256 = "1wsq7d47px11c64k38nqxms408yd4il35ai8r53p76qnd04s8saw";
+       version = "0.1.3.2";
+       sha256 = "0rqv0a6d1si4l0rl8c0w2i5hz4g4saafbvm93mhw35dixdvaqdsw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92042,8 +92164,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.7.2";
-       sha256 = "15z8xyx9dd3wb2fdrbhh5kmd32njr586h76x0rdp4kddij7a5x56";
+       version = "1.7.5";
+       sha256 = "0a0m67flsnnbh9ch6pb135avvriy0scpfx39f38d9zwr8lrrs5p3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93452,32 +93574,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.6";
-       sha256 = "0viv359hv3wzdhnfzmq4ynbxyr3a347q7ixarwff85nn9zx7kw2c";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_7" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -93501,7 +93597,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -94587,8 +94682,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.10";
-       sha256 = "1h1cz15x531y0h7ss79jbhziypjwwjl70w5hrpcljdfy1kkcgd2m";
+       version = "0.0.0.11";
+       sha256 = "1x0dm5x4jr1k619s7ad78bb717c8572s8pakailf8g2wsyc340gr";
        libraryHaskellDepends = [
          base containers free hasbolt lens mtl neat-interpolation
          template-haskell text th-lift-instances
@@ -96388,6 +96483,8 @@ self: {
        pname = "haskell-src-exts";
        version = "1.19.1";
        sha256 = "0wd93cqzdk1wq8csha8c8sphksi2jb3gr9g8rk3m9mkkfs3b5xgh";
+       revision = "1";
+       editedCabalFile = "120jvvksnzj3dfgxx1774asalw4wn2i507n3lyhfp95k9z1ny5rh";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -96527,6 +96624,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-meta_0_8_0_3" = callPackage
+    ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
+     , template-haskell, test-framework, test-framework-hunit
+     , th-orphans
+     }:
+     mkDerivation {
+       pname = "haskell-src-meta";
+       version = "0.8.0.3";
+       sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
+       libraryHaskellDepends = [
+         base haskell-src-exts pretty syb template-haskell th-orphans
+       ];
+       testHaskellDepends = [
+         base haskell-src-exts HUnit pretty template-haskell test-framework
+         test-framework-hunit
+       ];
+       description = "Parse source to template-haskell abstract syntax";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-src-meta-mwotton" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts
      , pretty, syb, template-haskell
@@ -98382,25 +98500,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql_1_3_0_1" = callPackage
+  "hasql_1_3_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, data-default-class, dlist, hashable, hashtables
      , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
      , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-builder, transformers, vector
+     , tasty, tasty-hunit, tasty-quickcheck, text, text-builder
+     , transformers, vector
      }:
      mkDerivation {
        pname = "hasql";
-       version = "1.3.0.1";
-       sha256 = "07v79w80k0xrvr4whlcx205a9fpdvlbqdzhq911r7sh3df10kg8f";
+       version = "1.3.0.2";
+       sha256 = "12xq08y54r6fia9nk4cp9gqflmml7b0zd8xhgnx3ylycl8r52h8m";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring bytestring-strict-builder
          contravariant contravariant-extras data-default-class dlist
          hashable hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors semigroups text text-builder
-         transformers vector
+         postgresql-libpq profunctors text text-builder transformers vector
        ];
        testHaskellDepends = [
          bug data-default-class QuickCheck quickcheck-instances rebase
@@ -104507,8 +104624,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.5";
-       sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1";
+       version = "2.1.6";
+       sha256 = "1sxdbb9zqhydx304v2as4y3r1yaqbgy9vcbygsaz3dy6rkifn23v";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104603,8 +104720,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.1.1";
-       sha256 = "1c74v3fq1cw6fq33rmmmm6hb595a8f6iyv934w8kww74g79qli7d";
+       version = "0.1.2.0";
+       sha256 = "1j3ds4kkr1ns7y46b3s29bhi63n31ggvcq4mlyp2xafw2z4nbyl3";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -104753,7 +104870,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hmatrix-backprop_0_1_2_2" = callPackage
+  "hmatrix-backprop_0_1_2_3" = callPackage
     ({ mkDerivation, backprop, base, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
      , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
@@ -104761,8 +104878,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-backprop";
-       version = "0.1.2.2";
-       sha256 = "130lby9nx21mcn85qy86xgmzjm9qyb98b0fhgafkyr2fgfnnqphj";
+       version = "0.1.2.3";
+       sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx";
        libraryHaskellDepends = [
          backprop base ghc-typelits-knownnat ghc-typelits-natnormalise
          hmatrix hmatrix-vector-sized microlens vector vector-sized
@@ -104872,27 +104989,6 @@ self: {
      }) {};
 
   "hmatrix-morpheus" = callPackage
-    ({ mkDerivation, base, blas, criterion, hmatrix, HUnit, liblapack
-     , MonadRandom, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "hmatrix-morpheus";
-       version = "0.1.1.1";
-       sha256 = "1y7ckwgv20j72ji0n30jj0iiibx9i3k053jh2cp17q1lnks836vj";
-       libraryHaskellDepends = [ base hmatrix ];
-       librarySystemDepends = [ blas liblapack ];
-       testHaskellDepends = [
-         base hmatrix HUnit MonadRandom test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [ base criterion hmatrix ];
-       description = "Low-level machine learning auxiliary functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
-
-  "hmatrix-morpheus_0_1_1_2" = callPackage
     ({ mkDerivation, base, blas, criterion, hmatrix, HUnit, liblapack
      , MonadRandom, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -110105,29 +110201,6 @@ self: {
      }) {inherit (pkgs) lua5_3;};
 
   "hslua-aeson" = callPackage
-    ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
-     , ieee754, QuickCheck, quickcheck-instances, scientific, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hslua-aeson";
-       version = "0.3.0.1";
-       sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w";
-       revision = "1";
-       editedCabalFile = "02p97fsn7g6n0l5i9k0mrffqhw2a3y74vi0zaynsl224r4vwqsbp";
-       libraryHaskellDepends = [
-         aeson base hashable hslua scientific text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base hashable hslua hspec HUnit ieee754 QuickCheck
-         quickcheck-instances scientific text unordered-containers vector
-       ];
-       description = "Allow aeson data types to be used with lua";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hslua-aeson_0_3_0_2" = callPackage
     ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
      , ieee754, QuickCheck, quickcheck-instances, scientific, text
      , unordered-containers, vector
@@ -110146,7 +110219,6 @@ self: {
        ];
        description = "Allow aeson data types to be used with lua";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslua-module-text" = callPackage
@@ -112532,8 +112604,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "2.0.0.0";
-       sha256 = "0szpk1zszpvd0hs4jljjnlrr60159b33rqxhb1bgbbap2nxzxsgs";
+       version = "2.0.0.1";
+       sha256 = "0ahwlsqh98lv6hpf9lwsf1i99w0vdw1bsgy947s9gadrg8nbx849";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -112715,35 +112787,6 @@ self: {
      }) {};
 
   "http-client" = 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.12.1";
-       sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab";
-       revision = "1";
-       editedCabalFile = "03x2ms2nl3jjm2sfk8dwy02v920czhmdlkyfy3kqc1sg4nw2134y";
-       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;
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_13" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, deepseq, directory
      , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -112768,7 +112811,6 @@ self: {
        doCheck = false;
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -114021,12 +114063,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_2_0_4" = callPackage
+  "hunit-dejafu_1_2_0_5" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.2.0.4";
-       sha256 = "017hdbimpi2wpwdyis3gmwrzxszafws6jxwi4jwm44psnqpl9hry";
+       version = "1.2.0.5";
+       sha256 = "17k7sg2ifvmikzjlzhawc65afq32lva5p79szva6xplghh689xv6";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
@@ -114466,8 +114508,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-dsv";
-       version = "0.2";
-       sha256 = "1jkkhkk7rpskxnbiaz7a520nf19f3hl8vxi5gl5k6nvjw6z0zy1q";
+       version = "0.2.1";
+       sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118506,7 +118548,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "influxdb_1_6_0_3" = callPackage
+  "influxdb_1_6_0_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
@@ -118516,8 +118558,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.6.0.3";
-       sha256 = "06ywpr2wpc8kx4kjkmpq6lapbpqwq3c0sxla21v58psj033ihzl9";
+       version = "1.6.0.4";
+       sha256 = "191w8f52r5qgmrsj131sx5kjqzfcrh3z4wbh2kdv9hyfp717hz2r";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -120792,18 +120834,6 @@ self: {
      }) {};
 
   "iso8601-time" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, time }:
-     mkDerivation {
-       pname = "iso8601-time";
-       version = "0.1.4";
-       sha256 = "09h1jfdj9fv1nsryhka2mgl8nig9840f5kv06vyyh7l4l1z767bn";
-       libraryHaskellDepends = [ base time ];
-       testHaskellDepends = [ base hspec HUnit time ];
-       description = "Convert to/from the ISO 8601 time format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "iso8601-time_0_1_5" = callPackage
     ({ mkDerivation, base, hspec, HUnit, time }:
      mkDerivation {
        pname = "iso8601-time";
@@ -120813,7 +120843,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit time ];
        description = "Convert to/from the ISO 8601 time format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isobmff-builder" = callPackage
@@ -123128,8 +123157,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an";
-       revision = "15";
-       editedCabalFile = "07a5qvmg6bz54k5f608d8lvaay97s6df503rq047sjwa6dipcm0x";
+       revision = "16";
+       editedCabalFile = "0mn7aj3rr4vpg99kcpvgq1qvdl28dx9yld2b9pb79wdva9x69c2h";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -123735,22 +123764,32 @@ self: {
      }) {};
 
   "jvm-binary" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , directory, filepath, tasty, tasty-discover, tasty-hspec
-     , tasty-quickcheck, text, vector
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , criterion, data-binary-ieee754, deepseq, deriving-compat
+     , directory, filepath, generic-random
+     , hspec-expectations-pretty-diff, mtl, QuickCheck, tasty
+     , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell
+     , text, vector
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.0.2";
-       sha256 = "1hdqhp84il50c6wimdvxwdd95gw580hskhmrnn2snqcwj7n1ywfh";
+       version = "0.1.0";
+       sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881";
        libraryHaskellDepends = [
-         base binary bytestring containers text vector
+         attoparsec base binary bytestring containers data-binary-ieee754
+         deepseq deriving-compat mtl template-haskell text vector
        ];
        testHaskellDepends = [
-         base binary bytestring containers directory filepath tasty
-         tasty-discover tasty-hspec tasty-quickcheck text
+         attoparsec base binary bytestring containers data-binary-ieee754
+         deepseq deriving-compat directory filepath generic-random
+         hspec-expectations-pretty-diff mtl QuickCheck tasty tasty-discover
+         tasty-hspec tasty-quickcheck template-haskell text vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base binary bytestring containers criterion
+         data-binary-ieee754 deepseq deriving-compat mtl template-haskell
+         text vector
        ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127066,15 +127105,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_6_0_1" = callPackage
+  "language-docker_6_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
      , QuickCheck, split, template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "6.0.1";
-       sha256 = "01dfs90300h03mlwn05a7k2gsffyxxkjypyykbnc9ky2cx6vwfax";
+       version = "6.0.2";
+       sha256 = "0690i0cd1208g72ckqhiw7grs9m4wx1kp4w516c7x0ibrv9ri8ap";
        libraryHaskellDepends = [
          base bytestring containers free megaparsec mtl prettyprinter split
          template-haskell text th-lift time
@@ -127429,17 +127468,17 @@ self: {
      }) {};
 
   "language-lua" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
-     , directory, filepath, happy, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text
+    ({ mkDerivation, alex, alex-tools, array, base, bytestring
+     , criterion, deepseq, directory, filepath, happy, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "language-lua";
-       version = "0.10.0";
-       sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c";
-       revision = "2";
-       editedCabalFile = "08c0ivrp357lpxhxqq78z8wqnhwdd3gycsn6yhmf8xnk8bv6yz7h";
-       libraryHaskellDepends = [ array base bytestring deepseq text ];
+       version = "0.11.0";
+       sha256 = "1b65bfjdx7287d65s2ki05yfps8k0w6jfq4avna4z37cqssa0z59";
+       libraryHaskellDepends = [
+         alex-tools array base bytestring deepseq text
+       ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
          base bytestring deepseq directory filepath QuickCheck tasty
@@ -127665,8 +127704,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.17";
-       sha256 = "0n71grhaw59z3vqkys499kx06q10fn6l5r4sfim17vyxdy0bz8xq";
+       version = "1.3.18";
+       sha256 = "1cdzs5m6xwrsnchbj66ij844wd869by0jjih8jwap2rmnx9ckxbi";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -127688,8 +127727,8 @@ self: {
        ];
        testHaskellDepends = [
          base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
-         protolude scientific strict-base-types temporary text transformers
-         unordered-containers vector
+         pcre-utils protolude scientific strict-base-types temporary text
+         transformers unordered-containers vector
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -131190,8 +131229,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, safe }:
      mkDerivation {
        pname = "lines-of-action";
-       version = "0.0.0";
-       sha256 = "0m047q5x6lqgmw3kfai24jk8x44vib4xmflz7n2xq7b791k1fkrg";
+       version = "0.0.1";
+       sha256 = "1sikhdahhxqi9i285zphbpnz60vyxjdhvz2qd70hmy7x3ckymb42";
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
        license = stdenv.lib.licenses.mit;
@@ -131454,6 +131493,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linux-namespaces_0_1_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, unix }:
+     mkDerivation {
+       pname = "linux-namespaces";
+       version = "0.1.3.0";
+       sha256 = "1rvkzfmd07sz46k059ly80cjgwx67igfw8zsw8c6ljsp3hsdn4hl";
+       libraryHaskellDepends = [ base bytestring unix ];
+       description = "Work with linux namespaces: create new or enter existing ones";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linux-perf" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, ghc-events, mtl, pretty, process, unix
@@ -136570,6 +136621,24 @@ self: {
      }) {};
 
   "markup" = 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
+     }:
+     mkDerivation {
+       pname = "markup";
+       version = "4.0.4";
+       sha256 = "1brk619d2abryvwyw9pj7g4axs1rc6p51cf4yf5q1p6f0zvi2dyb";
+       libraryHaskellDepends = [
+         attoparsec-uri 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_2_0" = callPackage
     ({ mkDerivation, attoparsec-uri, base, blaze-html, blaze-markup
      , clay, comonad, lucid, mmorph, monad-control, monad-logger, mtl
      , path, path-extra, resourcet, text, transformers-base, urlpath
@@ -136585,6 +136654,7 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -137484,25 +137554,25 @@ self: {
      }) {};
 
   "mbug" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, http-client
-     , http-client-tls, optparse-applicative, process, scalpel-core
-     , tagsoup, text, th-printf, time, xdg-basedir
+    ({ mkDerivation, base, bytestring, directory, extra, formatting
+     , http-client, http-client-tls, optparse-applicative, process
+     , scalpel-core, tagsoup, text, time, xdg-basedir
      }:
      mkDerivation {
        pname = "mbug";
-       version = "1.1";
-       sha256 = "1chz9za1zbdw1awm252img4krmya1zq3jb4alrsplf2ijb2c80ls";
+       version = "1.2";
+       sha256 = "0rzfayssvifwb7p8m00lv8s1m5paa86nc6ndwi6ih34lhi30qcr8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory extra http-client http-client-tls
-         optparse-applicative process scalpel-core tagsoup text th-printf
-         time xdg-basedir
+         base bytestring directory extra formatting http-client
+         http-client-tls optparse-applicative process scalpel-core tagsoup
+         text time xdg-basedir
        ];
        executableHaskellDepends = [
-         base bytestring directory extra http-client http-client-tls
-         optparse-applicative process scalpel-core tagsoup text th-printf
-         time xdg-basedir
+         base bytestring directory extra formatting http-client
+         http-client-tls optparse-applicative process scalpel-core tagsoup
+         text time xdg-basedir
        ];
        description = "download bugs mailboxes";
        license = stdenv.lib.licenses.gpl3;
@@ -138439,6 +138509,29 @@ self: {
        license = "GPL";
      }) {};
 
+  "menoh" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , JuicyPixels, menoh, monad-control, optparse-applicative
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "menoh";
+       version = "0.1.1";
+       sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers monad-control transformers vector
+       ];
+       libraryPkgconfigDepends = [ menoh ];
+       executableHaskellDepends = [
+         base filepath JuicyPixels optparse-applicative vector
+       ];
+       description = "Haskell binding for Menoh DNN inference library";
+       license = stdenv.lib.licenses.mit;
+     }) {menoh = null;};
+
   "mercury-api" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory
      , hashable, HUnit, optparse-applicative, text, unordered-containers
@@ -139367,10 +139460,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi-util";
-       version = "0.2";
-       sha256 = "1vnpc4ja72a1p6b44ypx0pirg2wnin9jfnfmcq715f599dyxaapr";
-       revision = "2";
-       editedCabalFile = "0nl8vrrffm8780pj8kadchq2sdyglvnl91bn1yrflh4pqlm2jzq8";
+       version = "0.2.0.1";
+       sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc";
        libraryHaskellDepends = [
          base containers event-list midi non-negative
        ];
@@ -143996,6 +144087,67 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multipool" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, monad-logger, mtl
+     , persistent, resource-pool, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool";
+       version = "0.1.0.1";
+       sha256 = "1mcdsn4ja9w8bnxrz4dglwbzq6bxg5xq2iik8da49n8l8ah2xq78";
+       libraryHaskellDepends = [
+         base bytestring hashable monad-logger mtl persistent resource-pool
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring hashable monad-logger mtl persistent resource-pool
+         text unordered-containers
+       ];
+       description = "Generalized system for reading and writing to distributed systems that have primary/replica topologies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "multipool-persistent" = callPackage
+    ({ mkDerivation, base, mtl, multipool, persistent, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool-persistent";
+       version = "0.1.0.1";
+       sha256 = "0nw56wpgwvzk8ib3av42zkpj5xviw3m3qlig791rl4074yj60wn2";
+       libraryHaskellDepends = [
+         base mtl multipool persistent unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         base mtl multipool persistent unliftio-core unordered-containers
+       ];
+       description = "Read and write from appropriate persistent sql instances in replicated environments";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "multipool-persistent-postgresql" = callPackage
+    ({ mkDerivation, base, monad-logger, mtl, multipool
+     , multipool-persistent, persistent, persistent-postgresql
+     , postgresql-common-persistent, unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "multipool-persistent-postgresql";
+       version = "0.1.0.1";
+       sha256 = "11y8hr9f5f7ni7nxz1h6bi7jn3pj09ngjrqgliwihx60ind2dk6q";
+       libraryHaskellDepends = [
+         base monad-logger mtl multipool multipool-persistent persistent
+         persistent-postgresql postgresql-common-persistent unliftio-core
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base monad-logger mtl multipool multipool-persistent persistent
+         persistent-postgresql postgresql-common-persistent unliftio-core
+         unordered-containers
+       ];
+       description = "Read and write appropriately from both master and replicated postgresql instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multirec" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -146106,6 +146258,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "neat-interpolation_0_3_2_2" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, megaparsec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "neat-interpolation";
+       version = "0.3.2.2";
+       sha256 = "0ffcr6q9bmvlmz5j8s0q08pbqzcfz9pkh8gz52arzscflpncbj5n";
+       libraryHaskellDepends = [
+         base base-prelude megaparsec template-haskell text
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
+       description = "A quasiquoter for neat and simple multiline text interpolation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "needle" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
      , parsec-extra, template-haskell, text, vector
@@ -146708,8 +146877,32 @@ self: {
      }:
      mkDerivation {
        pname = "nettle";
-       version = "0.2.0";
-       sha256 = "1plv9r86ljgjvvb8ny8zayrcdrmy7cd8jfvq4vp56b407dqq8092";
+       version = "0.2.1";
+       sha256 = "0d7phckzar2mzazw15g6ca60izmrdyxjv114ag305lbh6ly76wah";
+       libraryHaskellDepends = [
+         base byteable bytestring crypto-cipher-types securemem tagged
+       ];
+       libraryPkgconfigDepends = [ nettle ];
+       testHaskellDepends = [
+         array base bytestring crypto-cipher-tests crypto-cipher-types HUnit
+         QuickCheck tagged test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       description = "safe nettle binding";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) nettle;};
+
+  "nettle_0_3_0" = callPackage
+    ({ mkDerivation, array, base, byteable, bytestring
+     , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
+     , QuickCheck, securemem, tagged, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "nettle";
+       version = "0.3.0";
+       sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
@@ -148866,6 +149059,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "non-empty-containers" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "non-empty-containers";
+       version = "0.1.0.0";
+       sha256 = "021rfs019kb3h9zz2ycdg7ia65b1hr2rlxzihcdkqywklvxvykxw";
+       libraryHaskellDepends = [ base containers ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "non-empty-sequence" = callPackage
     ({ mkDerivation, base, containers, semigroups }:
      mkDerivation {
@@ -148953,6 +149156,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nonemptymap" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "nonemptymap";
+       version = "0.0.2.0";
+       sha256 = "0h08xki7z69xrni2r6l7b5wyg6sfdm0hfq2l35q50yac83srfs0v";
+       libraryHaskellDepends = [ base containers ];
+       description = "A NonEmptyMap Implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nonfree" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -149713,12 +149927,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask_0_2_2_0" = callPackage
+  "numhask_0_2_3_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
-       version = "0.2.2.0";
-       sha256 = "0i0acm03qirj6xnpyv87v4vss7bmcnzkv8j7rymvshp92nrxihgd";
+       version = "0.2.3.0";
+       sha256 = "1d4sc2gwra18zw9f063d28alf69nf0ikzsfxgc10z1zgy5bfyxny";
        libraryHaskellDepends = [ base ];
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
@@ -149748,33 +149962,29 @@ self: {
 
   "numhask-histogram" = callPackage
     ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude
-     , numhask-range, protolude, tasty, tdigest
+     , numhask-range, tdigest
      }:
      mkDerivation {
        pname = "numhask-histogram";
-       version = "0.1.2.1";
-       sha256 = "0pjl4xqfi9kr56sr83ais1mx9k3rz739axr9wrj0n1xzdp4q9yr9";
+       version = "0.1.3.0";
+       sha256 = "1d4b1iv6czhc9747p5df3qlbj34nzlz608qp975cg31i63inz2ix";
        libraryHaskellDepends = [
          base containers foldl numhask-prelude numhask-range tdigest
        ];
-       testHaskellDepends = [ base doctest protolude tasty ];
+       testHaskellDepends = [ base doctest numhask-prelude ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-prelude" = callPackage
-    ({ mkDerivation, base, doctest, numhask, protolude, QuickCheck
-     , tasty, tasty-quickcheck
-     }:
+    ({ mkDerivation, base, doctest, numhask, protolude }:
      mkDerivation {
        pname = "numhask-prelude";
-       version = "0.0.5.1";
-       sha256 = "0bpisfh0ngxbxpb080fpd02bjvl451n0rqdr1c3zxyljv6xnkbvj";
-       libraryHaskellDepends = [
-         base numhask protolude QuickCheck tasty tasty-quickcheck
-       ];
-       testHaskellDepends = [ base doctest QuickCheck tasty ];
+       version = "0.1.0.1";
+       sha256 = "0px2ijdzll1912h652dvncvjhapwrg2z1dni87w2afzk477mpwdi";
+       libraryHaskellDepends = [ base numhask protolude ];
+       testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149798,24 +150008,43 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_2_2_1" = callPackage
+  "numhask-range_0_2_3_1" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
-     , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty
+     , numhask-prelude, numhask-test, protolude, QuickCheck
+     , semigroupoids, tasty
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.2.2.1";
-       sha256 = "1bay0jsarz7d2kbgi3zvdl2dip9arv9qdlk41szgvsbgqbadxjxf";
+       version = "0.2.3.1";
+       sha256 = "1zfw49cgjwbx6v6ljqbl46d1nkiah0p79pjargjsfpfks9ra2qkc";
        libraryHaskellDepends = [
          adjunctions base distributive numhask-prelude protolude QuickCheck
          semigroupoids
        ];
-       testHaskellDepends = [ base doctest numhask-prelude tasty ];
+       testHaskellDepends = [
+         base doctest numhask-prelude numhask-test tasty
+       ];
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "numhask-test" = callPackage
+    ({ mkDerivation, base, numhask-prelude, QuickCheck, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "numhask-test";
+       version = "0.1.0.0";
+       sha256 = "1czcgnqxxm835q9m2iw3xyd8qwjpgdpjs1n9zzpd5sk6rklcjx6y";
+       libraryHaskellDepends = [
+         base numhask-prelude QuickCheck tasty tasty-quickcheck
+       ];
+       testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
+       description = "Laws and tests for numhask";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nums" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -150067,6 +150296,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "o-clock_1_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
+     , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
+     , tiempo, time-units, type-spec
+     }:
+     mkDerivation {
+       pname = "o-clock";
+       version = "1.0.0";
+       sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc-prim ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
+         tasty-hspec type-spec
+       ];
+       benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
+       description = "Type-safe time library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "oanda-rest-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens
@@ -150502,24 +150754,23 @@ self: {
      }) {};
 
   "odpic-raw" = callPackage
-    ({ mkDerivation, base, c2hs, conduit, hspec, monad-control
-     , monad-logger, odpic, QuickCheck, resourcet, text, time
-     , unliftio-core
+    ({ mkDerivation, base, bytestring, c2hs, conduit, Decimal, hspec
+     , odpic, resourcet, time
      }:
      mkDerivation {
        pname = "odpic-raw";
-       version = "0.2.1";
-       sha256 = "0py56g2d05b11yw7wi5lmaglixzk63kwlpnnwk3v1vy8daky73w6";
+       version = "0.3.0";
+       sha256 = "0s4n82kddl4xwjaj98xmgisip68l2ib6ca7z4nqfy8lzchvmls6j";
        libraryHaskellDepends = [
-         base conduit monad-control resourcet text time unliftio-core
+         base bytestring conduit Decimal resourcet time
        ];
        librarySystemDepends = [ odpic ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
-         base conduit hspec monad-logger QuickCheck resourcet text
+         base bytestring conduit Decimal hspec resourcet time
        ];
        description = "Oracle Database Bindings";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) odpic;};
 
@@ -152245,8 +152496,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-applicative-simple";
-       version = "1.0.2";
-       sha256 = "0kn740shja07mpaj9hy5blw1bcgy6ncpfyz3rqy3cglh2fzswsk2";
+       version = "1.0.3";
+       sha256 = "07v47fa2yc3rxdn1lbgbsq8ggfd7zlknz2ib8wf628g95n0dl7ya";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base-prelude optparse-applicative text
        ];
@@ -153608,10 +153859,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.2.0";
-       sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia";
-       revision = "1";
-       editedCabalFile = "1x19k4jb8ld8kp4fkcmxj5maw3w3dqv5axh5ay6m6qr5kl77ijgp";
+       version = "0.3.2.1";
+       sha256 = "0rxinqgfri1zlq1di4dx949migm3j76lvb10hvmpa4rxz0fkq0l6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -154009,8 +154258,8 @@ self: {
     ({ mkDerivation, base, gitrev, template-haskell }:
      mkDerivation {
        pname = "panic";
-       version = "0.4.0.0";
-       sha256 = "12m18s4d8xvwwf4vhv4p544h03abgkjx7bfwl22gxr1y8f7gb8wl";
+       version = "0.4.0.1";
+       sha256 = "0hidfg8yzp5vzq8y422c442b45jkr8a9s38s8n78wyi5811fpp0m";
        libraryHaskellDepends = [ base gitrev template-haskell ];
        description = "A convenient way to panic";
        license = stdenv.lib.licenses.isc;
@@ -155214,6 +155463,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsix" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fingertree, mtl
+     , parsers, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "parsix";
+       version = "0.1.0.1";
+       sha256 = "0qpn5vjgp0392nb6nirp92s2g5jxr4jcpg35j0w1mg5ym5ra4mm1";
+       libraryHaskellDepends = [
+         base bytestring containers fingertree mtl parsers prettyprinter
+         prettyprinter-ansi-terminal text transformers
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Parser combinators with slicing, error recovery, and syntax highlighting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "partage" = callPackage
     ({ mkDerivation, base, containers, data-lens-light, data-partition
      , dawg-ord, HUnit, mmorph, mtl, pipes, PSQueue, random, tasty
@@ -158584,27 +158853,6 @@ self: {
      }) {};
 
   "pinch" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinch";
-       version = "0.3.2.0";
-       sha256 = "0r0pxdhzlmfg8h13fi10bvy1wxvsk1ckzzlcxbpg6zrly9n0z4m1";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq ghc-prim hashable text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck text
-         unordered-containers vector
-       ];
-       description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinch_0_3_3_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups
      , text, unordered-containers, vector
@@ -158623,7 +158871,6 @@ self: {
        ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinchot" = callPackage
@@ -159665,6 +159912,8 @@ self: {
        pname = "pipes-safe";
        version = "2.2.9";
        sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
+       revision = "1";
+       editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d";
        libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes primitive
          transformers transformers-base
@@ -161964,6 +162213,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-common" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }:
+     mkDerivation {
+       pname = "postgresql-common";
+       version = "0.1.0.1";
+       sha256 = "16b90sxn9f9rxrdr2l5gqcs6307djqaqzr31lnb4qa95dz72fl7n";
+       libraryHaskellDepends = [
+         attoparsec base bytestring postgresql-simple
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring postgresql-simple
+       ];
+       description = "Library for sharing common PostgreSQL types across Haskell PostgreSQL libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "postgresql-common-persistent" = callPackage
+    ({ mkDerivation, base, bytestring, persistent, postgresql-common
+     , text
+     }:
+     mkDerivation {
+       pname = "postgresql-common-persistent";
+       version = "0.1.0.0";
+       sha256 = "1kjmrnigc00362f1b55gw6k67i13rqpjaklz8v9z5jd78ac3xnq6";
+       libraryHaskellDepends = [
+         base bytestring persistent postgresql-common text
+       ];
+       testHaskellDepends = [
+         base bytestring persistent postgresql-common text
+       ];
+       description = "Persistent compatibility for postgresql-common";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -162548,8 +162831,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2";
-       sha256 = "17w7i1glzn2kvq61f1f9xcfz7z7hmwzjl08xh32hp6nir21ycmq5";
+       version = "2.0.1";
+       sha256 = "1asn43c0n0f4f694y3q3hkjmf4rhdh4gsax25syyb57bicp0mw8h";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -162573,24 +162856,24 @@ self: {
      }) {};
 
   "potoki-core" = callPackage
-    ({ mkDerivation, acquire, attoparsec, base, base-prelude
-     , bytestring, directory, foldl, hashable, profunctors, ptr
-     , QuickCheck, quickcheck-instances, random, rerebase, stm, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan
+    ({ mkDerivation, acquire, attoparsec, base, bytestring, directory
+     , foldl, hashable, ilist, profunctors, ptr, QuickCheck
+     , quickcheck-instances, random, rerebase, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unagi-chan
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2";
-       sha256 = "13zgqw4csypx5m97xfpbxxxic7rxms0xrz6wz5kk5x2pn6i9mgjl";
+       version = "2.1";
+       sha256 = "04i94rk7skcvaqyapl88iw1npz84jhd1gr17darjvwxyvdvrm1h0";
        libraryHaskellDepends = [
-         acquire attoparsec base base-prelude bytestring directory foldl
-         hashable profunctors ptr stm text transformers unagi-chan
+         acquire attoparsec base bytestring directory foldl hashable
+         profunctors ptr stm text transformers unagi-chan
          unordered-containers vector
        ];
        testHaskellDepends = [
-         attoparsec QuickCheck quickcheck-instances random rerebase tasty
-         tasty-hunit tasty-quickcheck
+         acquire attoparsec foldl ilist QuickCheck quickcheck-instances
+         random rerebase tasty tasty-hunit tasty-quickcheck
        ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
@@ -162598,21 +162881,34 @@ self: {
      }) {};
 
   "potoki-hasql" = callPackage
-    ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core
+    ({ mkDerivation, acquire, base, bytestring, hasql, potoki-core
      , profunctors, text, vector
      }:
      mkDerivation {
        pname = "potoki-hasql";
-       version = "1.5";
-       sha256 = "1pxl1fcw1khp4gbhpranv685ri67995d76nisx7ba7l2vg438mn8";
+       version = "1.6";
+       sha256 = "1na6nc9cbimhwzwppz48ssffhdx0j223pmkk8wkjkj9xpzpnx2w1";
        libraryHaskellDepends = [
-         base bytestring hasql potoki potoki-core profunctors text vector
+         acquire base bytestring hasql potoki-core profunctors text vector
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "potoki-zlib" = callPackage
+    ({ mkDerivation, acquire, base, bytestring, potoki-core, zlib }:
+     mkDerivation {
+       pname = "potoki-zlib";
+       version = "0.3";
+       sha256 = "0baayjaw3x5hfx6xdhiq3j8j012x6nrlql8fc6r51xpk3blwg588";
+       libraryHaskellDepends = [
+         acquire base bytestring potoki-core zlib
+       ];
+       description = "Streaming ZLib decompression";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "potrace" = callPackage
     ({ mkDerivation, base, bindings-potrace, bytestring, containers
      , data-default, JuicyPixels, vector
@@ -163656,30 +163952,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.2.0.1";
-       sha256 = "0rh5bb6inq4yvv6r53sc1q3msmpvjcq8fw4sn3vwivrq44c7nf8i";
-       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
-       ];
-       description = "A modern, easy to use, well-documented, extensible prettyprinter";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "prettyprinter_1_2_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
      , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers
@@ -163701,7 +163973,6 @@ self: {
        ];
        description = "A modern, easy to use, well-documented, extensible pretty-printer";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
@@ -166733,6 +167004,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pusher-http-haskell_1_5_1_5" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, hashable, hspec, http-client, http-types, memory
+     , QuickCheck, scientific, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "1.5.1.5";
+       sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hashable
+         http-client http-types memory text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite hspec
+         http-client http-types QuickCheck scientific text time transformers
+         unordered-containers vector
+       ];
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-ws" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -167836,17 +168132,6 @@ self: {
      }) {};
 
   "quickcheck-combinators" = callPackage
-    ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
-     mkDerivation {
-       pname = "quickcheck-combinators";
-       version = "0.0.2";
-       sha256 = "0r8vf4dgczga2c0lkz4z6a22naxw44yfdj1wvfqncv9x18r7pkbz";
-       libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
-       description = "Simple type-level combinators for augmenting QuickCheck instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-combinators_0_0_4" = callPackage
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
        pname = "quickcheck-combinators";
@@ -167855,7 +168140,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        description = "Simple type-level combinators for augmenting QuickCheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-instances" = callPackage
@@ -168653,8 +168937,8 @@ self: {
      }:
      mkDerivation {
        pname = "radius";
-       version = "0.5.0.1";
-       sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh";
+       version = "0.5.0.2";
+       sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc";
        libraryHaskellDepends = [
          base binary bytestring cryptonite iproute memory
        ];
@@ -172279,6 +172563,8 @@ self: {
        pname = "regex-tdfa";
        version = "1.2.3";
        sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9";
+       revision = "1";
+       editedCabalFile = "05ygcwwi8zjd40r05kavbmlx6nw6gyb2yicaarwd45sxs1zk73rz";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -172853,27 +173139,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC" = callPackage
-    ({ mkDerivation, base, containers, convertible, dlist, HDBC
-     , HDBC-session, names-th, persistable-record, product-isomorphic
-     , relational-query, relational-schemas, sql-words, template-haskell
-     , th-data-compat, transformers
+  "relational-query_0_11_3_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-reify-compat, time, time-locale-compat, transformers
      }:
      mkDerivation {
-       pname = "relational-query-HDBC";
-       version = "0.6.7.0";
-       sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c";
+       pname = "relational-query";
+       version = "0.11.3.0";
+       sha256 = "1g7jvhp5vv17hbddc2p6j39gfg638y2b0jjky9jxrcjkww1ii16p";
        libraryHaskellDepends = [
-         base containers convertible dlist HDBC HDBC-session names-th
-         persistable-record product-isomorphic relational-query
-         relational-schemas sql-words template-haskell th-data-compat
-         transformers
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text th-reify-compat
+         time time-locale-compat transformers
        ];
-       description = "HDBC instance of relational-query and typed query interface for HDBC";
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "relational-query-HDBC_0_6_7_1" = callPackage
+  "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
      , QuickCheck, quickcheck-simple, relational-query
@@ -172895,6 +173184,30 @@ self: {
        ];
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "relational-query-HDBC_0_6_8_0" = callPackage
+    ({ mkDerivation, base, containers, convertible, dlist, HDBC
+     , HDBC-session, names-th, persistable-record, product-isomorphic
+     , QuickCheck, quickcheck-simple, relational-query
+     , relational-schemas, sql-words, template-haskell, th-data-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query-HDBC";
+       version = "0.6.8.0";
+       sha256 = "1piriqd6rngbdlf9bx9zabbmpn255iqs29z6f8pkxr5qn3q33dzz";
+       libraryHaskellDepends = [
+         base containers convertible dlist HDBC HDBC-session names-th
+         persistable-record product-isomorphic relational-query
+         relational-schemas sql-words template-haskell th-data-compat
+         transformers
+       ];
+       testHaskellDepends = [
+         base convertible HDBC QuickCheck quickcheck-simple
+       ];
+       description = "HDBC instance of relational-query and typed query interface for HDBC";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -172915,6 +173228,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-record_0_2_2_0" = callPackage
+    ({ mkDerivation, base, persistable-record
+     , persistable-types-HDBC-pg, product-isomorphic, relational-query
+     , relational-query-HDBC
+     }:
+     mkDerivation {
+       pname = "relational-record";
+       version = "0.2.2.0";
+       sha256 = "1nmkjq5jrs38d0mmdpy8ygkjncg3j5yjbkcv7mxrm8wlqdijdg8b";
+       libraryHaskellDepends = [
+         base persistable-record persistable-types-HDBC-pg
+         product-isomorphic relational-query relational-query-HDBC
+       ];
+       description = "Meta package of Relational Record";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
@@ -172922,8 +173253,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record-examples";
-       version = "0.5.0.0";
-       sha256 = "0p49sb8ssvhbhmq4wicj7b46q53vibw686rr3xfy6iz82j64mklb";
+       version = "0.5.1.0";
+       sha256 = "0xsd1syrs1fsxkkbc7zb0dwl9wqjyf31n44h4b3la93pcjv4dl7q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173925,26 +174256,30 @@ self: {
      }) {};
 
   "require" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty
-     , tasty-hspec, text, universum
+    ({ mkDerivation, base, bytestring, criterion, directory, inliterate
+     , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum
      }:
      mkDerivation {
        pname = "require";
-       version = "0.2.1";
-       sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2";
+       version = "0.3.2";
+       sha256 = "0f84rq90srzx1zhcygmwk4zfcdgmgxg634nh7kp79fgam0vy7b7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring megaparsec text universum
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
        ];
        executableHaskellDepends = [
-         base bytestring megaparsec text universum
+         base bytestring directory inliterate megaparsec optparse-generic
+         text universum
        ];
        testHaskellDepends = [
-         base bytestring megaparsec tasty tasty-hspec text universum
+         base bytestring directory inliterate megaparsec optparse-generic
+         tasty tasty-hspec text universum
        ];
        benchmarkHaskellDepends = [
-         base bytestring criterion megaparsec text universum
+         base bytestring criterion directory inliterate megaparsec
+         optparse-generic text universum
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
@@ -175043,6 +175378,39 @@ self: {
        license = "unknown";
      }) {};
 
+  "riak_1_1_2_5" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary
+     , blaze-builder, bytestring, containers, criterion
+     , data-default-class, deepseq, enclosed-exceptions, exceptions
+     , hashable, HUnit, mersenne-random-pure64, monad-control, mtl
+     , network, process, protocol-buffers, pureMD5, QuickCheck, random
+     , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "riak";
+       version = "1.1.2.5";
+       sha256 = "1ln7qm6rl8nr4fc1109pk0jmnqhw4dm3q2jfmvd4a34whplzwln7";
+       libraryHaskellDepends = [
+         aeson async attoparsec base bifunctors binary blaze-builder
+         bytestring containers data-default-class deepseq
+         enclosed-exceptions exceptions hashable mersenne-random-pure64
+         monad-control network protocol-buffers pureMD5 random resource-pool
+         riak-protobuf semigroups stm text time transformers
+         transformers-base unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers data-default-class HUnit mtl
+         process QuickCheck riak-protobuf semigroups tasty tasty-hunit
+         tasty-quickcheck template-haskell text yaml
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
+       description = "A Haskell client for the Riak decentralized data store";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "riak-protobuf" = callPackage
     ({ mkDerivation, array, base, parsec, protocol-buffers
      , protocol-buffers-descriptor
@@ -175223,19 +175591,46 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rio_0_1_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
+     , process, text, time, typed-process, unix, unliftio
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rio";
+       version = "0.1.3.0";
+       sha256 = "1bb20lc2kjk3ly54zkp00p80rysrvcqgkhl4lprgcq70svf5xk3i";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable microlens mtl primitive process text time typed-process
+         unix unliftio unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable hspec microlens mtl primitive process text time
+         typed-process unix unliftio unordered-containers vector
+       ];
+       description = "A standard library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rio-orphans" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, monad-control, resourcet
-     , rio, transformers-base
+    ({ mkDerivation, base, exceptions, fast-logger, hspec
+     , monad-control, monad-logger, resourcet, rio, transformers-base
      }:
      mkDerivation {
        pname = "rio-orphans";
-       version = "0.1.0.0";
-       sha256 = "09wy9h6smh532lrh13qzmni91yfb702x8i97r24d3ny6i3krzqi7";
+       version = "0.1.1.0";
+       sha256 = "0klbshdsv3gq3l7g1d6gq2wxdqjlqxbnwk1lbg5dpbz7yrnjr3by";
        libraryHaskellDepends = [
-         base exceptions monad-control resourcet rio transformers-base
+         base exceptions fast-logger monad-control monad-logger resourcet
+         rio transformers-base
        ];
        testHaskellDepends = [
-         base exceptions hspec monad-control resourcet rio transformers-base
+         base exceptions fast-logger hspec monad-control monad-logger
+         resourcet rio transformers-base
        ];
        description = "Orphan instances for the RIO type in the rio package";
        license = stdenv.lib.licenses.mit;
@@ -177035,6 +177430,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe-buffer-monad" = callPackage
+    ({ mkDerivation, base, hspec, mtl, safe-exceptions, stm, unliftio
+     }:
+     mkDerivation {
+       pname = "safe-buffer-monad";
+       version = "0.1.0";
+       sha256 = "0l82m3llk6haxzswk8hxkhn1gn37y0zzzan1dnkcg35gk7a9vakd";
+       libraryHaskellDepends = [ base mtl safe-exceptions stm ];
+       testHaskellDepends = [
+         base hspec mtl safe-exceptions stm unliftio
+       ];
+       description = "A monadic buffer resilient to exceptions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safe-coerce" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -178086,7 +178496,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_7_8" = callPackage
+  "sbv_7_9" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
@@ -178095,8 +178505,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.8";
-       sha256 = "12k47j4xv08dl61qfz2g3dla8rwsx6s7yy5mfnv21c5d2x2bxk6i";
+       version = "7.9";
+       sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -180025,16 +180435,19 @@ self: {
 
   "self-extract" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
-     , path, path-io, process, unix-compat
+     , path, path-io, process, unix-compat, ztar
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.2.1";
-       sha256 = "0as9qxqh1pc695ds7kah5x241psnmfsp9hz2ilvvl73yanfg7j90";
+       version = "0.3.1";
+       sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring Cabal extra file-embed path path-io process
-         unix-compat
+         unix-compat ztar
        ];
+       executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180965,6 +181378,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant_0_14" = 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
+     , mmorph, mtl, natural-transformation, network-uri, QuickCheck
+     , quickcheck-instances, singleton-bool, string-conversions, tagged
+     , text, vault
+     }:
+     mkDerivation {
+       pname = "servant";
+       version = "0.14";
+       sha256 = "0akady8lnv5vz9c339cx97p91a1zvplsidjrcc7da6xqwwlaj94k";
+       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 singleton-bool
+         string-conversions tagged text vault
+       ];
+       testHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring doctest hspec
+         QuickCheck quickcheck-instances string-conversions text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A family of combinators for defining webservices APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-JuicyPixels" = callPackage
     ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
      , servant-server, wai, warp
@@ -181015,8 +181457,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "servant-auth";
-       version = "0.3.1.0";
-       sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia";
+       version = "0.3.2.0";
+       sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v";
        libraryHaskellDepends = [ base ];
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
@@ -181031,8 +181473,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-client";
-       version = "0.3.2.0";
-       sha256 = "1504cdqcq6fzr8f483662xdxcp99fpsxbizva1gqk248ymrxi2i5";
+       version = "0.3.3.0";
+       sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9";
        libraryHaskellDepends = [
          base bytestring containers servant servant-auth servant-client-core
          text
@@ -181086,8 +181528,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-docs";
-       version = "0.2.9.0";
-       sha256 = "173gmbgyka6hg6hgchkaw96wv4nb7qr3qwypym520k6zi7cn8b9l";
+       version = "0.2.10.0";
+       sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base lens servant servant-auth servant-docs text
@@ -181142,31 +181584,25 @@ self: {
      , bytestring, bytestring-conversion, case-insensitive, cookie
      , crypto-api, data-default-class, entropy, hspec, hspec-discover
      , http-api-data, http-client, http-types, jose, lens, lens-aeson
-     , markdown-unlit, monad-time, mtl, QuickCheck, servant-auth
-     , servant-server, tagged, text, time, transformers
+     , markdown-unlit, monad-time, mtl, QuickCheck, servant
+     , servant-auth, servant-server, tagged, text, time, transformers
      , unordered-containers, wai, warp, wreq
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.3.2.0";
-       sha256 = "1ykjjd1lqivavsxdg8akj9vfh4miblslcwdyhlrgz2ci2f31wify";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.0";
+       sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          bytestring-conversion case-insensitive cookie crypto-api
          data-default-class entropy http-api-data http-types jose lens
-         monad-time mtl servant-auth servant-server tagged text time
+         monad-time mtl servant servant-auth servant-server tagged text time
          unordered-containers wai
        ];
-       executableHaskellDepends = [
-         aeson base markdown-unlit mtl servant-auth servant-server
-         transformers warp
-       ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive hspec http-client http-types
-         jose lens lens-aeson mtl QuickCheck servant-server time wai warp
-         wreq
+         jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
+         servant-server time transformers wai warp wreq
        ];
        testToolDepends = [ hspec-discover ];
        description = "servant-server/servant-auth compatibility";
@@ -181180,8 +181616,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-swagger";
-       version = "0.2.9.0";
-       sha256 = "10vldaywdjshb21ifw418i68i2nnvm0l89plyk7hkf7br2qnfwjc";
+       version = "0.2.10.0";
+       sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh";
        libraryHaskellDepends = [
          base lens servant servant-auth servant-swagger swagger2 text
        ];
@@ -181325,6 +181761,8 @@ self: {
        pname = "servant-blaze";
        version = "0.8";
        sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6";
+       revision = "1";
+       editedCabalFile = "1sw72b1x6diyk13mwxfmv50nix0n2lf7cv55p4n2d4bs7r5388q3";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
        description = "Blaze-html support for servant";
@@ -181339,8 +181777,8 @@ self: {
        pname = "servant-cassava";
        version = "0.10";
        sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
-       revision = "2";
-       editedCabalFile = "11f5azqs007dfk5zr6sa43cri809k7jlf680gf3d7zcwhlf3xiq4";
+       revision = "3";
+       editedCabalFile = "1asq4w9dbl0ccwqdpvkhbh5fkvwd73iqd09a776ynf0vq3k05kh6";
        libraryHaskellDepends = [
          base base-compat bytestring cassava http-media servant vector
        ];
@@ -181432,6 +181870,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-client_0_14" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , exceptions, generics-sop, hspec, hspec-discover, http-api-data
+     , http-client, http-media, http-types, HUnit, markdown-unlit
+     , monad-control, mtl, network, QuickCheck, semigroupoids, servant
+     , servant-client-core, servant-server, stm, text, time
+     , transformers, transformers-base, transformers-compat, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-client";
+       version = "0.14";
+       sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
+       libraryHaskellDepends = [
+         base base-compat bytestring containers exceptions http-client
+         http-media http-types monad-control mtl semigroupoids
+         servant-client-core stm text time transformers transformers-base
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring generics-sop hspec http-api-data
+         http-client http-types HUnit markdown-unlit mtl network QuickCheck
+         servant servant-client-core servant-server text transformers
+         transformers-compat wai warp
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "automatical derivation of querying functions for servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-client-core" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
      , containers, deepseq, exceptions, generics-sop, hspec
@@ -181454,6 +181922,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-client-core_0_14" = callPackage
+    ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
+     , containers, deepseq, exceptions, free, generics-sop, hspec
+     , hspec-discover, http-api-data, http-media, http-types
+     , network-uri, QuickCheck, safe, servant, text
+     }:
+     mkDerivation {
+       pname = "servant-client-core";
+       version = "0.14";
+       sha256 = "0qnazinjb19hpajxp9fam1pz9lcl1brjw84fcymh7i6sbwvk60kn";
+       libraryHaskellDepends = [
+         base base-compat base64-bytestring bytestring containers exceptions
+         free generics-sop http-api-data http-media http-types network-uri
+         safe servant text
+       ];
+       testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "Core functionality and class for client function generation for servant APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-csharp" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , heredocs, http-types, lens, mtl, servant, servant-foreign
@@ -181521,6 +182011,8 @@ self: {
        pname = "servant-dhall";
        version = "0.1";
        sha256 = "12rr4xknj44ynswzpx11dgymki86gfhhs2gcg0pjfg9w0k416mi9";
+       revision = "1";
+       editedCabalFile = "19rqigavivhzdakf9dwqa5s5q855r1q4xrimip913lq9ircrqz54";
        libraryHaskellDepends = [
          base base-compat bytestring dhall formatting http-media megaparsec
          prettyprinter servant text
@@ -181543,8 +182035,8 @@ self: {
        pname = "servant-docs";
        version = "0.11.2";
        sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
-       revision = "3";
-       editedCabalFile = "16hbrgp5r6mjhcncz8y2gq8q6z3h2b9sl0fzl0yi0w0vp7whgpm5";
+       revision = "4";
+       editedCabalFile = "0fflpj4miwpq5w6xm26678jvhibxzjri53680v8kwm9y92l6h9ga";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181717,8 +182209,8 @@ self: {
        pname = "servant-foreign";
        version = "0.11.1";
        sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
-       revision = "1";
-       editedCabalFile = "1g9631l7cw0kgnsidi943fnzkvddjnm3vgm11ha5vh10pczvn6rb";
+       revision = "2";
+       editedCabalFile = "19g405wqhhadyb70sgkm5ddprp9qb84pphszp3fzq2r4h5n2pc2i";
        libraryHaskellDepends = [
          base base-compat http-types lens servant text
        ];
@@ -181734,8 +182226,8 @@ self: {
        pname = "servant-generate";
        version = "0.1";
        sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw";
-       revision = "1";
-       editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4";
+       revision = "2";
+       editedCabalFile = "00y5ji53sz59wys4nk2xcdpggydvkkqdxnm0aqj5raxzmakqnraq";
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -181757,6 +182249,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "servant-generic_0_1_0_2" = callPackage
+    ({ mkDerivation, base, network-uri, servant, servant-server, text
+     , warp
+     }:
+     mkDerivation {
+       pname = "servant-generic";
+       version = "0.1.0.2";
+       sha256 = "0pv0hgw85gmamvv8cd1yz03b56yfja8r1xrkvlzgb5lpw1ghxn0s";
+       libraryHaskellDepends = [ base servant servant-server ];
+       testHaskellDepends = [
+         base network-uri servant servant-server text warp
+       ];
+       description = "Specify Servant APIs with records";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-github" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, hspec
      , http-api-data, http-client, http-client-tls, http-link-header
@@ -181876,8 +182385,8 @@ self: {
        pname = "servant-js";
        version = "0.9.3.2";
        sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
-       revision = "1";
-       editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad";
+       revision = "2";
+       editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181931,6 +182440,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-lucid_0_8_1" = callPackage
+    ({ mkDerivation, base, http-media, lucid, servant, servant-server
+     , text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-lucid";
+       version = "0.8.1";
+       sha256 = "0g8icz12ydyxyv710fhixswdphiri0b44pw5p0dr21cvwbaxawb6";
+       libraryHaskellDepends = [ base http-media lucid servant text ];
+       testHaskellDepends = [ base lucid servant-server wai warp ];
+       description = "Servant support for lucid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-match" = callPackage
     ({ mkDerivation, base, bytestring, hspec, http-types, network-uri
      , servant, text, utf8-string
@@ -181979,8 +182503,8 @@ self: {
        pname = "servant-mock";
        version = "0.8.4";
        sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
-       revision = "1";
-       editedCabalFile = "0izm1slx384cgfaf16r3w1h6cqpssahphb9b0ccy2m04ysgy7chp";
+       revision = "2";
+       editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182006,8 +182530,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-multipart";
-       version = "0.11.1";
-       sha256 = "06wnmazi4f2lgk2ziyh0wjnjl5gs88rsb0f6bpphxkv7wy3agv4q";
+       version = "0.11.2";
+       sha256 = "0w58gab42l3sz7min2pgv6ihfjz28gys5yky0p83kj5smwhys5nx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182048,6 +182572,8 @@ self: {
        pname = "servant-nix";
        version = "0.1";
        sha256 = "1bg2pxfq5g4imppsn9snlw2mzl8qrdr1hpxk7pppwp9cpcy3bsvg";
+       revision = "1";
+       editedCabalFile = "0h4x2rjyrg6ah9cil6zsci6wra8gmvb1kv2zq6zs7mqw9426vvfb";
        libraryHaskellDepends = [
          base bytestring hnix http-media servant text
        ];
@@ -182241,6 +182767,8 @@ self: {
        pname = "servant-quickcheck";
        version = "0.0.7.2";
        sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
+       revision = "1";
+       editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h";
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -182391,6 +182919,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-server_0_14" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , bytestring, Cabal, cabal-doctest, containers, directory, doctest
+     , exceptions, filepath, hspec, hspec-discover, hspec-wai
+     , http-api-data, http-media, http-types, monad-control, mtl
+     , network, network-uri, QuickCheck, resourcet, safe, servant
+     , should-not-typecheck, string-conversions, tagged, temporary, text
+     , transformers, transformers-base, transformers-compat, wai
+     , wai-app-static, wai-extra, warp, word8
+     }:
+     mkDerivation {
+       pname = "servant-server";
+       version = "0.14";
+       sha256 = "03vkr4xscll4wg09qfp4fdl9aazkx61zfsk3qv4isixvg1c2iwps";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-compat base64-bytestring bytestring containers exceptions
+         filepath http-api-data http-media http-types monad-control mtl
+         network network-uri resourcet servant string-conversions tagged
+         text transformers transformers-base transformers-compat wai
+         wai-app-static word8
+       ];
+       executableHaskellDepends = [ aeson base servant text wai warp ];
+       testHaskellDepends = [
+         aeson base base-compat base64-bytestring bytestring directory
+         doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe
+         servant should-not-typecheck string-conversions temporary text
+         transformers transformers-compat wai wai-extra
+       ];
+       testToolDepends = [ hspec-discover ];
+       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
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text
@@ -182590,8 +183155,8 @@ self: {
        pname = "servant-swagger";
        version = "1.1.5";
        sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
-       revision = "2";
-       editedCabalFile = "1q45dgawmi46q9ps2z7y7kbwvl8pjbzq58s7jzrh096aaiv5141a";
+       revision = "3";
+       editedCabalFile = "0bjsaqrf3pjiv247mvrybwrsaklh23npwrycvmm8f2y1hraadv8d";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
@@ -182642,6 +183207,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.3.0.3.13.2";
        sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n";
+       revision = "1";
+       editedCabalFile = "1ka19i4r7s85qlpk5sm90gm5yf82nd03clgyqzm8w8jn7y3fji19";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182658,10 +183225,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-swagger-ui-core";
-       version = "0.3";
-       sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd";
-       revision = "1";
-       editedCabalFile = "1dh2ra39x2syzg4lw1cklr7hgr52gp72f4iy5zw4zwgy27hbq48v";
+       version = "0.3.1";
+       sha256 = "05lnm9p86rd9rxsz7f1zm5vkqzjcq2fd8an7c8y5fk4kxj6rydxb";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -182679,6 +183244,8 @@ self: {
        pname = "servant-swagger-ui-jensoleg";
        version = "0.3";
        sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik";
+       revision = "1";
+       editedCabalFile = "1r097cz7kl3kknkp23ss3yl97nq6zzn0p9nxrxgxs5d9d62nb0rg";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182695,6 +183262,8 @@ self: {
        pname = "servant-swagger-ui-redoc";
        version = "0.3.0.1.21.2";
        sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl";
+       revision = "1";
+       editedCabalFile = "11lldvcppw71a7i963lymsqy74dkl46zhqnp30g33mfmbvgbwh23";
        libraryHaskellDepends = [
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
@@ -182779,8 +183348,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "19";
-       editedCabalFile = "1hlfly2j0c3c4sbzbkbzvwgvfnngkmx0r67ddv4ccg2if6pc5nqv";
+       revision = "20";
+       editedCabalFile = "0g13cchj5wnjpypsj9fgwk4ypy8xzzwrpry2f9zlsyp0lvkqjqrw";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -184865,22 +185434,6 @@ self: {
      }) {};
 
   "show-prettyprint" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
-     , trifecta
-     }:
-     mkDerivation {
-       pname = "show-prettyprint";
-       version = "0.2.0.2";
-       sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base prettyprinter trifecta
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Robust prettyprinter for output of auto-generated Show instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "show-prettyprint_0_2_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
      , trifecta
      }:
@@ -184894,7 +185447,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "show-type" = callPackage
@@ -186380,6 +186932,8 @@ self: {
        pname = "siphon";
        version = "0.8.1";
        sha256 = "0f0i6clnlzkmks7l7pjxyvv2xq7lcd45fmdpzr7xqfwdn17mq6sx";
+       revision = "2";
+       editedCabalFile = "0kw20g5qghyh1nh9x8dm70frx3jl89npylr2aypvw8igffwsj531";
        libraryHaskellDepends = [
          attoparsec base bytestring colonnade streaming text transformers
          vector
@@ -186975,30 +187529,6 @@ self: {
      }) {};
 
   "slack-web" = 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
-     , transformers
-     }:
-     mkDerivation {
-       pname = "slack-web";
-       version = "0.2.0.4";
-       sha256 = "1wbqz6shqm39ivmw7k2pwslaygxf4rxxbkiczxzpvd29y5pm81ah";
-       libraryHaskellDepends = [
-         aeson base containers errors http-api-data http-client
-         http-client-tls megaparsec mtl servant servant-client
-         servant-client-core text time transformers
-       ];
-       testHaskellDepends = [
-         aeson base containers errors hspec http-api-data megaparsec text
-         time
-       ];
-       description = "Bindings for the Slack web API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "slack-web_0_2_0_5" = 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
@@ -187497,18 +188027,6 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, aeson, base, linear, text, vector }:
-     mkDerivation {
-       pname = "smoothie";
-       version = "0.4.2.8";
-       sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ aeson base linear text vector ];
-       description = "Smooth curves via several interpolation modes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smoothie_0_4_2_9" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
@@ -187518,7 +188036,6 @@ self: {
        libraryHaskellDepends = [ aeson base linear text vector ];
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smsaero" = callPackage
@@ -189885,8 +190402,8 @@ self: {
     ({ mkDerivation, base, split, WAVE }:
      mkDerivation {
        pname = "soundgen";
-       version = "0.1.0.1";
-       sha256 = "0vjl992xsb06ry6bbyi9zbgiyf5117zr5hpdmpjcy9d2g0bzi2q2";
+       version = "0.1.1.0";
+       sha256 = "198nxjskmlqdn1wnw5zjwxqqs3b03qv2v48g1pzf9llcgvcy37vf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base split WAVE ];
@@ -191357,26 +191874,6 @@ self: {
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only
-     , semigroups, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "sqlite-simple";
-       version = "0.4.15.0";
-       sha256 = "1qk9dzrqfyjavyl9p0l24hbncp2c1faxx0yvjz5iq3s4dl6fswf0";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-textual bytestring containers
-         direct-sqlite Only semigroups text time transformers
-       ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring direct-sqlite HUnit text time
-       ];
-       description = "Mid-Level SQLite client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sqlite-simple_0_4_16_0" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only
      , semigroups, template-haskell, text, time, transformers
@@ -191395,7 +191892,6 @@ self: {
        ];
        description = "Mid-Level SQLite client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -192132,8 +192628,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-prism";
-       version = "0.1.6";
-       sha256 = "1nwxjhwpjg40kp55g017918dmzxjzj0q0pndhr7gdjnd2d1w4fj9";
+       version = "0.1.7";
+       sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz";
        libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
@@ -192550,8 +193046,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage2nix";
-       version = "0.7.0";
-       sha256 = "0g3abhr63jnqw231k6kai9c5gqh15dyxrr78fqw5ga98l3p2b8jl";
+       version = "0.7.1";
+       sha256 = "1yiz7gbzv8bqil6zgp28n18lj34mdpg6xx0bzk8x9956zxsiwhis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193170,8 +193666,8 @@ self: {
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.2.2.0";
-       sha256 = "19v7n1hv9ldrcv8h5wcv7lvshwzry0zm9qhvzspb5zvdawgy32zh";
+       version = "0.2.2.1";
+       sha256 = "0i81hrmrhf4qpwhxbvg681kq4r96nhzhspc3jgi04h4ayx7c0vx0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193310,28 +193806,29 @@ self: {
 
   "steeloverseer" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
-     , containers, directory, filepath, fsnotify, hspec, mtl
-     , optparse-applicative, process, regex-tdfa, resourcet, semigroups
-     , stm, streaming, text, yaml
+     , containers, directory, exceptions, filepath, fsnotify, hspec
+     , managed, mtl, optparse-applicative, process, regex-tdfa
+     , semigroups, stm, streaming, text, unix, yaml
      }:
      mkDerivation {
        pname = "steeloverseer";
-       version = "2.0.1.0";
-       sha256 = "0njsj7kyyf4vkk4i2yy93swlhiz5xkrdam2dd060qfi7ya8n3h6x";
+       version = "2.0.2.0";
+       sha256 = "1jj8akshhns3azi9vgfclg9xhbl40nyr1lmf12pisw3mzbd7ld28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal async base bytestring containers fsnotify mtl
-         process regex-tdfa resourcet semigroups stm streaming text yaml
+         aeson ansi-terminal async base bytestring containers exceptions
+         fsnotify managed mtl process regex-tdfa semigroups stm streaming
+         text unix yaml
        ];
        executableHaskellDepends = [
-         async base bytestring directory filepath fsnotify mtl
-         optparse-applicative regex-tdfa resourcet semigroups stm streaming
-         text yaml
+         async base bytestring directory exceptions filepath fsnotify
+         managed mtl optparse-applicative regex-tdfa semigroups stm
+         streaming text yaml
        ];
        testHaskellDepends = [
-         async base bytestring fsnotify hspec mtl regex-tdfa resourcet
-         semigroups stm streaming text yaml
+         async base bytestring exceptions fsnotify hspec managed mtl
+         regex-tdfa semigroups stm streaming text yaml
        ];
        description = "A file watcher and development tool";
        license = stdenv.lib.licenses.bsd3;
@@ -194089,8 +194586,8 @@ self: {
      }:
      mkDerivation {
        pname = "store-core";
-       version = "0.4.3";
-       sha256 = "0fx4ylhqm79pi6k8qzby6nb0d7nlq5za8n3fir1v97wl34vmr3gf";
+       version = "0.4.4";
+       sha256 = "1489ydwmq3vd9lz193m5w277wvb9g74ssc1ncfjdry2g0y6czbjv";
        libraryHaskellDepends = [
          base bytestring ghc-prim primitive text transformers
        ];
@@ -194836,21 +195333,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_2_1" = callPackage
+  "streamly_0_3_0" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, deepseq
-     , exceptions, gauge, hspec, lifted-base, lockfree-queue
-     , monad-control, mtl, QuickCheck, random, stm, transformers
-     , transformers-base
+     , exceptions, gauge, heaps, hspec, lockfree-queue, monad-control
+     , mtl, QuickCheck, random, transformers, transformers-base
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.2.1";
-       sha256 = "157zxg03ibgxdrghpcdyj22fd7zd02fmgnib13yf0jwwc400c4gp";
+       version = "0.3.0";
+       sha256 = "0ssp66w8qbfbx9p6hdgvddp3d82i1b4b0n9jbji6cyvf7v8b7m1k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         atomic-primops base containers exceptions lifted-base
-         lockfree-queue monad-control mtl stm transformers transformers-base
+         atomic-primops base containers exceptions heaps lockfree-queue
+         monad-control mtl transformers transformers-base
        ];
        testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck random transformers
@@ -199205,6 +199701,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tar-conduit_0_2_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , conduit-extra, containers, criterion, deepseq, directory
+     , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
+     }:
+     mkDerivation {
+       pname = "tar-conduit";
+       version = "0.2.3.1";
+       sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         safe-exceptions text unix
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators conduit-extra
+         containers deepseq directory filepath hspec QuickCheck weigh
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit conduit-combinators containers criterion
+         deepseq directory filepath hspec
+       ];
+       description = "Extract and create tar files using conduit for streaming";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tardis" = callPackage
     ({ mkDerivation, base, mmorph, mtl }:
      mkDerivation {
@@ -199437,12 +199959,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_2_0_5" = callPackage
+  "tasty-dejafu_1_2_0_6" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.2.0.5";
-       sha256 = "1xx72sw7rc4lg1wy5fpfjpxiwqynchlvvcyz4mb7dac6a3rbynf3";
+       version = "1.2.0.6";
+       sha256 = "193bf26vccbs0wpdhcqi0pi8mw806acrk1hpr2a7jl70jfwxhp98";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -202965,6 +203487,23 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-abstraction_0_2_7_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.2.7.0";
+       sha256 = "1233x853gcc18xm0d8ysf7rlkg9aphy2j6hn78yxchalglfwjixf";
+       revision = "1";
+       editedCabalFile = "1fafzr80vbnamqq72rwnhk1ih3iyxzb8j2xfdgn691irv4fv6839";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base containers template-haskell ];
+       description = "Nicer interface for reified information about data types";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -203877,30 +204416,6 @@ self: {
      }) {};
 
   "threepenny-gui" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, deepseq, exceptions, file-embed, filepath, hashable
-     , network-uri, safe, snap-core, snap-server, stm, template-haskell
-     , text, transformers, unordered-containers, vault, vector
-     , websockets, websockets-snap
-     }:
-     mkDerivation {
-       pname = "threepenny-gui";
-       version = "0.8.2.3";
-       sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers data-default deepseq
-         exceptions file-embed filepath hashable network-uri safe snap-core
-         snap-server stm template-haskell text transformers
-         unordered-containers vault vector websockets websockets-snap
-       ];
-       description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threepenny-gui_0_8_2_4" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, file-embed, filepath, hashable
      , safe, snap-core, snap-server, stm, template-haskell, text
@@ -203922,7 +204437,6 @@ self: {
        ];
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -208294,6 +208808,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_9" = 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.9";
+       sha256 = "13x2qk8j2qxqqk60y17h7g1p76gj3xxyc4g78mb4d4ajq6smk91x";
+       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;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -208770,8 +209308,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.2.3";
-       sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9";
+       version = "0.3.0";
+       sha256 = "1p3cas4yy8k0knf5mljmjjzzknwhcaw1x08z7q4jlc9y06323by1";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
@@ -209867,8 +210405,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "typenums";
-       version = "0.1.1";
-       sha256 = "1n8fwcpwk5qpjljvwi2mfh0rg7sv58cvlzk165bj3bqcac2ffrq4";
+       version = "0.1.1.1";
+       sha256 = "0zkm10hwdwh4msl60nzm81d409xlch03rb5vv38zhkd3hzqs104v";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type level numbers using existing Nat functionality";
@@ -210129,6 +210667,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ua-parser_0_7_5_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, criterion, data-default
+     , deepseq, file-embed, filepath, HUnit, pcre-light, tasty
+     , tasty-hunit, tasty-quickcheck, text, yaml
+     }:
+     mkDerivation {
+       pname = "ua-parser";
+       version = "0.7.5.0";
+       sha256 = "08nbzzhndxba039rl5s4ap5ndnfj774546xzvqf9ph8r05dmr690";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default file-embed pcre-light text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default file-embed filepath HUnit
+         pcre-light tasty tasty-hunit tasty-quickcheck text yaml
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion data-default deepseq file-embed
+         filepath pcre-light text yaml
+       ];
+       description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uacpid" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hslogger
      , mtl, network, process, regex-compat, time, time-locale-compat
@@ -212569,6 +213133,25 @@ 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 = "8.1.0";
+       sha256 = "0gv5mjhhmxq5zppda431vddpcl138qglxiyksj588d4zzg3kd8iy";
+       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.bsd3;
+     }) {};
+
+  "urlpath_9_0_0" = callPackage
     ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
      , monad-control, monad-control-aligned, monad-logger, mtl, path
      , path-extra, resourcet, split, strict, text, transformers
@@ -212585,6 +213168,7 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urn" = callPackage
@@ -213434,29 +214018,6 @@ self: {
      }) {};
 
   "vado" = callPackage
-    ({ mkDerivation, attoparsec, base, directory, filepath, process
-     , QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "vado";
-       version = "0.0.9";
-       sha256 = "0y48niwv78xydjnz26rfja509blp0km279mypr2yzwm0xdif3s2s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base directory filepath process text
-       ];
-       executableHaskellDepends = [
-         attoparsec base directory filepath process text
-       ];
-       testHaskellDepends = [
-         attoparsec base directory filepath process QuickCheck text
-       ];
-       description = "Runs commands on remote machines using ssh";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "vado_0_0_10" = callPackage
     ({ mkDerivation, attoparsec, base, directory, filepath, process
      , QuickCheck, text
      }:
@@ -213477,7 +214038,6 @@ self: {
        ];
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "valid-names" = callPackage
@@ -213873,6 +214433,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "valor" = callPackage
+    ({ mkDerivation, base, checkers, hspec, hspec-checkers, QuickCheck
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "valor";
+       version = "0.0.0.1";
+       sha256 = "1cjkfalsrpw579bg12ldmzjmmkj9l7b35j2vp37qqgd39m1dm29a";
+       libraryHaskellDepends = [ base text transformers ];
+       testHaskellDepends = [
+         base checkers hspec hspec-checkers QuickCheck text transformers
+       ];
+       description = "Simple general structured validation library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "value-supply" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -215237,6 +215813,8 @@ self: {
        pname = "vinyl";
        version = "0.7.0";
        sha256 = "1gch1cx10466j2cyj7q4x0s3g9sjy35l5j9mvq4sfnf4sql1cfps";
+       revision = "1";
+       editedCabalFile = "0g5b9g7mkjib4ar1v6jfn5m15vj1zg7qn4ffhz03labh3zlkw7zz";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base doctest hspec lens should-not-typecheck singletons
@@ -215257,6 +215835,8 @@ self: {
        pname = "vinyl";
        version = "0.8.1.1";
        sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh";
+       revision = "1";
+       editedCabalFile = "0mb694y03r185r0p473zh6bl4j0l4na9km0r3x8czjil7x9yb0vr";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
          base doctest hspec lens microlens should-not-typecheck singletons
@@ -217842,6 +218422,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wasm" = callPackage
+    ({ mkDerivation, alex, array, base, base64-bytestring, bytestring
+     , cereal, containers, deepseq, directory, filepath, happy, ieee754
+     , mtl, optparse-applicative, tasty, tasty-hunit, text, transformers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "wasm";
+       version = "1.0.0";
+       sha256 = "0l5llqc05fr7zkva3ll8hy0qxx19r17qs6zcp098yz6vsnkavzx6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring cereal containers deepseq ieee754 mtl text
+         transformers utf8-string vector
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring optparse-applicative
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath mtl tasty tasty-hunit text
+       ];
+       testToolDepends = [ alex happy ];
+       description = "WebAssembly Language Toolkit and Interpreter";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "watchdog" = callPackage
     ({ mkDerivation, base, mtl, time }:
      mkDerivation {
@@ -218868,40 +219476,6 @@ self: {
      }) {};
 
   "websockets" = 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.5.0";
-       sha256 = "19vp0mjpib66980q12iv7xkc6j82nkwlyiir0n964nyzl478v3rd";
-       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;
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_12_5_1" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , bytestring, bytestring-builder, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -218933,7 +219507,6 @@ self: {
        doCheck = false;
        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
@@ -219109,8 +219682,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "1.0.5";
-       sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi";
+       version = "1.0.6";
+       sha256 = "07i84ypb0n1qnfcv5y2aksicl36lmxd2bmlmdn2riqj9bhy98vij";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -219481,6 +220054,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind_0_1_2_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
+     , semigroups, stm, text, transformers
+     }:
+     mkDerivation {
+       pname = "wild-bind";
+       version = "0.1.2.1";
+       sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf";
+       libraryHaskellDepends = [
+         base containers semigroups text transformers
+       ];
+       testHaskellDepends = [
+         base hspec microlens QuickCheck stm transformers
+       ];
+       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
@@ -219533,6 +220125,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_2_0_4" = callPackage
+    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+     , semigroups, stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.2.0.4";
+       sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z";
+       libraryHaskellDepends = [
+         base containers fold-debounce mtl semigroups stm text transformers
+         wild-bind X11
+       ];
+       testHaskellDepends = [
+         async base hspec text time transformers wild-bind X11
+       ];
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wilton-ffi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
@@ -219604,34 +220216,34 @@ self: {
      }) {};
 
   "winery" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cassava, containers
-     , deepseq, fast-builder, gauge, hashable, mtl, prettyprinter
+    ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu
+     , deepseq, fingertree, gauge, hashable, mtl, prettyprinter
      , prettyprinter-ansi-terminal, serialise, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "0.1";
-       sha256 = "1i8myd2adkwsini5lvs8418yipr8lx3plsp02f0ja4w726f0d6br";
+       version = "0.1.1";
+       sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers fast-builder hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        executableHaskellDepends = [
-         base bytestring containers fast-builder hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        testHaskellDepends = [
-         base bytestring containers fast-builder hashable mtl prettyprinter
-         prettyprinter-ansi-terminal text transformers unordered-containers
-         vector
+         base bytestring containers cpu fingertree hashable mtl
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         base binary bytestring cassava containers deepseq fast-builder
+         base binary bytestring cassava containers cpu deepseq fingertree
          gauge hashable mtl prettyprinter prettyprinter-ansi-terminal
          serialise text transformers unordered-containers vector
        ];
@@ -228415,6 +229027,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ztar" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath, path
+     , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib
+     }:
+     mkDerivation {
+       pname = "ztar";
+       version = "0.1.0";
+       sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d";
+       libraryHaskellDepends = [
+         base bytestring directory filepath path tar zip zlib
+       ];
+       testHaskellDepends = [
+         base extra path path-io QuickCheck tasty tasty-quickcheck
+       ];
+       description = "Creating and extracting arbitrary archives";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zuramaru" = callPackage
     ({ mkDerivation, base, cmdargs, containers, distributive, doctest
      , either, extensible, extra, lens, megaparsec, mono-traversable

From e0d34cfecaf5252d20428d66d171e05936a24337 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jun 2018 09:20:40 +0200
Subject: [PATCH 19/32] haskell-streaming-commons: disable randomly failing
 test suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 69d98f761bd..0fd1a03f316 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1053,6 +1053,10 @@ self: super: {
 
   # dhall-json requires a very particular dhall version
   dhall-json_1_2_0 = super.dhall-json_1_2_0.override { dhall = self.dhall_1_14_0; };
+
+  # https://github.com/fpco/streaming-commons/issues/49
+  streaming-commons = dontCheck super.streaming-commons;
+
 }
 
 //

From 1486fee1d3acc6f7e4dfa6c921042414cf20a671 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Jun 2018 12:07:51 +0200
Subject: [PATCH 20/32] haskell-Cabal: drop obsolete override to fix Setup
 dependencies

This is now handled by cabal2nix:

 - https://github.com/NixOS/cabal2nix/commit/7ccbd668d1f9f8154a1fbc1ba48d7a483f37a2a7.
 - https://github.com/NixOS/nixpkgs/pull/41939
---
 .../haskell-modules/configuration-common.nix          | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0fd1a03f316..20a908858e9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1075,14 +1075,3 @@ self: super: {
 in {
   inherit amazonka amazonka-core amazonka-test;
 })
-
-//
-
-# The actual Cabal library gets built while building its `Setup.hs`.
-(let
-  inherit (pkgs.lib) filterAttrs flip mapAttrs hasPrefix;
-  cabals = filterAttrs (n: v: hasPrefix "Cabal_" n) super;
-  fixCabal = n: v: addSetupDepends v [ self.mtl self.parsec ];
-in
-  mapAttrs fixCabal cabals
-)

From 5c80983e75a749b8e90feb9e0b676ff04daa4776 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Jun 2018 12:50:54 +0200
Subject: [PATCH 21/32] haskell-generic-builder: bake the package name and
 version into --docdir

If we use a --docdir that's not specific to the package, then different builds
will install their license files into the same location, which leads to file
collisions if those are ever joined into the same environment.

Fixes https://github.com/NixOS/nixpkgs/issues/35024.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3dd023f3430..9ac88dca83e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -98,7 +98,7 @@ let
                         else "package-conf";
 
   # the target dir for haddock documentation
-  docdir = docoutput: docoutput + "/share/doc";
+  docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version;
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {

From f5307941ccc8936510afd8e1517049e190c0200a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 22 Jun 2018 14:57:37 +0200
Subject: [PATCH 22/32] gnirehtet: init at 2.2.1

---
 pkgs/tools/networking/gnirehtet/default.nix | 50 +++++++++++++++++++++
 pkgs/tools/networking/gnirehtet/paths.patch | 35 +++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 87 insertions(+)
 create mode 100644 pkgs/tools/networking/gnirehtet/default.nix
 create mode 100644 pkgs/tools/networking/gnirehtet/paths.patch

diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
new file mode 100644
index 00000000000..8a2d32e543b
--- /dev/null
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -0,0 +1,50 @@
+{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
+let
+version = "2.2.1";
+apk = stdenv.mkDerivation {
+  name = "gnirehtet.apk-${version}";
+  src = fetchzip {
+    url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
+    sha256 = "1rz2wdjc1y7n8fhskmki1nj0ak80ylxspcsrcdnjkk9r7jbq0kan";
+  };
+  installPhase = ''
+    mkdir $out
+    mv gnirehtet.apk $out
+  '';
+};
+in
+rustPlatform.buildRustPackage rec {
+  name = "gnirehtet-${version}";
+
+  src = fetchFromGitHub {
+      owner = "Genymobile";
+      repo = "gnirehtet";
+      rev = "v${version}";
+      sha256 = "1mv8nq4422k2d766qjqqnqp47qzzbbvlwhdni0k6w4nmd3m5cnd9";
+  };
+  sourceRoot = "source/relay-rust";
+  cargoSha256 = "11qf9n6h6akvb0rbmsgdlfmypkbnas8ss1cs7i8w19mh7524n0v5";
+
+  patchFlags = [ "-p2" ];
+  patches = [
+    (substituteAll {
+      src = ./paths.patch;
+      adb = "${androidenv.platformTools}/bin/adb";
+      inherit apk;
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Reverse tethering over adb for Android";
+    longDescription = ''
+      This project provides reverse tethering over adb for Android: it allows devices to use the internet connection of the computer they are plugged on. It does not require any root access (neither on the device nor on the computer).
+
+      This relies on adb, make sure you have the required permissions/udev rules.
+    '';
+    homepage = https://github.com/Genymobile/gnirehtet;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ symphorien ];
+    platforms = platforms.unix;
+  };
+}
+
diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch
new file mode 100644
index 00000000000..72a8445d83b
--- /dev/null
+++ b/pkgs/tools/networking/gnirehtet/paths.patch
@@ -0,0 +1,35 @@
+diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs
+index 4f1be53..96d2e78 100644
+--- a/relay-rust/src/main.rs
++++ b/relay-rust/src/main.rs
+@@ -299,7 +299,7 @@ impl Command for RelayCommand {
+ 
+ fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> {
+     info!(target: TAG, "Installing gnirehtet client...");
+-    exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"])
++    exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"])
+ }
+ 
+ fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> {
+@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>(
+     args: Vec<S>,
+ ) -> Result<(), CommandExecutionError> {
+     let adb_args = create_adb_args(serial, args);
+-    debug!(target: TAG, "Execute: adb {:?}", adb_args);
+-    match process::Command::new("adb").args(&adb_args[..]).status() {
++    debug!(target: TAG, "Execute: @adb@ {:?}", adb_args);
++    match process::Command::new("@adb@").args(&adb_args[..]).status() {
+         Ok(exit_status) => {
+             if exit_status.success() {
+                 Ok(())
+@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution
+         serial,
+         vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"],
+     );
+-    debug!(target: TAG, "Execute: adb {:?}", args);
+-    match process::Command::new("adb").args(&args[..]).output() {
++    debug!(target: TAG, "Execute: @adb@ {:?}", args);
++    match process::Command::new("@adb@").args(&args[..]).output() {
+         Ok(output) => {
+             if output.status.success() {
+                 // the "regex" crate makes the binary far bigger, so just parse the versionCode
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d63580c89c..288f4a5885a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2656,6 +2656,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
+  gnirehtet = callPackage ../tools/networking/gnirehtet { };
+
   gnome15 = callPackage ../applications/misc/gnome15 {
     inherit (gnome2) gnome_python gnome_python_desktop;
   };

From 94bfc2cdc35658b071c02773d397d19377707d2c Mon Sep 17 00:00:00 2001
From: Leo Colisson <leo.colisson@gmail.com>
Date: Fri, 22 Jun 2018 20:22:21 +0200
Subject: [PATCH 23/32] imapnotify: added in all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d63580c89c..6ea10e35b8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16559,6 +16559,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   });
 
+  imapnotify = nodePackages.imapnotify;
+  
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };
 

From f0520361a18c8623a3ba9023d861d5bc95ef4a8d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 22 Jun 2018 20:51:31 +0200
Subject: [PATCH 24/32] androidStudioPackages.{beta,dev,canary}: 3.2.0.17 ->
 3.2.0.18

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index ea5dce4fa1a..a82e0bf2035 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq";
   };
   latestVersion = {
-    version = "3.2.0.17"; # "Android Studio 3.2 Canary 18"
-    build = "181.4830125";
-    sha256Hash = "14yarl1vqhy21ljrn5k2dy8z0y407g9nqw4lqzjbxb7zmascnlx4";
+    version = "3.2.0.18"; # "Android Studio 3.2 Beta 1"
+    build = "181.4847800";
+    sha256Hash = "1ipdvrx3qxwygq72jlf0dl4haxviscl41q18kclg519r1zbzd4cw";
   };
 in rec {
   # Old alias
@@ -40,7 +40,7 @@ in rec {
     };
   });
 
-  beta = mkStudio (stableVersion // {
+  beta = mkStudio (latestVersion // {
     pname = "android-studio-preview";
     #pname = "android-studio-beta"; # TODO: Rename and provide symlink
 

From 4509fdba3f786818a2e3b9bc848d84a33f5b0ab3 Mon Sep 17 00:00:00 2001
From: Leo Colisson <leo.colisson@gmail.com>
Date: Fri, 22 Jun 2018 21:24:31 +0200
Subject: [PATCH 25/32] imapnotify: inherit inside all-packages

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ea10e35b8d..866e1cfbd4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16559,7 +16559,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   });
 
-  imapnotify = nodePackages.imapnotify;
+  inherit (nodePackages) imapnotify;
   
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };

From e5d262e1cc61d2ac3c77907e71a2449b4fec4698 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 16:09:14 -0400
Subject: [PATCH 26/32] androidndk: fixup

---
 pkgs/development/mobile/androidenv/androidndk.nix     | 7 ++-----
 pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 6a647192e09..7550830a4ef 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
     ]) + ":${platformTools}/platform-tools";
   in ''
     mkdir -pv $out/libexec
-    mkdir -pv $out/lib64
-    ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5
-    ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5
     cd $out/libexec
     7z x $src
 
@@ -58,11 +55,11 @@ stdenv.mkDerivation rec {
     }
     cd ${pkg_path}
 
-    find $out \( \
+    find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \;
+                          --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
     do
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 3b5da19da9e..4aeaaf03927 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
         -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
     cd ${pkg_path}
 
-    find $out \( \
+    find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \

From a7fc8ad140fdc95742b7a09e9e919ffc98112645 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 16:40:19 -0400
Subject: [PATCH 27/32] androidndk: use unzip

This is a free version and preferred to 7zip.
---
 pkgs/development/mobile/androidenv/androidndk.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 7550830a4ef..3f9e53089c1 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper
+{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
 , platformTools, python3, libcxx, version, sha256
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   phases = "buildPhase";
 
-  nativeBuildInputs = [ p7zip makeWrapper file ];
+  nativeBuildInputs = [ unzip makeWrapper file ];
 
   buildCommand = let
     bin_path = "$out/bin";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -pv $out/libexec
     cd $out/libexec
-    7z x $src
+    unzip -qq $src
 
     patchShebangs ${pkg_path}
 

From 054656a2fca813cfcd3da5692c080ddfa610b41f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 16:47:07 -0400
Subject: [PATCH 28/32] androidndk: reduce output sizw

Fixes #41704
---
 pkgs/development/mobile/androidenv/androidndk.nix     | 5 +++++
 pkgs/development/mobile/androidenv/androidndk_r8e.nix | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 3f9e53089c1..cc46c1b2b99 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
     cd $out/libexec
     unzip -qq $src
 
+    # Steps to reduce output size
+    rm -rf docs sources tests
+    # We only support cross compiling with gcc for now
+    rm -rf toolchains/*-clang* toolchains/llvm-*
+
     patchShebangs ${pkg_path}
 
     # so that it doesn't fail because of read-only permissions set
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 4aeaaf03927..44fa961b992 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation rec {
         -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
     cd ${pkg_path}
 
+    # Steps to reduce output size
+    rm -rf docs sources tests
+    # We only support cross compiling with gcc for now
+    rm -rf toolchains/*-clang* toolchains/llvm-*
+
     find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \

From 7b49d3b335a6dd5c1f10da2f68317d2777b2ad9f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 16:48:54 -0400
Subject: [PATCH 29/32] androidndk: fix eval

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

diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index d6d6b8a0cad..fcd6752fcf0 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -226,7 +226,7 @@ rec {
 
   androidndk_10e = import ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+      unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -237,7 +237,7 @@ rec {
 
   androidndk_16b = import ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+       unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
@@ -248,7 +248,7 @@ rec {
 
   androidndk = import ./androidndk.nix {
     inherit (buildPackages)
-      p7zip makeWrapper;
+      unzip makeWrapper;
     inherit (pkgs)
       stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;

From e1e9b197f9749b28b31cbb1e79465700dd89baaa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 17:49:28 -0400
Subject: [PATCH 30/32] android: fix from last output size reduction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Directories weren’t being removed properly.
---
 pkgs/development/mobile/androidenv/androidndk.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index cc46c1b2b99..3d0ef39df14 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -35,11 +35,6 @@ stdenv.mkDerivation rec {
     cd $out/libexec
     unzip -qq $src
 
-    # Steps to reduce output size
-    rm -rf docs sources tests
-    # We only support cross compiling with gcc for now
-    rm -rf toolchains/*-clang* toolchains/llvm-*
-
     patchShebangs ${pkg_path}
 
     # so that it doesn't fail because of read-only permissions set
@@ -60,6 +55,11 @@ stdenv.mkDerivation rec {
     }
     cd ${pkg_path}
 
+    # Steps to reduce output size
+    rm -rf ${pkg_path}/docs ${pkg_path}/sources ${pkg_path}/tests
+    # We only support cross compiling with gcc for now
+    rm -rf ${pkg_path}/toolchains/*-clang* ${pkg_path}/toolchains/llvm-*
+
     find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \

From dfa078951fb505cf78f8bf3503c130685a17b8c2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 22 Jun 2018 18:15:20 -0400
Subject: [PATCH 31/32] libtorrentRasterbar: fix build with boost167

---
 .../libraries/libtorrent-rasterbar/default.nix           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 335400b80ef..5323b757b2b 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
+{ stdenv, fetchurl, fetchpatch, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
       sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
     };
 
+patches = [
+  (fetchpatch {
+    url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch";
+    sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc";
+  })
+];
+
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
   buildInputs = [ boost openssl zlib python libiconv geoip ];
 

From 37aab4cbb5552bf021b20cf05d64e8ded6f3538a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 22 Jun 2018 19:06:11 -0400
Subject: [PATCH 32/32] android: more output size reduction

This should bring us finally under the 2G max. llvm directory was
missing from my last commit.
---
 pkgs/development/mobile/androidenv/androidndk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 3d0ef39df14..150d8d75869 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
     cd ${pkg_path}
 
     # Steps to reduce output size
-    rm -rf ${pkg_path}/docs ${pkg_path}/sources ${pkg_path}/tests
+    rm -rf docs sources tests
     # We only support cross compiling with gcc for now
-    rm -rf ${pkg_path}/toolchains/*-clang* ${pkg_path}/toolchains/llvm-*
+    rm -rf toolchains/*-clang* toolchains/llvm*
 
     find ${pkg_path}/toolchains \( \
         \( -type f -a -name "*.so*" \) -o \