Merge branch 'master' into staging

77 files changed, 5155 insertions, 2243 deletions

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 5b4f631987f2..a93054a9aeb8 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.1655";
+  version = "8.1.0001";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1";
+    sha256 = "056h9cyysyh6hqsr1s9xg94la554f56lwnpk87g013xmqf37bna6";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index f602e5c92d9f..8f64c8849311 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -127,6 +127,7 @@ let
       konsole = callPackage ./konsole.nix {};
       kontact = callPackage ./kontact.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
+      konquest = callPackage ./konquest.nix {};
       korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       ksmtp = callPackage ./ksmtp {};
@@ -140,6 +141,7 @@ let
       libgravatar = callPackage ./libgravatar.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
+      libkdegames = callPackage ./libkdegames.nix {};
       libkdepim = callPackage ./libkdepim.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
       libkgapi = callPackage ./libkgapi.nix {};
diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix
new file mode 100644
index 000000000000..cfef018de6cc
--- /dev/null
+++ b/pkgs/applications/kde/konquest.nix
@@ -0,0 +1,18 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kdelibs4support
+, libkdegames
+, qtquickcontrols
+}:
+
+mkDerivation {
+  name = "konquest";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kdelibs4support libkdegames qtquickcontrols ];
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}
diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix
new file mode 100644
index 000000000000..494b193b8326
--- /dev/null
+++ b/pkgs/applications/kde/libkdegames.nix
@@ -0,0 +1,26 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kdelibs4support
+, qtdeclarative
+, kdeclarative
+, kdnssd
+, knewstuff
+, openal
+, libsndfile
+, qtquickcontrols
+}:
+
+mkDerivation {
+  name = "libkdegames";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile
+    qtquickcontrols
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4a10d68ee4dc..e565b51cf509 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,4 +1,5 @@
 { stdenv,
+  lib,
   fetchgit,
   rustPlatform,
   cmake,
@@ -14,7 +15,15 @@
   libXi,
   libXrandr,
   libGL,
-  xclip }:
+  xclip,
+  # Darwin Frameworks
+  AppKit,
+  CoreFoundation,
+  CoreGraphics,
+  CoreServices,
+  CoreText,
+  Foundation,
+  OpenGL }:
 
 with rustPlatform;
 
@@ -30,20 +39,29 @@ let
     libGL
     libXi
   ];
+  darwinFrameworks = [
+    AppKit
+    CoreFoundation
+    CoreGraphics
+    CoreServices
+    CoreText
+    Foundation
+    OpenGL
+  ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-04-16";
+  version = "2018-05-09";
 
   # At the moment we cannot handle git dependencies in buildRustPackage.
   # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
   src = fetchgit {
     url = https://github.com/Mic92/alacritty.git;
     rev = "rev-${version}";
-    sha256 = "14qsfaij631pk0gxrhmp594f72v0z7kzymf4hnqv4k5w9xlxciwx";
+    sha256 = "0mgi4niy40zz80k2ammbzdw9d8flvfkwlxkjnbpwrrldd0sj8dlz";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0gg28fbx0kisv7hqxgzqhv4z4ikk074djfjlj90nmmi4nddp017p";
+  cargoSha256 = "0d6bqfnwqfxqllrf00p1djlxdvnhrahgnyqv842qjn94j3wf0fym";
 
   nativeBuildInputs = [
     cmake
@@ -51,20 +69,28 @@ in buildRustPackage rec {
     pkgconfig
   ];
 
-  buildInputs = rpathLibs;
+  buildInputs = rpathLibs
+             ++ lib.optionals stdenv.isDarwin darwinFrameworks;
 
   postPatch = ''
     substituteInPlace copypasta/src/x11.rs \
       --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
   '';
 
+  postBuild = lib.optionalString stdenv.isDarwin "make app";
+
   installPhase = ''
     runHook preInstall
 
     install -D target/release/alacritty $out/bin/alacritty
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
 
+  '' + (if stdenv.isDarwin then ''
+    mkdir $out/Applications
+    cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
+  '' else ''
     install -D Alacritty.desktop $out/share/applications/alacritty.desktop
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+  '') + ''
 
     runHook postInstall
   '';
@@ -76,6 +102,5 @@ in buildRustPackage rec {
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index b13e7ae5232c..036cb104b480 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
     Xaw3d
     ghostscriptX
     perl
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
     pkgconfig
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
     libiconv
   ];
 
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index a0b1916fb181..3cead5d24ad2 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -13,17 +13,17 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.6)
+    eventmachine (1.2.7)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.2)
+    html-pipeline (2.8.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.1)
+    jekyll (3.8.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index c93f93f457db..e96438eefe3a 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -45,10 +45,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   ffi = {
     source = {
@@ -78,10 +78,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
+      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.8.0";
   };
   "http_parser.rb" = {
     source = {
@@ -104,10 +104,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
+      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
       type = "gem";
     };
-    version = "3.8.1";
+    version = "3.8.2";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index bbcdad669da1..323a0c2f3601 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -20,21 +20,21 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.6)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.0)
+    faraday (0.15.1)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.2)
+    html-pipeline (2.8.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.1)
+    jekyll (3.8.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -92,7 +92,7 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    octokit (4.8.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
@@ -103,7 +103,7 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdiscount (2.2.0.1)
-    rdoc (6.0.3)
+    rdoc (6.0.4)
     redcarpet (3.4.0)
     rouge (3.1.1)
     ruby_dep (1.5.0)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 8473cee0be53..7fc93589236f 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -79,10 +79,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   execjs = {
     source = {
@@ -96,10 +96,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa";
+      sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx";
       type = "gem";
     };
-    version = "0.15.0";
+    version = "0.15.1";
   };
   fast-stemmer = {
     source = {
@@ -137,10 +137,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
+      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.8.0";
   };
   "http_parser.rb" = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
+      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
       type = "gem";
     };
-    version = "3.8.1";
+    version = "3.8.2";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -379,10 +379,10 @@
     dependencies = ["sawyer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
+      sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
       type = "gem";
     };
-    version = "4.8.0";
+    version = "4.9.0";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -438,10 +438,10 @@
   rdoc = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a";
+      sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.4";
   };
   redcarpet = {
     source = {
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 60a7e77efc0a..47f3ac7446d0 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b5";
+  version = "61.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "720e57f7ce1dec861b50fa556f6d8569ccb8bd1752b9e25acd1001d772f13c8931e4e922736577af029ab774ccffc6accbda1eb4ff8cb16864808037cc6b4700";
+      sha512 = "0b1df338f80f20b8d42b9bb541ba877e783c4a23589a68f9f1817d26201b84f3387eb01980add5d4efd8ba984e3e742e7b2dd049a45a7555f01fc81ab2cd429f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "a2302f2f3f604ea3f41f6a2819ea6277b10dbb4d81eaacb754506c8938fbf5de518d5e35004137cfe7cf00d36be3d7081bd7414041266555c06e7ea23f17cd6e";
+      sha512 = "7c5cf4743a057ed08d5e998311f8c5995eff36e23a047ac580a16dbdc09f92c503e7751580d2c28dd80629c3430f227992ccd8144901addbd6c1fe42264f04b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0b3fb243cbe4d1fd08eb293bc1abeb1ee87674f7e7a189514a988d8bd2d733e51b29537cbaf1bc48f3665d06004740a9f4eebc395e4ca3a4a60b3e464e2b9e93";
+      sha512 = "2e8783230b827a9c5e1c10ceec0f4a7c0cb5089814482f7700c700b18825a42df23433b6dd0c21608e4ca273d2dd0d1987722e470ae3915857338bedf252eab3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "47a80e63a76a15a689615c5fcdd9f4580854de0645dca2fb234f2f7737dcb8047e557ed64142aec6a8e153668f213f0fb28866b122aacc3e7376c6f1929797f5";
+      sha512 = "95b2c08a8f8656348328c539df04bc048aabf2148a10bde67c2672d837d5983b2f370fcb47f865fb744a7e2e592d60acce159e280321c065fa224fb0d4ba2583";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "22aae0b42b265b5be89b2d1557725f4b19c3be5f8cb5fd0d65c1325400073a7606bbbd4e3f57851d4c8d433af61ecca81bf19c25b9974b04e3422ed8187d7313";
+      sha512 = "4b1d0917208a0c7ff11535054a6aed42766a8daf92a044d061e370b127c86d4f65ccb88f371b6529762906af5174e0852663b4070e95842e238090b52e42e693";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "3d406553eb53c75a61bae3b62377c5d15b42b64a64e84068217a38785b39785927edd4f1363c5318a07dcded215494b1622e37ba96732c001258260733b2308e";
+      sha512 = "f74c8fea0b1d35fce816db8a4735feddffedcf428b712da2c3044dc060c0b474d909a230350f1277f03adf836d04fc18b32f173e0970d30638890b5d59db5170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "0764176093cc608f6e0b9c521e50a4b0fd8894ac642ce3d14df884c0460d6df2f8fb2a9d61cebda475b9d7000e22bba87a677abdffbf13d0ad0b89a4f004ff8c";
+      sha512 = "59b418da3bde6836bcf69cf7efdd8f11752faffee2e37fceba16016864e476220e98215eae485d9624bef07b40cdfd242efa42dba97ec3f4536c5f9305c9e4ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "a282df1a9cf4ad2fa061eacb2ca49d91d599c6d98b13f7fe066649d6060b92a8a15c5a823f6a1d945dfe4c4ab1a2facf19b4acddbe614a0bed5f704aa717bf84";
+      sha512 = "115928b1c7281c8e3924053cdef5137398ad75903121ff5158827a1c133573bd2ead4095d9f5a1ca13a20b2423493d76e2ae24c10ec4ed35944f678f0a282f43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "7b3f4ed2c2c29c9e804291930c1af962edc842f567b2ff1c17aee04c9e209e3cedb2e462d8bd56f16bc2d9536e30495d74368f1c89a63235bf5db7c4bb44352f";
+      sha512 = "31b5a82661e47dc2aec8991ac34a0d265be74a9598fa3405d90b96b1b642819796de21cccaef44c11256d1c84b1bdbe83b35d820eaa9107ba53a7b55534e5d37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "92881d1c03a35dcbefaf5f66185225f30c83bbf95eabc5c6219dd957747abbdbc8bee28a65eadc474df54063f2a85bc1fc7f00db0de92fa2de38221ceb504562";
+      sha512 = "95edc99dc2466159ec195f1669ff161200b2ab95a6f3aac748990b9ed03b08b51dbfc65381359ba8b4d82a73bd5de73dd29e3e096e92e20c401ec2e698d8c46d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "73565490419a39038efda09122f88b1de5f4aa3eb716ad7e984b8c0b86ae4c02901c4f9f10782bb8ce63af90dece08aabe3fe8a98b04367dbda46f5ab53311e0";
+      sha512 = "22ab9a5c9c7e207e5944bae42448e5fcab9c0266b4007af487671e52b6151a6e256449f59bcb43428f536fe520447cbf8e23e3ab998ce6f1bc9deab88bb4fd98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "6c4df94f9cc3b8997678c68ecd2b2ade8707ab6da388748604ad31bbe2af04a8b49f9a6d826036949252d50d7e188ffa30bec3d8a5d12f12dad992af1846fd09";
+      sha512 = "ae5462ef188b7e9cdc79b879a84dd1993961ca14d88e6b06732725098ee97e0855636638ed1df9e4cb02844372aebab85c42d86ce89149ba629f2b2f8b1b99ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "fc4ba1fe9a8b439c40c99b68dd4bace3008ba13482f8ffe821942aeb513b2975e1c83fd267d980e93e1cee8b3662d13f444f46c1bc4c54088c45ce2fca9c3918";
+      sha512 = "f99a2d3fd40182745c8e1c50ccb104084be8c567717c5b66bcbfb2fe1b8b4447f5467b4e60c87af58c82d49655cb79a05ad78ac86701a4ecf18beb39ce666598";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c74ee9c4de09a65d33b1e2e3d21e5901d884f981a0d90c81e4715214886d80ceb219bf96c4c9a9e19e6b278df89c31b3232846a5d0f5539b5c1234a312414469";
+      sha512 = "497ee03f14cf80e9e34f54d64acc1889ab4bf510019c47b1508fc3ab72cd284c009d8d0739b2d3bba7d7cecf41ed67925641d81a34de867e8cb9262e3e12944d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "59b5a2602bc0fad1b77578179d73acf00473dc1426cbede4b4b42973ea62399b3ae637c728443786fbc78ff3a15cdecf003764ee57f23642167825a3b4e38ab4";
+      sha512 = "41ba583d7dc03a87123b0246f1d3ae2698af85969f362e73e3530b1704795a6566bc688e8387a5427a9d6321d30c06fba45f560c19ab05277755c802d4a12174";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b583fd92f83bc2320b69b1a8ffa880c289128c31475d69924e6690bf8bd3c4aa3833883a3e012eccab850125751681c1aabb9f3c574d9b49815757e6d0a29aab";
+      sha512 = "88fdd62fc0ce35959f23fcdd9c1daaf25860e91618946d222a94cd1586c833761871014973d0a9320c9612455d007cfd4f0e01e2a0cad11401e0738e101c61cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "df9487ecf368f8198910df6514ba4c2000a3ad2aebaef3c442621008c8a89a356d38e3afde11471c426cba24b422db1104214b58b92ea9cfc040f30e817f68b5";
+      sha512 = "c5eb2ce849ef8058a068c34936f35cfde321b53d416d255df2d0f1813f26a6c57abdb718d4162325b869a9155b360d0c5fc32abc391bde3cede2c0ec8173abe4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "117f836242eabd1a393b3b5cc0530d6c0f522fc16a4703b52d3e24f45796a0573baf05add71080e1b96481b253bab07aad3a41166653eb0e83d46447fa85d8df";
+      sha512 = "6aa5790414c918b6f97b1b99d6d5cfa59ff4d619d0d8fc38d95de201f82897fa5d02bca3be86fd535ee2eaace5cc5f458a6289d416dbc2266c61ff2eebc84004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "fc77f7d86d72c58ee87a05d25e96268d6c582321bf9d11d85f2cc6a471c43e2a83f6f76a3c846b27d096d9dc0de661b0d2289972a39c6853b45a3d761bfc40e7";
+      sha512 = "62e54d82a20c33e551d7fef97ae615833937515f362c5c74a2ac9f88e254f8f217f38717cdbb9fd827f882b2e2a75ece61c2217b62d593fb9e93e8fdf05786c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "99a01ad4a11bfaa0972014a1a7541bed757229d8df052f91a6935f8b048fadf015ba0db0f1bf1e0bb7e8437eb5fee692990ed84362ff95513865134fcf12eb9c";
+      sha512 = "0d8d7a77589be0eb1c14d9434acf5700aa1f4fb9349d1b20899774f5a65b8a7a32ff393ddc4caa42d6cb6ea8c063d8eb4650024dc7c2858feeb6b01f613bca60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "f0a9e8887a498e100ffedacc6bb5a988dfbec5fc06317e8c95462da20caa744c7ad120ad03637dc8392aae6c6e730879eddfa76dfc04107b15740cdeffa70677";
+      sha512 = "c1aada0c4ef3484285c233d5210097e26fd549f40addfdc2d953111b2c4d0e2f320ea3347d391a1a582d78fb798ab1809111c13e4187eec9741e49a034e5172d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "8f7849f2b3500b54ee876a4ded2376ec665e036e705297a0b6eea43c70fb3db3ef0a89b112a80814e3eecd770b34fd119786ec0d34ea850003fadd38299a8560";
+      sha512 = "f38b473313bd012cf4ed3b8ff327a59d10127816623ddcdf63083cc4132996300810a2c760eb2a8c2cb5d8519648a17b74790062ecd266e8e3e74619c781cf3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "de807109ef44c58e43c74fdcbe22553fe1760b38b1107ca99261e21b43da526bb875871dcbc27f8b9811c8ef4f742523526f09a4649ca0d1c7f10f69048ff997";
+      sha512 = "abf8f44cb3c2713e1fb0e9abe41a45e67c270e653f5cf34e07f9692862f87d51140bc56ad757c6f4a440b0f03ed09f0b6105a13cc3b5fa97dda6f0302dd37889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "46a14786b361f0d8250634c4267835aad3f7737b0451b336065674c00392b0208d31f6a0d6d62adcd2073002cf75d7caa286be3509f3f5f3100111c23673fd1e";
+      sha512 = "4c953abd9000e7165ba5402ac52319862c228a2d58ce422295166a8e10100731a9a8887d989c2eacac416cfc655e18ec8c6ff49d6f34345fcae32eac7347e9ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "ab59244973e42a3551de4e6dcc31122f9b03537d4202a4d7645a598166e2847a43b2e902a70876e19bf4a4a083658c86dd5903cd3bc10aa0c777e20f55d1c796";
+      sha512 = "a104015a1517025a186d25aeb62aada054d53fc4a84836a0292be13f158bec83adb33cd52576e4562a871330c8d42d12a451d6472d77edcc46b074f336480180";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ef48f5124704f10b03b442222765461c1cbda38422476c09787ab194e850576ebbdff741ac179f0c6ca8d0ff8e8d23a631eaef70ffdda09e9f8aab21aa557f78";
+      sha512 = "aa8955c97e9cf58d1e39798da746616e33d7dc9c1447c1c1fa222d0906d891fc6b44ce0cc8d29408a12b24f0829ccb39d01a4a8895b1c0117b86adb8411cabbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f15d84b35ad9eabe6a5cfbf4dbe1cd3bb57f4f2662b455c9ca7b69dcc410cce688ffd040cd783b65d429118a56714e0e475f68c25ebb6963ae1f0edd5493e846";
+      sha512 = "e3ef1125278d00395357d1b15c081938c618ef8f281021d26dfa973ea6b9ad0cd2b170416739a501b9e07ae51e8b33b5ff501f62573bef3471cc34fe5419cf8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "0b518e998dc2f584ce1ad652737c3331495efb831c4fd336a6c374f36e5d06711bfa7dd476b674df3cb4a91e25759bba09def752d9dc97acb65adf2112f23910";
+      sha512 = "c8ab8eab63c349e8849039307b86e7ae745319bf06c9c1553864eea078be2f4bf9f241872224e2aca2077c7d279daedc70d75da2214adf6503515accf4f091cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "f72d7622734489ba3fae9b578ef0f9f3fe84a7ccb673f2d8e3177998978e6e1b28ec89fd18aaacd914865302c00c6ebe991cea72392fc23ccab7350e23234c7f";
+      sha512 = "3fc3ae2234cd2059a7a2b33069e3e0e15d8ccaf8fb64ce504a74c414c4054904ead632d5b9fbdc20768eb9d73082da0db8234c7216b788fc704d8a8e7bb6d621";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "c57d5587879869e2f264e82753b9b53090ec530a98104024dd57fb3af06350121a547140e6ce4b06d397331e201329c2cf582b119dfcc56cf70acbcb47429673";
+      sha512 = "7dea5c3f7f66f549e3365bd1f2b63f12dc8e36e5272b184c49f5ba38dc93d838a361c84e25cd03faa50ae08233b49ee3389ba961ca2352a74fc879a4e39320bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "471089facb9eb7b0878dad4845d79b1e2d6c9fc918ebeba770320bedf443e40e7382bc876f1664609c4a9a9888c39ef9d7ce9f3dadbf50f9868cbf17b0d7ed64";
+      sha512 = "de4775a4ee4269bcf1b1c8efc4fdf9fa3f987b84d899dbac36c25ada1813a35ed4f1a7e20bf11f7933156711405847bc5ae333770eff8a02623b1ee5457632a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "3c0a7a84b1585e9a1e27e0db10826aa37258180733c0bc1316f6b37e997eeba5edf7d8a400cd86b2cd82c2c31dfa36d5e44e5214bbe0f40fc250c59bdbc0d7eb";
+      sha512 = "00242ae07a7ca996157abdbc859539441d2067b90c1854a316e4d6b81f4245aa3a93078bad667073e5d1164e690bddecb03074b4ee9b9fd6f2366d141cc6c4fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "6afd3a5d162dbf2fa21ac75792de481aad75a82f1f1c6b6cd82456ea8456c0eace20227e4f54133a5a96f8c1619d92113b2006f17f49f8ef9fbcb9564122df33";
+      sha512 = "4e4de19fcd2a13a84820f8a69d591a3453ed8ec3ad27709528ee1ad0ad9961ea7a1f13a4633cf3ece10b927e0307b1916cd5a05d756f6b01d45bb1e9dc6cac1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f7288a081aebd8e79ebfd2a3baaacb237eb9fa0b4a9a6314f6758af1c557b09105be188bef7a40b27389d1dc2bf60ee984d991f9caa77292ae0c7c100887c448";
+      sha512 = "19af4c8cc8b453f883585ade2216b2c875085b7ccc0dde80e4014fa5fac5d9e4cc712b48d82b5124359f0fb2c8b0dcd23cdff29855ee2669da76aceff0464c77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "591fcd8f2480ab578a530358241e0d9a624610199d315d7c215f7320980d29dd28ba4e8c35c40196ff284ad19269b5053133c9eb860cd2def922c277085d4f57";
+      sha512 = "fe5690978749cc755657baa6d0a729802ca16f0a0e2c3ac31e78f34bbb256ed081d18054fcd94b3aa5286e91098e5386fd96317f2ff70e7cc3b63984dcc97993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "1738b3175e9fb7fa67aaee3d1fde9525e85e2604777b82f0f35b48ddcf08f4dacc0f0698641c6ef05c4bf156c5d785223e5ed20b0b4ceff84860f46d4fc65a38";
+      sha512 = "67e7af73ac99ac2b895d46976b5f94f0f8c6d0b89eadc284b995013a44f93baf7cf132fa0f66db7e6248c04538469d55f32220964931e1dc50ab480120e75f1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ff6c3c96853229a582253c6bee51bd041bb0d5090b260902955b8a9db40cc22aebd930230cafa3633d2b7137e8601e107dc276b5bca03bf26b205534caee0118";
+      sha512 = "8b6b5fdd5d662f7794ae84847addd576ea74dbfe2ffad011df0b73ed1a58186138818e8d05833b01f58e408928b53140a8127b0fb35c7b35847f93e4b610b26f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "52df8410c5c9d0b1bfb763610a7d5e3e8d3db41e16285ee5b02be9994f88deb30648c209d29a1c63eb9539220ddfa99023bb31475fad40fe8f347bf41c71f2ad";
+      sha512 = "4c481d6b0dd51b391820ea937394c1527abc82107bfda98ef67952880702d317372d1369ce6f767f54dfcc4e3249bc190d23d8214148174370293125ae031cb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dbb9000ecb87fc7d56d639ae6d7b92d1f78d3143edba153f363bf49869696cbaa24b1aabe081b48a5d324d9e7c783deaafaf5ec7d58fa99e4d1c0c3fa530675e";
+      sha512 = "aca1e148b4a4d5a7266d7d5eedb4a761b1e0c047eac2738a7bc28e45a083f59331c7d743bc97d92765140d41b06d3bed820bda668aaf7f8f8393a8c074269a3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "bef3b0648e7e2057fbcea9966e55353eedcc0f6e7de658fd5b472573a0014eeb387c4e625d95ec75ed289b809fbca8a47d79d464655eda8c0e9745f28be91daa";
+      sha512 = "2043c6cd6d0de32bfc3fae90c5e311fcafe665c7c8036fba9d2265c6de54c0ea9c9238f61a03649c542f534782c12da475d8e3b32cb66c910ecce0ee9ede3762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e3d966d378a2c66ccf223b9f12191f963c8b8d795d05d854c9739d4e4418b95125bd5d8d97d783bcef432c55b17bf500a5b3fc391758eaace12d186a89e09df7";
+      sha512 = "5237ecf68ff48ec33302459801d5fe1163980b525cc3fedb634831dfbf915b86df075e69cc86bf7c8f75d23c75e6b6c6b11cc7967494e99283714b421202cec5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3eac4e2e2153a3d1d2eb9aee9a0f7b8ddeb9bfa8dfaad3ba42a84f117d875a37cd9b67e7342f8894c35463f1b882ff24aed5e154cb7c8cde291632e6e66d02fe";
+      sha512 = "278d86a5e44e74adef879f291427a5027ec8b4f90b55a108347b56ed340dd0bc12905acf903430bdee40ac1d0d75685c98efa2d6c26fe976f20548c6ca3ec8ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "eddee4cbb273883aba916588af0aa7205c27edccafa190532fcf6695f592eb824c92bbdcea22b9e0a2ef98fe4ec188b9a5afe8fc87212b3b10d638d6d435df71";
+      sha512 = "e94e4c9afaace5231fb0817887c9fda25ea08547f262337ef7b335a58ea16478f213e737a1379b1d8be5411f9036f787b8e3cdfde67fadd6623edc7444832c68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "606aa417c0dc7c4953f1c91b9e52c506f971c155491a766b12f3fd7780ac8df4da4a23759f2a203e0a8dbb25a99778def10edf4e3755dffa66bc489d55a413e6";
+      sha512 = "1cda9bf9a20e69a988519fa06e6bab8384f33389ee1e725b561335f9544d3d107ab43789700d88f606c3f92747857ec46510cb1942b644cf3daf40201381c275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b5f7668047c61d84a0d027e6750983be66889fa1da4dfa471ba79bf61e706341e877bf0333130332a6afada025c4d84d76500d2ef644847e6eb1984f10dd7a7e";
+      sha512 = "a92604b7cb484d425d4bb40feab69b75034002c4a38d4191768d025d07ab91ed6fce1b2c4edcf0db3ce0a8c3c5bca378def024f8f960d14c08662d16176895af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1439004f92d61e0fcb9c8d4cb356b3c30c82375f17852bce49e63fc9d5b939ae69e9fe415b6323901460c77aaf98106d534c7d8fcda5dcd07b9d25512586e06f";
+      sha512 = "ad8e9acddc4b9ded3464f6b25391094a31036fb1133f9a1c31380d6f2f45ed222cd640f15f07a0159bd508208e58c70d493f73541575361482e91e243bd405a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "5df1b2406e7bc3b5ae971b69a67f95bbd76d81047678799648de1facae89bd83cbf00ff53217b1e9dddfa127351c440d6def5a509f39e58d9aa08b1d6c0c8234";
+      sha512 = "8871693fa031d1616dd036566c89d8ef8f0e6f14982b915697596159212f111cb285c45e9d0a27ea85cdd68c202e258e03da8d1e7d7d5d299fce5639202e6b91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "35d537fc26a8e51125c52eeba7bf7ae15aa9cece05e35f60937851fde672746fc6c8440c50c554e6b6606b76b8262024da20e9b1909dd69d99518a71e7d505c0";
+      sha512 = "d2186919c346e057cf1df9a0068799200e849f9435f710c78ee396cbb5190e7993a2975d011840ab3ab4405bb9ab367184d896417abe217227acd8dfe8f21dc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "6ec504f45a0653d9e51019e7bb095ba1d8b8c677cde65a68ae9f09dd165a124073f243e86b89e90c674ba91c19851500653b044a00c6c1ef761fac4456dfe75a";
+      sha512 = "fb9a961533da35e0a06ecedbda83e62aa1ec1aaa743ae683f7bde43f83b0631b15498c0e5fdb900f6fa8cd840d0a688317fe6577a435f0a4d445954f3be93d3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "24ef8c4de57aab0638a1d8841cab8335bada9025e051d10ba2e5c4a9985d459848d1d1fa6265b5914b1c5081377ab52c7a49c291388674d184a54162bbe73e5b";
+      sha512 = "95adff7893359d470c0ef92773419f66692b89c883dd244c014049e6869472b2711ffd40f1967588d17f763a2148463883357c084a72b9a52410068e9a4e2ef2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "016566868c55c5df99debd049540f72d51c7ae944cf70c597d166080452147869b586c872d694b370244941dc1b3668f7ecec164fca73d884d650b852b6f15e9";
+      sha512 = "fb73b5466b8a09dbc17e5b8bd4bb204fe449e5d49e5be2979eab0ced8f65d37db52a1c5acde742063322e214724f37ae36d236967fcce41d58037bf3fc9aeb33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "cd5e821c5f4bbdabb0f08e77eb5968e8ccb53dc720f4f66022f2ada325278fdc6e9f13d3b5bd830dd7867d3032c85ad869ecc25ba4eb8bdc027c8dd45713194e";
+      sha512 = "1578a5e7738cc2d85195e2474272ed68b6930020dd34e6ddb6ac00db682f138f8163a1fe0c5b2d179f3b5ae1781edab94dee4f6eae660c7b7a44123fa0a18202";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "21b472b694fcb31284bdbd1d1b3e531761db82e8fd5f406ca62251f9cf53e5f64fef659d5eb0372bf545560d4671d814895a4e4befe4313580e1a52714101d1c";
+      sha512 = "c2548b1f0636928f594c228af277cae652f8436c22ac7cbb53da103ccf03b074f55427c366b4e6ee5799dd3b19e057694658051861cd5d29b2162e3101fcbb3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6a638a21a3c410811366070d32cfb4119bbf16d887383562736cf96be17bc08944dc062767ae56f7b6bcf7d4c96b97383defec4b5726879edb5be770c5053a42";
+      sha512 = "04c08d0d88ff6b43bf5ba0825f68d1563dd3ca05f8ea7c4143d9a6a9b78a9d53f65cbd15330dc755587b4511f998a86bfa97b6903f6a5b2215f882ecee1a8969";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "5b4e620e01362d763d3d7a98eb5559ccdbdc78e11e0792b64f29dd0b0799aeb78b9404d008c1ed7489f56ad553e249ed1d6649588dce0d7b6161506a743b48d6";
+      sha512 = "1eff82dfa45d685882364e10b4ddb869dbe6b3316ffb89961ed458e0e64023d546f2a6ae22a10480d27f941e059151592f3e1af79c946d639b68edc62b506ac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "7dda622c7a6fd69b43cb1895c6faed9a2fef75c0cde3680c445d5b86b8d97947770e4eebad44324d71384ba2b407a10db045d4d108e412ca92f6a223a433980c";
+      sha512 = "18623bd96501846a497f56813ae415f5858150b85a3a95c5c7d4cf3e645444aca6de32eb4a6624833a0f3677f11c0b3d4219114c8ce90a4087bc1da41eb9c59a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "93f68424ec2de8a7e6c319e1d243d09c4e313f59e5e102c68b06e21832a88bd32dc56f48119c1a6b92774fbf42b920f9245a12650826fbb9549c77409f9e3b5a";
+      sha512 = "a859aa4c4c6b57ff2717104ad3add8ca04c7183db7ec94791c832ebf78f20fcebfe176a4d9a4cbc53e67a3f153350d91bb18d10299d3af0a590aa43766e37889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b4172a12cc3c785055f574463478e00d74aa3e0fb25389c8a4a67ff4966bfd74e4282e7d6c94c357895cf16265115651743302b28332fa8ef117bfd50778a3cd";
+      sha512 = "11c9ab7ad6e433e6e699a0aab1071cbc7b8f4e9a86452737b79a438c6440ce24e6f46b741c3c9785afa36ba85ba157c61d0a8377dc4de5be2e7b5872f4752fd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b7303e3bf959f9eaaa06f3742eba9e039b46a4d00480651519d54a3df1b919e576c301e193f016d84f5b53eb03e57f58cd22f3648f289d4628ef8c7f547d8ff3";
+      sha512 = "1eb96774418cedd2200bdab29b2496059e3a99390a4ebd9a6ab0cc862748a7c5d53a895e999adada1be40631a083ec96181397401cf38a642686f5eafaad240c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "4e14b4b1617361769e1e8a8a621cba4bd7a7044f6a7e4c2ed28369b79cbc5473a438d68ffecbf42a6a62e33aff6cef0b8dafb135cca5d65d07d6f0028a362c8a";
+      sha512 = "fbbbbb31452bed65635e3b76aa2a83338cee8a84eb372ce26b36824c207a02f646a8f7ff3b8efe83916857c579c65ba66a4bf8bb63e1df2a7d248af4788f8649";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0f85c67e06eca79e14e9aa41fc25d6e8371289b97d39a1e2b3b6a0b9c73398503f70e5a0cac1b02d9fe12daf805e35c433c78962ee52ea03d151b1d1b7254dd2";
+      sha512 = "1f9bcb234b11fd5bc4558cd18f263964379c50459e2667894f797a488fdd474b2b86db9e332c8121a78ea7fca97f0b6aac9e0cd71756df4197291439ba8beb5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "9a36f85dab0ace56a361bcb0bc00241aa3087028f4ba8b91b64e76963e8979a9bf4c526d922449e39f4f0a574d0f9d7d29cf033bc2832c88be76ece443fda6da";
+      sha512 = "babad97e5f7430701b38d8b592b11e3e31c6cd5877531a612d41e8b33221c9747a0b462fe938e0a724d460a60ffd4ae42107a78cbd184aa5b22a3b1fc86fb449";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "2523ae24ccceb2a884d71238b406aee20a359a881039e0e864b49358f2673f44663e105efea7ff094656e54e334c1d9b37d9834a841ca3b938ba4b2abf14bcc4";
+      sha512 = "9a3e12e9c3e871204de6ec6470c7daf9460a0a412799f5451a78001ee8af0bed3f1ac96b52dadbdb5ef63fd1355baae0adb06115bcf826d0720dd816f755f01d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "bc07ff82e6e2521c40db7391cad7b1246bbc8b99b45653cca2e76d8ac44dd341f66cb0d28b93e0a454ae78177b0f85b56b5cba3bf43a2a147178706544435874";
+      sha512 = "3f83993c15aefc974c246e00f750bd94d286f50393d2b3bfd6f3fb3a5f6c98f09265386d419cc1fc9c2ec62542fc1410eb8fb0ec66fa53cc9087ace482288389";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "aec0eabf17162f0750ad54003bab89f5ca9d4d059b88d99c2c07877decc64256a411b561daccc0eab5fce16a642daf9a6f86cd1a2f50a0d68c140f44ca941404";
+      sha512 = "e730a4555cb72bf9e7fcbfdc7f8732f9f62ba0339c53f7c5efb4752a1d344ebc535dd4fb36147ad724a4dbc8dd7ec5aea63de72102c28d3e5f3741428884be53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ffd034a7fcf7ff9fdd03539f84792aa5f3ff23276f846498aeca15b55fa2d30791e4ee66eb0f0867db2cc3f869d306a36cbe8501957a224de4b17b9c4a0dbfa4";
+      sha512 = "93b41b7e5dfb769a61bc9051d4a86c94101d44ff905d16c6a4764b67813c047e57ce21d33c3e39732c9ce904f3fb1c3cb9d0e167c7531c99bfd525f3a2af65e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7916547a252d0e3e0161b6c0128003407718a2d88748ea33933edaed37de07baceba825cbe64aa9d78d13c5a303cb870a0d282e05b6fee3370ab209e27329354";
+      sha512 = "6cd4725b388550bc37b661e900dff1535db40f264884666e497ba480d88e1cf28ae1b2ee67b806d95c4fbad53dd3978f468688e6dc86b2de7a52cd1fbc9c0682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "bebc0324bb9134644dcecac3519dff56ae0f394bb36cd6030641d2482c18f08b825eb2c197f9a87748b8217c0b43323bec3056f7aeb1633aa46d0d049d3c8528";
+      sha512 = "2caea694cc0c5b2405c8e135895a13daa454008f1731ffbe88051c738a9529c627f4ada3b4ada588a0ebc7f10b2bdebe8d021a32aed646e233a050d36ab0c016";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "842c6f1251e7478b285263e8d46f36dc6bb9d5216725cb1447b0272ac439c284a72b1316095f35bb10445617c15047c5fee84a3763ae03120658c613ed5b4ff0";
+      sha512 = "9dc52ab05a4845b2f8cec4761fbfbab0e6872c233058ee2950d96e3b88e2f21cd155477e0bdea127c0c07cc2506f2b90015a2605f10d6dd38ccc6a3ea3f0e5c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "672d5083ddca12a22a3fd639610312c13330b5cd6c09a99bab1442ddd58c86552064a4d555eb7331c658fcff9408bc62617f80e7797c4c502251791585b2035c";
+      sha512 = "88bfa07f5275f7985fc42cd42802c6c1b077c0dafa445a29f0a5346185a39aee380781b6112da52d79fde13eea4116763a2ba0d54a957b6d7b7e7363330de68b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ccedbb3b1d4eace21851c3490c3779eb29162cfbfd2aec987497ea949dc564a6b516c16ad08c31fd5c05147939ac329f8853bfdcc6af17259a905a18af9f4867";
+      sha512 = "70ffe5242dd0173a384f59395151cbebf1113088d0880d4c4b9107317fe4135dd36a49884d986c44ee4f52536eddd35646e956afcff871a8250260ebde75c852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "872532c28868e681fc230582828d6ff19beba70ff29b71aaad85ce19422d68c85560def8cbee5cdbea6b8360cef5827a84b1116e1fc309d94a16c6c2fe9872a8";
+      sha512 = "9215eba4cc0dcfd27c4bdc2c8f89f71504d50a9636c240e275ca87c08238d09dae6a012bd055242d3785f04aa8a6d08a7acbede48af0d016ba5135ce901ac5ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "12beee4eafe1c5f41c772bd2b8587f92bd2318af776bc09b935913006b0df2ee7bff7cbd8ad621737ee1c83792db96d51b7d7ee45fdab829c5cfaaf32632e82f";
+      sha512 = "12f15f3fbfec5ac0cb0336a1c1085ce820906e75e58572f7dbbd9df7a5335caa59da4b61c7afbad875b73049521c0a5a478ae5584828f512eb0dcadb591755c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "97d3d44d1800b9fd8cedbd90cac6472a3f2f8c4840cb7aa93bb08acb067d47f80c98e2ba3c8d8554ad8987c0cf6d392f64ff0a08127481b30c23915e5f986ad5";
+      sha512 = "b8110cd53fcdb4f5bc4fb2c80aeac28790e8a7666ce644c6a911b7e33842ae2ad12bf4ffdb5de68eb24ff7f66f2d54d2c2c363050465b1ecbcf59c669e991d91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "6dc388f02cd52c50bd158668bbd86f9ffdf80561e9b9da207fd1e57286d8bad40a4a54fffe02c7102e325ec7b7ff3c2ecc2bb4cada9a3dea544efdd73ef02a98";
+      sha512 = "969d4200aedb22282febdbe652e9a36e197b43c9e038271ec5fff6ec1c3597a2c90979c66d3fea3a4dd705ebe5072cc3382aadc6a82fad7a82c62a138430cf5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "496cfa11dae110e7d8484fbe43ad689f7d0f6c981c8dfc1634586c533db23b417c7856e63257432d377f4f1b354557733738a613118178eece59049d5790fd88";
+      sha512 = "d336b27d4ec459d4b9e101b74a267d78245cf18a47e9d79f118a5ea8b04553734ed51aca526e16c8e208726240112ba7b8a112aa6dccb5431260690af7c43676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "294f8b13ced20c26151fa75fe5a3471de4e56a70749cdaa99cc0058b3b46f768321e24897e830297e4dbccf5dd1979f33f8902e1e287ec44894c0113f5d6e50d";
+      sha512 = "6b06591468a5fd3f961be6e42d7df2bb302bed493c6c68816fcdba59ee090117529e2201e686b1c06a83273b29e807002c7b27e957f9d37af21a2fdf7ec56a98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "889517c9b6c5a01263dcc5af5badf44d9692bfd227bda75e376bc9f27c2fae6a8631e4b5673f105949b16594369511fa95812af9f46ad32eca4e101b344f7474";
+      sha512 = "43ee24772c6122341f1f88cdf84b23d53aba46af9fe0384a2518bf6e4c673522c57c52d211da306c7ea7b672ed1048f93a06861af39d024a8fc025b359af6a83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0c9df0c551d310e52a21f6537b883eebcd736e1292f8869a9fcad8d1f505a083ee29ec982cef2b46e487a9a9199ceb97db62a5b2282b7608569956f3cfb370b4";
+      sha512 = "dfbc1ec09705accca52ff20fe7b89ff724da4096f3c2b835cbaa3eb7e16917b808a8ffd2d37ffdecfcb905f0bc06f0bd620ee200c01a653cce9ebded6e475811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "96ce1780836d7a8275024484134a8b8803fb082f608f61d3f00d7f2d0e48d308ce23461ddccd45049adad8a0cc57fd3ea3cb9990ac7c554f6cfb2ccb53de2c62";
+      sha512 = "4849669929700d2d68ced2f63c7fecd1a8788f071ab7d9719e69a63a8418a644e3c74ccc4028a27de160b796c0a08b33822890c355c8eef9512c72490d3d5429";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "75519c81200b371f7a95995d8f4f937f80339eaedfeea581f977f82d3f0883788a43d556f30f931d311a9613b7d13925cf76c2a8ee20eb0886ffb50dbdc2f539";
+      sha512 = "95fec85b73f616c5fe5a3a7da0f6b76efbe6b886c85cc7fdc66960ba6bcfd8348b0b77f599798794c0600c914274b50e878948ef317483598dbc4909bcec0be2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "b5ce91e583eef01a4c05799e68349f2d5271980862e4b675575d0dd191f1944e7b81c6d111c00b8c28af5bbb32b5e9fd8843a66389a04a2a3bde30ece4dc9033";
+      sha512 = "fa60e6bd7cdfe23448ab026c4f7b65f9b850f009cc7a3b1496e1e883316c01ddd67b36540e90d266d31c9698ec9b7db25e11e9324143eae7d3fdcbbfd80c2de8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2ab9f922a208c5ae1ba1d1a00ce719836d16680588e7c7be7d27a8da1a285a0be22ab5854849014b05ff068b65c6f52252b756308a9b6ea329f1b8c0fb2499ba";
+      sha512 = "c25b83329323f236d76783b17c192e4e5433b0a24d816bd81042ad082b0f7bd9905119277e2806645b0c3618eed880590c746c1516797a6ee0c633fe0baed102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "c61d64dc05293a3c88d2d4d06959779c778149180ddb0932891b2b0ddb67914b93782e827efab0dae2e3709a979e7ff34666cf4daa499a16bb42bfda4fe2781d";
+      sha512 = "26fe3799acc8e52768b3800bf06ec6ae62b030dbd39a6149f9a6623be55c031219125edc57505762c0f2ec4002d1c5bd1cc45f11baf36eb5eec921559c1fb0c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4d8aa23a3a17c2f8f587ec78f523bba59a4bdc1009bca4912e94a0f39bdbbfd375fd76cde61f074b8b3aea40ada4bd684255a0c4ac0d5f0291dfc8888e4e19f5";
+      sha512 = "d3c950fa9d518337e57b53e02daf4539decfdd12ed09768123fbc2d064006d99ab6a02856787c204e080a7ab7e222fdd94081f79982cdb1d7c9d2a04432f9e89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6b6f227762879b44bd6bc71dbd5866181b63760d28a4fdcbde1fb50ba746d9e1f3bbde2c0ea2b0e16cce156341593bfedbf1c484f339dc0a27c8c7485d9d94c8";
+      sha512 = "74ae91718c024a69c8135a6ea31936c877be690447686cd6e70c36aeaca23bf9899f691b65d705a4608202832cde9c4fc24b60c2f28e97363690a1160df9580c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f036a3799723d74ca21f81f7051e65604d11ee898b2b7a2169f6ee27bc6745a16b72ca1719b68e7b76fcf6023e982ffa6a372f136ee7fee8fb1c11b90de90c3e";
+      sha512 = "5a48173317d01e1d3d3b55972c22994cb6f90e70a4790006b2d077976f4e8c2776455b30c0ae7caa4c378a1ce88a7d33357e451e991a577d5aacc34e9796a8be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "8a8f4e1b22601b98a04b71dd85f3ae7356e22ff94c02e9f2ba1f522c30c7ec76e6caa3e3b9a71dadc3e4acbc9ca7c28e8bdaa2867482d2536179d9f6506f49c7";
+      sha512 = "2f24d7d6c8800943d066ecd962d4ac1047424e13020770c8585cc005fa22ee11e4050ca9b093d55534fb5dd60a76b79665067ab1b65d7321cf7f5bb014894248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "095629cb9b28eb3b48edc66c435c16dcdcc774b7478db0bda3e8aa3f028f600551cf4e190679aa9864658b265399aef27e9c64cb7544f7f06a8355d28f2c965d";
+      sha512 = "9ad81ece7338318f854acac4728eb81389327669cc5ed825f0fdcc2c330e6d871a1df5033bf52f8fa3ee5cf92fc94674b44a7f9e26d0d02f5000eb0d5c990362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4918f725a9a1a05bdc2e3056db29dc5e9cca978071c55ad5c8c1a87f1a9119bec0f434bde5c274b5e9e892b49c9a259cc116d1974e3a840f98868721796eaed9";
+      sha512 = "c031247ef411d89abc0d219ce83418b3bea2e261bec19e2c454e8206d80e78e1bc712922d9fa64091e3cf881fcfb09dade12ec163c628ffe17c8472f64ca8956";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1a350ab2d69ffa1a97b155c7093b5e0c06c8f1061837e19cce52ccb3755bab6e189de77f75771063710ba386b4f1116f58f289c56ad370d8b742ce038528311c";
+      sha512 = "2e3641e6c6d33d13bf35a0996775480eaabf4f80556f8a06dd895e4f90a01a7596e45a90e3e85b76cf271fff88f15b61c0f9e14cb91560556d159a067f199abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "1623e793507396aecd34cfa5cb1aea1f1ca5ec2007823dfaf73e929643fb630fddb4b81a745d9fafce1fa8b43662b8b09a522f2bdc2456b7e6f9512b4e7dfee7";
+      sha512 = "7ae337395201e2f269d09f8669838fba19eb222673e763a29f3b9324c939f9bfc365a80ad87d4a3ab15b20ccd55c25c92392e4d26aa47355d7649de61aa25541";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "6dca6a4bf4608cdd3869d0bde6648a3881d334b3a4bda20bff41626581204e972eafaa272f56b39c051702dcd9219d2b104e2cde9b2f90d0744709bb6ffc0ccc";
+      sha512 = "df727c8439b09423d11ef5ce8c7c38a767bf1b537e6612e3d0d7deaf94a70430ec9a2aa22de5f47b94dbbddf8907d1310f87f0794e251275826e5ae8496e48f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "1131151207ac3f9248dd03275174a3efba159445824a40bd7a008c2b07c28bc5641d315581e0d98a7982659aa2bf2180ce1e596645e0d780ac42247dde480863";
+      sha512 = "1ccb4a242d9bf02781cf81df7b62a21052a257bc98d64ff827528ed3f1f025ac86a8a87c6fb77ea8ec93f31ffdb6baf9f499dd3e190fe501e8823aedec84018b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "cad7f937f930fe82dfe99ca44d7f2173efb607f8ebd9725372a670abedec5fd26a390dc899ba9b712c9a533f6bf39356c4f7593459bcdd99a740a46dcf2295d6";
+      sha512 = "538d1f17a9914171c919027e3ffad15bc6f7ad4b649a037b168639fb1144db76dd78cb588c105f67f1d7d907b9e6fe2f17d56ee3193490b9be548ad384a56882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "a84b9524c567ff16290053cdca4dd494395e4be57fef0282e735795e082ca914abb390f916919352adf4c5d17c163a2d9316bad2348b35ca78529def36d7f83d";
+      sha512 = "fffc1997ba99b1407fcf2242c88c0a48db8a43ac3d07f28557fda510729eb52e542aadd514a83dc54e0b4c5912f84117aae05fe230080c9bab8279baf3818e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "eb61ad55d93c1e2be656097148a333b78b07c023f60dd9e2f02e9e0c12c42908e96313a05a5cdebf1a51ef210d66081107aeef476a69cf53092b992229365046";
+      sha512 = "28c88ff542004d78d07a19f0b3eae3ec6943911a755ea2874df3bd37f3a214154b7a023bc3519ee8cc8cc4736f67a01c7638a2cca558e905e7923c6337c8e8ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "1c73f4c230ce3e518721fbf7f1f536d376533f6e56e3b1f562c64d21b575b91055537bc9114163bd8c533b641e68d78892217155f1c9bd4747e3ee48225a61f7";
+      sha512 = "0a3676724d24ab7a625b768146e94a09332ff06502c7b1a72f82777875898a2f70717206d1798581d91d4d2991d872987fd4029df1d738f58b42b8a6d3fd4329";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "253261fff1c5c7363a96e185a816ecc59c16212fec6424fac394d9ff6299d33e27928650d2ffffff76019f1c6df7a69c51c16292d987daaebdb745620f7d1970";
+      sha512 = "9a1b12fc9a0a4f97fa40f3ef51cedbcad60f44b9d77a7108eb6d8c33a403d333b58f9641b9a85eb61df9bee7d2a72054c2684548d0a5ddfcb8e87696814f6704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "47cea191e24310f3b756e5d146015097e2c0cca02769f47213a84ad63039148e7fadf2dd727202a3854f8768014bff18672a6b9afc29bcfb0af72f418efeee6a";
+      sha512 = "020de326d0856914a43f1cbe4de14a95f0a051f99185cf9ff9ff122ce9c1edd9ec32f28101fdee484eb5c3380cb758108e309168051f048a4642598a2e4510a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "96118b013fd5e77802f7bfe7870c9ae07f10687f5ba71985fd346f2cfecb8fedbe86b9d9ec8895fe237d390cf168d1a14ea2bc9ce187d468fcdbe6867c614611";
+      sha512 = "22b4e8d23e466c67bcc13b47973fea7f027a4c41d4c9950bad65a119f94d32935b33d4ed93979fbd8145d844aa12a38895a5ba932e00319c67af0f5a76cdda5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "75b034299a822f78ea60c0c0253fe46863d4ba0cddbbf02e64d5bd551b2c5bdd4fc456545f1b5cdd553af47c03bad6afbdf1d1137d570b35414aad0afee4892b";
+      sha512 = "5c6c05dcd81a988065ff94ed8ec93d6bfe18e58e877b03f5610ad2269ae46b5f8e3dc3c3501ce95c5301b1221297e815276dba2753f8dd75dfd8e56b8df5e2a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "2d04a057dbb74a7745d36c85f58604d4d50d7838b7498818a6e900c7839ddf6f28bedda074341f8da877909330123549a8b57078723f3c2c081bddf5f61ce9c8";
+      sha512 = "244e0a6a34a6498871c599866391ecd7220339540cf3d0c3ca5047e1a9cfd2c79dd4709c2286565fa294744be405a7afe01ee5a7c6876bf51388b87d0e42877a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3877139ea20a6de4fcf2217e0ab53e1ba1cf43cbd10222b265a728d7c782b0215fdbd4a51bf883f2a089439b9d8964d7ee9778a5e7680c1dfa719763094e34a6";
+      sha512 = "a2516fe624f20babe6d5cc122298127d91d822237b7b7d86cd6a54ad85579b1cf2d63d133b17eab4f54e128cb71d2c4fb6a6c09bf55e317af26e2033f1f598f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "958a242fca0f27ade3f8c25bf9f12f24bcf1d7cfa51f103bf77e2e493fea7754f00577033a37db0130936ab84f0e03bae986895caaddddc705a439b0f1d4d4bf";
+      sha512 = "cc8dd067bdbe62fcff881dd4661138809486700145eb54f2a6c375523f98d8a8da92672049f745cf7ab6e67cfee669fb8a35f572aa6525404fbc18120bf7a709";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "375048d56637ddc81eb90088cae26de1ec4ee8f25ebf8ae9250032c25737917306cfd39a65e3302d85c1573886f7b829b0dd3ced7d4b7ba10ff4389f27227861";
+      sha512 = "540a41b4de26732c30ed8fcdacc596373e3d91b4555c6d622ad169b44d1f54051d6a459ea7f1ab36711d354ae2c8e65b9db3f3f318cdfb49ae6a412aa9f54d2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "0fec26ccc4393e904c31f40d78a784ec3d0191c75d3086cf9efb0b2b64af93af493e2ef8747769edbac70758435ef15d2d1890af1b44ecaaffe2e52ddd5bebaf";
+      sha512 = "d86c89ef09d63b596769d96c98e05ccff275c435d5299877023d59283b26506d1a1ee9a4d22faa66b2e4f9e8ee92984bcc506aeae807e40bc0a856d3fb2c3fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8536c434b423bf969c167b2f9b40391cca26904cd76f022d46a9dbe127e3647d1b1cc4dcebe08d5b243fe7ffd115c9e3cb1607e556719210e5cc0ad7b10c7aaf";
+      sha512 = "a2b087b07764847347474b5181b161def7e2551a206cc85c2348fd36e490ea4994fe6e14b25d3963993c81be86b808dd353c0bfa768ce7406a7b79b46d04c67e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "ae5a493de97a56a15b182eef69079c1f5d59432259b85525a32a396c4537c9359bd41eaaa870f74f680b345cf9c06c487e6b9ac2fb1b5230b404b3e7eb614029";
+      sha512 = "68928c99f7b18bea8c9451e77d0aa125187547f9f2aa6e8b42025ddbccd104e14352ecafe9a242d59d3ecd0fdaceb59f7522ce90dbf462bdc443a40756785262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e4a42d0e480313f3346f50de408ed02dba79eadbab368cde5a93542bf0c462c378d79f9e218526667d398795e3f1665f5b89f44d667a34b88560a2d8354dacd7";
+      sha512 = "12225c779abbe923419bb9824f1e55f37a68f70cfa4e847ee6a44da9cc6c1fde6a97720a2a366b8ed8b3ded9e58447ab6705bad30cfc09a3b51729853c47db71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0a0d7471a266ced527d7abfd36eb0cfb768d5553efcad7a2e19477ebedfd4942af7d12c123babd9a1791d8ff4c5a5712c74f3595e1f89d9eb0413bdb81e7a624";
+      sha512 = "dc0ee7c8ff43d1e595ebc5adf3cdf7d95a55824294af4542c94127a21a5ec0ea7f8ceb6d3f5268669720d928df2cf9c307899141e3e0c540db4779db2c9d09d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "6390ce2250cf20e10defa3d8d75098d5f9c58919f57415bdf742730839958bea2923e9eeccb9bcced97a594c67b54941dc1e1c3589d7d255632b32b4c7192799";
+      sha512 = "2c631c16f8a79ca9fdbf15b5c0c70eb6728bc116030b180c921c1573cc470eb7273b5602d058c88e49be1320da62be5d493050574711cff7b6f40e6ea013ed82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c853583283645099dcde8849abd0b3b6ecd98e791ab230ead55cb945b4bca1d91842bbc0cc65fe98dbe16cd284d8f66ff053be643b11d0ff4da17f078b4cf749";
+      sha512 = "2a94ac3e7ef69bcc5949c1e920f55dab9e8e18c1a245763aa215b89b4bbfe1ce08bc00ef463e1edf66ad55b141335f4b4bfc0b09562639c80e9ef48181099643";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f7cb7accc1c44205fb893704cbac0b9c08a6a36bafe88098251a57ca80f69699ed04f27b43c0be43c513410a91e1ed391c57c566443e8d7746de5797619b6290";
+      sha512 = "fcf60a56ef5d9bb195368f8883c5fd5b7a361e68377b1bea6a3647c392d3b818c01f17277f834e99bb55f69d9b0c64910df918504c09f3e2904c600217f2d262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b6f324096a191c9ccf4e5afc8eb65fbd3bc6fcca4bebb1abe9ecdf7b766ad14ee4a598bf83e341e47a28e13ddb8ddee5204f2c9b906b691986ba3fb963819f27";
+      sha512 = "83e34b538d183bd1c0edbae19280537523bbf1388b30b91a5220430255e824c6d8bad2aeb1e15424857a6a826be1eff5be9af0b29a57d637c061e2cd6bcf4fb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d4a9d5cbba8d840cb493819af66a03bb612cb173c2d8b1462625adb8532e512d9daa0f6a49a8771b3c96afd508109c16a17a65228bca79befcd3bf565b707bb4";
+      sha512 = "f1710159346685fa87656b8cb95855e97397e0b82d551b7321ef709cc0ab9e58afd5ccf3613b45667fe092f4fc14411b9071127b1f597fa97d5ec43457b91eeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6fb875991cba1c1edf066f9ef44244c1969ff5204f36ab1c643c606adf81b67d578cd861ea16cd2d2aaba1ae37f24ebcdf58248cee4af37d11cdd608e28a7d54";
+      sha512 = "0b2c26defab26023295668bcb5332258b855f1b2477cbbd284cd36c46f355921b072069e523db621de08a73bbd5d2f773a7fa4aa1d0c980cdb0c102cf7a99c74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "40b27493dbacbff086bbb26396a6a2cc717c4b617c021fc4c1fe488550c6a5f7587f7d30ac6e48dfba91dfb4351b02af4da78082a38da5b64fe843455866431a";
+      sha512 = "e7ec02c1a2a5246bd2411c5f277fef6f72c0f21e5bc1bc3bf0b4fc10e384fd0442c092604e46546bff9a8e33f803a6353293949f4f3310b9dd67ce79e68c5335";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "b6a2ae45054d1abaf8e6e0bb58664a5a1e8476bb62f8f3cd3005121eccf38eef68927d1a46de6a6fec48586aee5ee441767e4235c8d6e7029baefea07fb0ebdf";
+      sha512 = "8639b3c8e63f8955b46440f9d5b1b440c90fe0be9ec730d05312bbab26e15d96e8f1695afa65ece123615bb3e03d8e808e18483fa815b575c893840075cafdcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "55d0e6a65c897da608f6c3ea0a6cb6299ceaff15d29e45b34c3a52ff03c85ab85fd2d39c56763f0d589a9ef5085feb3af355758058bb4c9bc12dbbbba5ac7b4c";
+      sha512 = "933be5812db81948566e2ab6216c98cbbf6f1fad32bfd9a5516f14cb2e6bd59fd1d34f1f608d94d3a832bf616d75317e03ef2fe797372cf0bbf86240cd47a414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "22be622ed7c9b621a0782ce727416b78ffe81afcc92b5af840a895f54cedc843fed1fa256bb452d8b5ad721450e5b635845b92e621b5555b98a6a16ca59b29d5";
+      sha512 = "3d1b26b26fac99cd8de9177d56aac1f94785dd22cd32f94f5aa091a4411b6c1e3fade83863ae3badd786cf568f966f469122fce332d433682b818ea43f7ece6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0442719c3303a9c1f4de79777a266bb1b7544c8b570a69e49746c9455edfab9aada9330280d6c406c5e89054d15b1e89d0935fac7ad4ff80e2d34159706bbafb";
+      sha512 = "795bd13c4ddaf19f4038658a333e8721d334c263ca57e887b944358d43bb3a682883fd3aa7b2e8abfaee1cad5bda3cdb3828f6f9f516c62a06f5899cba660af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "9addd422b92067287ba5cc0f5ac14b662d55be8ffb65377e13d5a314c8a486057007a6c8287b8e79dbe12fc59e05c5c09fd79419cc56f83ff0ecffa816048224";
+      sha512 = "bab45a77e2ce6d3dd2099fe84cd29a38154209339c271d35219b36f47d5028e87af0cf848e8938b8078bd94be04ad43c6f854de929d9bea78a6c029929e6ef44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "2043201d4622ddfe333f755191a90290a533fc93b27e8ad2a10e75a8994e56e0de9ac08e391c49a48028252dec96bcfcfe14c1d6c362780ee25f02296969d592";
+      sha512 = "7b3f2df484031f9273b1efe6f178c48d2adea19edafd7dd97cf7d7056153730452a1711eac8b6303e069b0db063192c4678dfe6a177c046574984e47934f170c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "365c0f66382ee55f0cdb98770b9e1ed31ad757e1aaab389f2de83f00dc8222397f2ffbe25d2df720715f78e1af19cd3c4c27cc1d8d04e2505fb927474d9dd42d";
+      sha512 = "05155d10057257f05baeb3803613f98665a43bab3a0b24c3f6a0900d23bc397e30fa28cc63e94cf704e3c505f1f0e2dd73b08e2f96471cdcfdc626e7c5c702cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "5dcd18d55864e767333026b73b1d931095c1d7845ccdf165e8a6244a0fce84319ff9e7ef212a4c69574160037d231c4b44edd243e15896b79c6e24f14307fe17";
+      sha512 = "c041d8f22ad8aa0f4ceda16931ab1fe6121e826280112dd9d2e991cf24e77c6d333175ec449fbf26c44eda79fe80380d7b17f02cf08d0bc23c4528ad37a6a5ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "f5e7683eb473e8c411379515836e669aa9755af26746ec5c56c2f6566658b93bd5b8da44e8ee40789d8a378d19e9b63b41ba9a3da95bc82b85f43d0ec34089a1";
+      sha512 = "3a9d92db8de44c70eb4b5088e05f957ee1dcf4323bfbca4cfd1fd9e62332bd62c21e1df11792cdac4abbec39360a3297730a794464f6178fab7346a3175e1d28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "e33cf86b0d591e3a28030ec7c7288a0c97f6258bb7730e7edb850840132ea96dd499c8e2f7fb95e09acc344746ad83458b1d32615debd86d47cf2076c298ce46";
+      sha512 = "12ba06007590a385453d1de574156bbe896a092db5e25009ea5f2327969c6affff9d0960aa42edb4bc087d9477fc4160f3ff579b032de4e395410530154bc737";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "c81cf96e7fcda3cddda4751afcbe0b7515469df72b2bb1fc165659a09796f71d29fc70d6c0bf14474eb81b95490dd160ea4dc7b2292696e1998140f3198932ad";
+      sha512 = "8e7c4e62be76d105ccc2748bf4b017f7bdd0f646ba17ad11e7c1cb14ac2aa7d612bd2f9cd39988624ff42fff57f93d27b9e44a31f8798aab54c1ec55ec027236";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "af7fc526c199b75fb8954897d785ebd7f3006b10e5c1306690fcc1161151197892b802bdb20c389be1d8a799a3298b71fcbbc4eadea7802ec4f163484440d4dd";
+      sha512 = "fbb18fb347ac5319fa54366c86de16c615be994a7d3c179dbdb84c0cf349d53b5a9f850779a5c0d2fb4f58e14d2e18089d7856aecbd62c1cfb57382623a67612";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "906e84d4963bed5a2ebc1fa82a7e901f09ad1e329db89e52788d820cf7aedd8f98c5e4d9ce3ccf9b7171a8438ab91f29121a78e40685d8230ae5726928295d3c";
+      sha512 = "246b9a718ddd70ba11fad500a0613f2b4feb62c7d6b483fef0715a0830ec09c2fc2063b16f2c1413b74dd0f57a1a870d9766e3740aad06bb131f1d610adf6269";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4954b7b1d4ce1028be06d639ca9c68b0e01febab75b4412d6d1f1ccab323add8d95670944782183668a537c44739b09fd3a15eda2db9f0c4643460f21dc4bb22";
+      sha512 = "d0d694f4ba0562bf0ac990ef204c3d517a0e7edc9d3f119040e64c48fa6cf54a0ca945e681b8d5e4d89c1d3d2b9b895a324e85f0368e1bcee4d66a85d22c3913";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1693a9ac213487a801d018f7a9f6e8ef61baa8af2c41cf55fc40f320c2d0e6a0b73283725cde09fb9bc64c208a4b9a13825118f0ec7e50cc2c61dd5a8b38b3b5";
+      sha512 = "7dcd9e91b7227361df55a6e29f16af72dca0118e50c563c7ad2ef829aa016e1bdc7b89ec65917f572d8e226a0e7036d9642d0dcce86d5c15d2cecfd19fc0ad8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "963078489d625db3ac61d38593e5e2e8da801c7205b3622439721da3deec06fd8ac835c8e0ae9eba07ff050853b85f4d3c6afda7a50727244a3c73b9c2bbadc9";
+      sha512 = "c157abe8b5d69ae2777cf39fde9dee27eb244df6db00c5c56afe7d65ec1d3c78a7b4df0f6e6b681be5d741d61c05a9d9c56717716a87d914543bc0b8498cca0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a437cd4e09c26a4ad86ee37715307bef9fef6f2ac1fdc117ee6793b89995c0e42d2e77bd3517ae2e047faa2ee3dd22a8c2604d5bd285b5283010cf30173eae49";
+      sha512 = "70465733dbed4ec8977fac3ecf37c96e8a4c775537dc413559b1e9a1f2038ae5788b3d9b3bc7ab57b39ac1c1aa30f13f5e90b877228cf02c1670bb378b4014b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "6160d0412721f299dc119d5046052e99e2c64dd7f298cf1704d7f0eb6d25123f1fb2d5e6084fe1b347921e49f041798b49f696514ca04583ca885eefabdf15fd";
+      sha512 = "6a537b71d0758d25e97403363d0fdc3e7d311cd2a4ea818bbeaffb49a302e788f1727999c49ac39c6a242c31f5ab8ecdbe4111d28ff62954bd17e991a285281d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "8f995ae9b50c0eab7e8ae2a7206ad556e52122b0084b4f24b807f1fbdb4b124a5c539460610cbdbe4f90f1b312b653c9ee52607ade9a1082b270694284e9dbef";
+      sha512 = "0f427ba0afe9b1a09b8947f0ee0de89c675dab2e5132f37ede9159f41d474d386127a1f1967d77f8032d1b48222a8cc5bf9782fcd1bdb3f635154d614a3a69e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "81ef8a83df19437b37b0834a15077ff23e084021c438578fe3b38bb66d2c6b37957557e9e5989674799abfb9f530ebf6ade8f0e25897e6c82842f80a6c36ec50";
+      sha512 = "8fac0c28a7470ee83d559feebccf025f1a4f4802c92baf7fcaa87d4341bb7241727dadd8d715d23c4896e7161a9f6ba708a8c72296cd86281b8c0ed47628230b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "66b0645cca9f77f13fd2c3fd4d38b71cf44567cd86d58e649cbebb1ab0b07d3ca96d14d2b34e33d8fc09e2ece2c4fa6c253f4d55b6c8414b78e95b9e8c4bfe80";
+      sha512 = "5cde88175b0cfc5d1332b7b185257d9558c3ff01d8e9d91180119116d14992be94bc29ad5a4f907dab0f8027720b917a01e0e924018c74d29ff9d25c3e9f3ecc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "666642c10644bb2f2f3e31bd813a3a1c6d930a25c879130250a8484d82acb471b1a169181ce7a49a01c6ec78e4e8ce61f8ea5918b8f87715312ac07adb087120";
+      sha512 = "f418fe4e55c89e75d243c85471b3f49fcac3f910c5d4eaa6b9828b201e886d931a18018906a37df9ab23e61af3f90cb333098fddcad0da3b0473c14d716fab18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "53a6e801c45691cac7e1946da9a018aff3dd1f0ccc89d1048f31940e0affb33f7fa34e258cb6bd0e7336369a1862a9ad42d0e2c782c459c9de245c99b4e58f70";
+      sha512 = "2f3aceb53c5bded3e826cfcd9fde465e420366fb0cfa6f49c8f8e614823d3ed008b69544873ff86e3b6eca4be961b0e1c7299d02d39df0ceb51eee3f7803e93f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "11b09786e4e2ab89c814560822067b60681eff0ef43ad5479df5239c729326db6cde52a535600c3b4ff8d9113327cea38224b3e2f54639df868357d08e0e7bbb";
+      sha512 = "f6b36def280b0541be3920e05649b488cbf3d4f55541a160373fb3a4d5b6a7f3f05fbd1d5730c479c690fbb44f0ea5bbc1ac3948f16d0e8e3f54352a12fd3e1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "da0dd10538f0cfee6f9da54dfb48886e7dc74268a4e800f8b5e4e91fff1adf4b1f0b55dfa30d534d82200d7dced710f2e19382b6eb7e48882b18c6856939413b";
+      sha512 = "ffbf547964ac4abb1bfaf563a42f5828227b37fd46686318a7ed73079af30454aa3a3972ced2e887cb1d95ff048b0473ca2a210084179bf44c47a3b394c4adc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "a03d4b60b08d8379c21010f39065c782dddf2c521043f10746dbbfa83d01a6e4fb7d9422cb637b8d16966616e06c2e631452da1a3da491bc7a18a8ad64d6991d";
+      sha512 = "d3c26b9a91cab7dc1a0b4caaf87deac657e05b8164feb5b167b2af7b0591db99a5310bf3d4ad90687d5761ae36ef00ccba8da6dc3e2e6f5be867da69bcd9d0e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "95c0c4ec529ebe05115f2e6fa31ea9c41e9c543a4da8e68ec911a436eadda7e7f7e3e6cc6f0422d99102e839cf8e19a300e0ec343d1c8f056a84e14e682b40b3";
+      sha512 = "c7a8aa830cb8a4f2eb69cac3c18534c03e2162f16b999d21b6b17c7b815391c26c7561ef4f8509a0cefb6fc22647669897c30e0289b1f91c73927b80a0d5ed73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "32adf28b54a7981aee100f9649e75d24ee0e620a62ab814a648caf901a504c483cac675e7c5320f777e2fb02e56ba38e6828efbd59c77d0425642289b99f3178";
+      sha512 = "8aff68cff9d430b0c7d25040ad8059e6c80f058867e04eef5390481758c4fc6a840e194edc4bb57b54dd8e9d07b26c17fba016a773b48f7f771c24a1bbb3b593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "3e9aafd39dc1ebda9ee0789c6ea58c25f755c73d70e1c5a16496c81d4f6b222051aa5b46ba3f98319bfcd767df1bef50ff90f81284441758e7b134c3dababc8a";
+      sha512 = "586adc6942c53997f6c6bb44263a8aa6089c4e9fbd9b887e4694ffcb91c478d44c3972f357d014a8f10b7cf23a85831f75224be6696bf7cd4dc9bb66ec01fd48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1e4f604e74be51e1f2f32e472c4d67183b46d85661c08acac4adf9de2a632e3d32637e92cb5bf2b9141babc136f15aefd74a61a3d7210dc8fe1bcd119d6cccd4";
+      sha512 = "ab93b73c7cfdee88d4d6d72d0c2d34d88705c50d41a29ceef32360d00e4a0a6de97fe33ee2406733ec233db22d4be5502987c8b80c67e588e1b9a3780b707d3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7491c8c5f9ea457629de4f907049f5a67d0c412ec430eb29f38bd7d771df779d70733f839fdd1cca978b1b8b89f7b65dd9a3d3af3848dc1ddd5f8376af74efa0";
+      sha512 = "9e981a209491738f86c33f6a7dc8b4f9efd31fee9e89f2b7126c9c160a5304c48e2be026946dcf684db68c1728e3715994d665fe5078e7638c8a93a30ef86165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "b1bb46337e10209359b83466fa19d9751470b30434a1d58a030c2bb858d66bbd736ce8e3790292974b069a6dbcc32939d0fcdcc12b64e3db7fb58a9695c2685c";
+      sha512 = "f3fd18886957c4d8836cf45ddeb7d23626bcdc28992a1b9cbee941de7ed6aa8489187e98a2b7a2e675b8f40e5d3ad6508f8bcc8b910cfc8b41f9cf74a6921857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "179c0975bff295c8e052bac86224d7b36d4ae35b6788b0de88e36789d7d3027310515826cb96500c251915cfc936c4762438724552552f17502e913b4536d67f";
+      sha512 = "6b03ab97981e13a6bc222f88e5a3b53051b4549d6ab0c36a39689a8448eeb20cfd5b9d401e6bfb6a99b1f85f0e91f98d19ec672c1ef2965ba5a35711f9280266";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "bf708a69c2bd801b34ac349934609b5dfccd9104e90b5f2cea09c0d9eec3f5ca4229b64cc2226285af8091a556535c3fe5966c30ee97a6077e190732124f6dce";
+      sha512 = "03611d923646638cf4109fea5080a8c874e4b884bf124a0da4b6739bd863b40dd32b18b2845f8fe61cbeb280ab2e82f68d1f7532af4c92b8dacea5e92d62f525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "77aec4b603d51cab49d2b055bac3036ffa110d324335ea0259b9b8b290ccae717c20c531e64acf4ec287d166a11a888c1fa8da82ca35c75fb68fccffa3a55d27";
+      sha512 = "f7428e4d06a76b7b3e134acde8e9caaff2db336e7093776fa2692d923d427e667c78df3a09222835248b029b05d13956b61170bff310e7444f0c3572440a1d6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "53981a550e4e2756ceca86f8b6b23da5a7048f9244bb84fd090cdfd801a9bbff6ecdfbb8bc54146c97936e7d66256c3f9a3415749b79860ecbd8b1f2fb6bcdcc";
+      sha512 = "e828d170628f1573c6d4029a9c8708aadd1846aaa76fc5afc50c44792235c060ff1984800de78ab7875a0cd821f53adbca419864871160d489e64f77d2ca513f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "621ce46516f18505868304da207f12c4515a4fe8adc255fcdd86d61a475860093a8f6941902f71cb9b7772d2e0fcd8411f354477bf5b18841cc48cb318f6d1b2";
+      sha512 = "94c00340adc8d85c52db3dceb604f5ac4e686b274f6bd130350d6c1c2d48fde792dac6feff1ae19f46f5a757280f0f86a352434e7f8066fcbacfd9077a831cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c46f6435f7e50a498ee0bed0918941265aa160d8b932a2b668f324a6a67b82aa2e96cf1a2974ec66c69c1a6aab3afad98fb753cf7d26a62a8d78148ff1343e75";
+      sha512 = "508e1a7aa0dd250c1f50ca8c1a05c02c488916e6288d5d45345c4309a96bff4696f1f365bb88cace1465e8fc97073e58c3a5be69beb7e03b47a178abdb416de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2e75b0e3e25b6c2de02590f922755824dd86cfa46672e0a628fc3a316892e83e08409d1ed7ecd523d878366e5309cdae5908b41bdca81b6e9e6a6079dac1b77a";
+      sha512 = "6929a0a72b082a47e20dc0ce41a6b982df03f60469f3f31499921c0b293c755869b978e224e90e4f3a75c41e88a635bd231236d72fda2fe50cf0f6b314178c82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "8298ddf054f8e011e8fddc517dccd4ae0caf73bc13563b5725b5422e8d6fb1d3e59af216a501dabfd5a2b6fd824b62bd944776343170948edf4fccb414c1d607";
+      sha512 = "c1363abd40a5e76ff383c32f9dd58931b692c1c7582cd1a4d21fddf95203c0a34588075e4d420fa39759844b9c0bfb9916af06ce260cceeaa2f0f1efff37b2d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "99ccec4cf5ee280a14c680755b190e3a1d011b8837db405738a36b998816a805d664ad38113b5cf64696276a8d8acddd0daf248aaacfc52ed1178ea6caf32e2d";
+      sha512 = "95d2e14a1b77f5a3ca6d113ea5cad2a7fc4a0a8e21c7c40162198614637c0844547261a2f14242fda2cd9053391a78f3e587f21874b798e8fa522bc71d62816a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f79a4325a3aceb24fad97c191d94d9133719d176f00cb9ee43ca275d29cc582b0a27f6a06f02106bbccd85b53791b6f2e0a7f751d9d0eb68bfd5d34a332e1088";
+      sha512 = "75e8cacd919ea8721102f6301e3b855d398e9ea01c516fca6eb7e94e24cd2ceaa289b3a6ca4afdc658c70dc46e2ec9b0bcf3086b70ce857adf7f0fec31996d36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "abe2b26198a4d94c2842017d28e3a23229d6c67dab99d436760ed2f7458bb613f31b9f9e56b453f4d7c1c398e681fbb6135f827a313eb5b1ba0a2964b042c198";
+      sha512 = "aa48016df099652eef14abf8cc774cd83c3c839d9fb47a6556ac86a4bef55d80855ff2aab810841e9c2ef86c47b968f57a27e0cd7369ec30b21bf29b423a6a02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "c197b8bb1f436ba151030f663e686ed41efe6d3dc162551fcf4bbea1d6de0f08354308323ecea722f2068b36503b6a896542fe35f0bb44d6e4e0227e033da3bc";
+      sha512 = "f40e4e169272764a55332f868e9a6b19ef54d04ff312827a0cf0c3792a2e5c0264f62b9cfb5939f0c43775811e350a4913387e1c4899293b7311a2b1c505dee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "5052273c867fbbd433c83acbbe701679ac073dc468ce60516aa326dc798828a03d7bb8d52e14bd45d0a66d0da4f5c9c85a7877ab99565259c659734443e8383b";
+      sha512 = "4a8ba1adbfbf88332adb40336b986a42f89e4789a8e2da2ae485041788bbbcbca56d971de43ae640022647a3d30760b4b5e072afafa74df0ca90449aa03d93e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "29bd77b97746166569ccb56ed32bbe4122957fc00738a9ca246fdb2d6dbf4bc1537f53bd07153c4e1605937795a7cc37257618a83676ffce7af1396a626d227a";
+      sha512 = "2ebf6eba002a877ec2d3a5928a46d6b39d5acf10fcf4c0238695e821bb0e0ca2ffa7230ba3bd910ad50f429712f4bb7ddf8bfa365d23034919d3a8e4c19188fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "a8f0b2d6d29ab10053ff9a90fc44aa16c98862337237a5c45c6e4dba98c96545e8fa683814e1ea00d2269cd86f12841d7fede243ffbc3dbc1ee1d7e51cdbebb8";
+      sha512 = "073224f374af0b25249f30112edf86b32fd2612b571b064ae4668f2739cbc02a33df0b5a459048ae0ba2d784035b2309671b61a5a894857edd2ef6fb5181b120";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "40fc4b9a8e6c94199c407e43cefd14c9bab34c2faa4f80d0452519c2a286d77961421340d5bc4103df81e0de6036f058db06614b89d19d4c273a5f7c81d0aa4c";
+      sha512 = "b654a0ebe06c63d9324d3821bdbcb8517a50274c3adf6e5f24ffc334649eaf6583774af15bb485f115c129c0ab5c66b31a17cbef97bc9b4a65c1ad09a333df58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "9c309cc9eb2fdd16a33e15da0bb67998b5d6a1a4768723898293dfdb0bb38138339b566324767b427326e7c89600da199f33a8c4ebadd15cd74dfede718b0e8e";
+      sha512 = "43f18c506cb0964f860c12b16722f2c53a0312d007f00c4d248ba3babaa9bc1363758bea6b6a7207ffe477cb23e7f7c151a1578a49779634b2f8d208bcb97e6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "281cbcf67bf6a75525b84e6552db454a481cdf92f6382258f05a4081eebc2a4db0ecf0a127f9c99c0d7bfca7a8b33850f2dd412ebf23f3bd2dc794d51a312ca0";
+      sha512 = "f40697b407b06402abb256d17322337b3ceaed07967d88f65a4e560090a0077a02fd96fc06c5937b8404a0d96353cf447ac5cc3a73c655224f65ea9b21364915";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "bf540d7ed9ad4e3290f33105bfc228ed096d30da7d99fc60da3c2fa386913cc98c3202666317fc8e52270ac14c5c778cbf8385f113c723062bbd61c18ffe128c";
+      sha512 = "00930c704aa3ed6910e6f0b03034706fceb7ceb6ef5c46b8eb2c8af4acf1bca331b0432f3b18419f715b4ba862691543e5d539ac08772090b8d1d15868854087";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "1838462fdedd67e5be3836eefb5e06d2607bb7b18459514c5a16c4e31d84910c44e3bad8a3c1a492a96ac60b68fc123214288dd3cf22e067de3cb19ce0e88faa";
+      sha512 = "baacd03d232c645a06773dfcaeea6597672bc619eaccf5bb2276ab66737264c26c050a7d8f8f6fd8a69b3ee9460d0fa3d8308967af22cd1a4ae648a9f07a886e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "323b67ad29b15e809e9b7d5601abcf107ed4d80452f27e47edae9baaabf664aaff08f662dfe049ceaa1588ddf9efc976c220eee5b1b1c623447c155fd4f56971";
+      sha512 = "b27205d604a460dd45bc4c134f76f396fa9a9cae04da1cef936aa0a75fe3ecb683b75c88735c468660d8584a2cd0b00f867a8411e20465d03e0ce3a57b2d9ed3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d54705ad2391bc0c4015b0729f86f651e321ef15ac4af72e47f31087e3ba87bfddcbdefcaeb17dcf9dceb4bebee7665785e06eb2537b56f2a22cb55afc7091b5";
+      sha512 = "aef11773f1498d65f5a4d81f8d411bb73a89a134239826589842979528e44898a4ac8005cbbb42fc1eb56c4eb0f920e3a89aec9f27ebcf1b922b1af1b037ce92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d5db33a8ec5dae3141c6b61d23b0bf3c33c8b2ebd5e29aa71adaa5e03753e646fa45b56cfa4961609580585f9ecbc5b8b899f9bf3ccaeebe036be450740fefc3";
+      sha512 = "a50410b04c8ecf83734ae318d1da075844b50d6bd9147bd92a7ef1e59effdfbcc6ae2c9bb6d01a03ef3a0364623c36e7ce7e78a6caec5d75a561ac1770285282";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "7507d710c231e8bda52d01d7ca757523790a61f9e8b3cd87d7b81ae341c62fbaaf7b731658d21bef2a66f7b9b65135fb5863f7043dd12f2444d72c3dd89a8d8e";
+      sha512 = "ca09e94cd945c182e43b4e661a50f0bf462956c438c83fb180a6dec8542dafa9a46bbb531e38cae30ac5facd6e2d318eb5c74dea86c8b4002228da5124c6c38c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "98634081c0976e04794ce53f237ec7c9bcb7dafa106accc50c6cf13ec2e69c1c2e70e3f6c8e3b6f56a7287d60fac632ad027a8bc5d0fc92cc86296ba4440d160";
+      sha512 = "03af81ef5b4472877ab0f5977876d4713f7a75759bf8012853429c57ac11d7d3c71390d3c899d653438df5ded9751e5a9ad15c7c7550adcaa04920d473b6bbbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "25c77c8ec3e4531522991568c0b380eeb51332afcf086fef9c1a6a583bf615cd4a7fbded7d4fcd292ffacf79ef0f15df92d30f394e58c20bf43888aa8bc155b4";
+      sha512 = "d6d2ce2c896cc415b84a06a9abb8727bf5e1c71469f2e1d43ef98f4ad5f854ea05b5b90505074dfcd3176663bfd50dd64b435d5aea061f5be9e6c9fdc4f8ddd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "8a70253983d92f187bf96037e4c319961040d8709fb4f71814dbb02b48d6b4565008895a5c0708878680963a2ec04e9ac90d207cea381ee6ea33cb95c6aa9727";
+      sha512 = "9593b5d051b3059b98916ad8fa2d49fd436d76270d2f3542e33d58fd9f9a53fe7706679224cd34e9ceb519c5f31593c390f8aecf055302d1edfaceb4ac8673a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "0845c354ed3c31b31a9d9e7afe6f573ae1fdffb990aff5cf0a6d100da27cc218d6245024623d665146d7793b6cff209effa9587b6999cc0c5c7b427037616165";
+      sha512 = "db8eb5f0203eae6d21717d52d879c229edb5ada4cddfbe60909914dde9f3e8060e85a04ff865e8f1fdcf77035299d8003abc8e380cf02f41d4c45013c0652dd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "6bf31f8262c584ec8c9b719736c516eb179c5f66d384f59761edabb606808928115a850f278894793b392a6d16f9008de5edc8efd1d8023a55041ffdce2d5a60";
+      sha512 = "59fbd221d80e9ecac9021806ff977d988ff5487e7e0f51bf89e91d0ca20d55c2ab492dab0f68c47d8502a0323004a35ed027fb5bdf7f781ee72b64f4b796c473";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "cf2a01c6d0ce55c43a54afaa439cfb074260cfd4e03c70e2c3a6eac011ff4c77c7fa6f5c3fcdec0823066b7caec7230d46911173f73ed65ccfbfb37d30c9e156";
+      sha512 = "ec20f49c5f208938ba94aa0a03fcf6b85b7d987fd05882f4a473a7a7f776254d5264841bd718515e1e35fc20e69e46964f637d559e39a38567749f9b3d4db3d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3eb37b8878d2cc28cf385668dac9c6487f76d9c1dd834aa2d81b5712657e3a5a76b229e03bbf9f5f464df54d2df412ff2a4aa5d78900437bcc2c0129317c825f";
+      sha512 = "6aa15d62fb495464518761add56f9f373059ff0029a7bd18115148dd23c9e88c1e9c1b3a23be2df2bd33380856888f58a7c39943453cb7d060fc5cd5619258be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "8f66f2d505fb113cf48561380e350632696201e207cc4a39a6757dbeecd923172fb5ee6d58ff771f8cb578e95c1bf01223c90fa14d4a1253c199978a499a5880";
+      sha512 = "e0c11fadff083ce242ced4d76da9e6187c621956ac77524733394820ffe720e3f9470fd4f3485dace497acc1ba04a07eacf9f0c115d081f8a9b107f4ce1f4568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3828b306dfaf69b2d5b97ed2d026b40e7d1dd323321712bfd746e930e62c0b83b27a7ddc225c218dcc08ff314104e6287bb3e010985f3df30ecd630d22c8a0d1";
+      sha512 = "9bbe79a5d89912a4326af31b7c66ddff443e203835ed306b8cf2f409d08f9199e1f588892f349d1578810a618fa8692323d5ecdb2c987bfd263f3f4b18237f01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3eefba51599529796bfb02e5ef558077f0fa65db9cf856d9b189a323284274827f2d10d7f16759a28480167cce7c773d6c59ad7802c303ccc9d7ea8bbfc45fde";
+      sha512 = "6ce14b5c4f7d9c82ae6b62e08508cfd4f619800c59c59290943e1c66369bcf87e05029441f6f4141311aedf9d13da000763258da67e54e5748efc0b07a76deaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "1a15fb14c63c741c068bdbdb2965311ff367acdbaecfaf174a88b42470cc5e36ad190512aba8cda7e816d8d01449cdf9fd34203fc9bc868124381f5daf527e17";
+      sha512 = "4c457ddf3cb1d1fcf35fc27f405ea5bc9154447e24ad95d16f768768ebdc800f6e7b164b0366a05d2d9c2810a8ada43eae58c5e5e9fea033fa67ad3a306aa9f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ee860b0595d2e0a9341d03a49df3cb82db3e272dbd258c791c1c575e5aaff3e29c755054425d8dfec0beaf47af9d05e0266116fe00a3e5ef5e8c298a31fe492b";
+      sha512 = "ba010386a6bfad89da7bde1cad05b88e26abe485e664a13c92bd97d247fc481188d44da1d20053a157df1024d658edb2952d7d8b1fbc6821e0e8e4d0a91388d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "c4782516677864b28e5ebc01cc5cbda67fe7ce2912adcda0cec00958f2bbcf6ee2107b622dcb1170d32735dfceed80a2670f05c6d879ff3f626b7626aadb1811";
+      sha512 = "0bf97c198c26cfe13d95f8e7b5f6faa7dacff5045c1b030b5ddf3916936965ec47d99e2743e0e3c7dfa83fff1a03f588fe30632c13d25ed7a3d417982634403a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "409d4a385efb0b1ef61d7192873839e7b1d99aae50af62c8e7ed689230d2588b3d5b6d197c3c96f1e7ff6b41551880200ae2d32c936cbf4a5fb9e00a71251070";
+      sha512 = "c6a229f46eeb3623dc94394b2110b1e8f2cc854f82e87316aeaa01dd409267fece25de74202df41e50ed34a89a75284b5a32e9322ccf771bbc38cda4fd7b8f66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ed3b6f18e54df3d342bcf7674fc48c84a4321db52af779aabf3d3150d96cca9a0e86314d4ce1476894343f5789e227db5aa8d8dc0abce0474d215eb7cdd3c084";
+      sha512 = "72559e85a3be28e3f39daf4a2464c9ecc48f8a6c911b0db4183b6b5e897c25a639a30c11b71446799c4eea50a09f3f02031144a930b37b7ea9655e0235b2981e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "cce08b4cb1b820ca5bc9832e7ed19e753cc6db066e3bd007f58ce713d85976f060cae4b221833e085d39effc5a2dcb288b6fd89e4a3ec01577afe19585c6061e";
+      sha512 = "6f9482aab13ffc83e6efc9834369629c21ce60aebaca5a8e8935538ced4270ecafb3b88f46dee3a5be3f13b556702d58092e73063349534dbf2279a91a096aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a9e137a01005de3dd60d05f7145134b3f2d5eb96ba84895effe434228fdebe995994682ba83c3368046732d8ceea7bd0289d4c852a0771feb6099fb29d524666";
+      sha512 = "541eb087462b501256886853f194c1078942bdf31339b453f9d8ae058902882c7aeba6c67157161cd6ffefeeb3791a4a63b15ebcbf813ba5c00f4f4311ccf008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "3ef9a4d7e92d813c3ec236869452372ba1c87cd978ffe7dc230ef410174625fb3d64caaef6c378b7609043ed5f3482dd6e03a975e0574365deeb6b35a1523600";
+      sha512 = "6a9112d88bc51818c06dde6643aaf606831abd00812da9e372415784eb3fbb0ed77914f60ddf1e2cb0f95b2379378911abdccc4f229ad5fafac98c81be60dd13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d8b49627c29430ee420e8c878da1fde7df4fa0b3aa5f145b0003f7fd9270d9a7d0e3d5f9941dee9cfc081a376cc922b7652667f559421e5e7ca8aeae8aa4ddfe";
+      sha512 = "ff1742130854a5d61ddb6a22c8b61eb1bb71995f8f9d0f2ddbf032edf0e7a70cf4e64690e7d4ca05b1fe42121ca8b389244d492234428b517771afb1a79ac803";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "de32d3f2b715eaba412484d1b3e67d9ccfd53afcaf9d0a829c9873f07edc88d3f8c984d0752ef7dc378888a92ef515f6ace3ad4e4c98ab40f7232ed385445d13";
+      sha512 = "07d1c523173fc4eaa47bc6a22de40e73849960b9f8f92139c1ca95e3e35a1b852b69eb698912e0e2e4ff4e265801779a027336ef788e3bd93a7bc49fc831c577";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "109d325c32a754dcf004e3dab0716a93ec7a29718719128855b0024f75822662df48d6c609cc1c2fc652818f3925972d9d317b928349db9ce4b267cd10e867e5";
+      sha512 = "bbfd0b2a751f02993fc82f1be83ed6ed1a1cc054774128423787341faa059ee1f7d402741f78d8076eb5012bef656037bbebeea0775284cd4691b2fc3053e476";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "6c85e5e20da3495ce351ca04ecda4addff13ce8ef09b14194110b409f9aa89c76eb6d4b851667414645249012cfb544ebce1dd41ca05b5d18873d4ecf3bf4960";
+      sha512 = "925de39349b7a4bec721bf494fa8af8252fd923b0976bc1a99869c5bc5b083ef09b8a3116d79aaa2ff3bace9b0df26ed455ea385c6853e0ac1f4a03ce257d51e";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index da5dae5f3f24..968b65e72476 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b5";
+  version = "61.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "1170b5bd72dbeb60e71b6c7fc3b5865e10d32286a6f8be3e5befc46f45a978b00490731b59c4e54c7a53d2bc9efdc739a17e6605444cdc67eff13f2cacd84137";
+      sha512 = "704a4bb25d1cc2386a63c4883fd43c7a1720387f85f73b9cd4ad32cb41238d4289685ed6d62777b5748f7e18960dca73d7d204d73a335c542ad6363fc2b0f6a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1cb816e86f02b0e2c0c1a4842b6d1b3cbf3da5b368dca6765555b3553c4b8f669801c93af407b51721216bb0c222da66b2653935246db24573950390672c8ce3";
+      sha512 = "e295c3792c8e179e67e75b0999caffefa4b1abf93f87ef2005299f31188eaf48d75cf2775f39af547ee06b0bb3cc6b472a5bc3dc33e1d2e1b683ac26edaf5a25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "5ed43051b49f887fda9fa8b684bbbfd3cc71112fd3c9c86dd4db476c2e4f667ebf92435ccf5ba8fd9b29591272b609056606df9c88897b3080a1d8e08fdb8ddf";
+      sha512 = "0d358267b73441f5ade02d4e336a08ff5196e353c5c2b4ef0833455d768f3210f7f05a98ba57e279a8fd40cf11183a1f9ab92453ae624aac42242b9cd27c261d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "43e25d83401eab86c05da5e6cd9790c3c891c9e3eb584b07738b6cbd151e2552d745b600090f5b3d68812ea67fbeaa9aa64f56aaf97f3676ed68134656fb1bf2";
+      sha512 = "c442173d1a591293dc9716b948b0183bcb935c7a3abc61d4a1f8da2a114e4c9d5e8bf26ed5559e5bab70fc62f5c12d36fd2ee973c0556641788c339c836219e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b149ac7f1a770a7d850ee2ea4e52b1a38eb540a36340c41eaf83325fe86ea501a5ec97de9e13e194699b41d7cebcf5bee136274bb078ac136d69043d116d58ef";
+      sha512 = "6f1628a9195ab30a6a87275c70a3390d29808242c3916682a9b83fb932687a311a434b67c8c333e1285fed1337ea0c7bdccb047e39cc4c1ae454572ba32ecbf6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "7dbc6d9a3df0d735f679492fb278c010da450e7f313550d39622d2480a9a0692c7a4c776c3b36aeccec125cd1c6ea9d7fa3adcf48aaa284f0cf1fca1e2f1e6c6";
+      sha512 = "41c0e5a30ba84746963e2e48c7092cc389617fdef861408d081c6fe75200d14674d7e7ecf1312158f723cb8b860b9e39c9b3fad802eb9692ec00cd8aa818b2f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "62bc34bb261693ff94d5c000b3420dc34cb6cea35a7214789e402851b8ac1b5b8370326168ab54e4c09e2f96f9eee1d9d7971da3b926268676db32318386eb56";
+      sha512 = "2c282319205e9a8d5ad7b74480732680f2addef20840d39bb368be0d47a839fda1d039ad4e7cbdb940b26b1fe2ccb19dbcf9d17527802c8c9e41fcf82dd67943";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "bbbdfd16eaa7bb97dc85495f830833dd9fe6d9411e710e0c9a08b8a7225901e7f9679894df83869d1b80654c6d30e6004c02a6fb7b7b7d2fd706b6b6a0dfb7db";
+      sha512 = "e1c573e1cffd888b2005d667c8423a8cb67ed487bb445b0333e9af9dabd2d8bcbc492d642fd893285464ebf83be6bee2fd4b9260a4cc1e826847d545bef2471a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "f099adb83c881eb777c21d8c0ffc01cc8023438f3712836838f5daecc24eaefac791358172a5d532aaab3b436b2958ef194b34c3acba591e9403d34c2b5a6a16";
+      sha512 = "08a3453611833ce773b4cd3a31aec2ec7120eec1e1a87459f165863fcf7ac709e3c0a69a0cb76997650a67a04cae09b2fe7ab2820a338ba040944f81c9417554";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "8bab1ef46fa23cc81365c271503d22b09d227056dd318cb7b340c8a5cbe866d8aa241f261a95fffda6bd3cdfc80c5a3bed45435176a1a1b8d427e06e3d1b0e51";
+      sha512 = "3ee61d526e2c76028f808797df0a2fd4e42d856b76e36538abddbbcb7c41949d2146d5c7dba2f5802d143c209ae943ca8d87123ce7bfe7490dd17058c1c32488";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "6e7113e561f37ffb33dac74a9511bf634c1bf8a912e3b13a0553a2977d29300b3404345667b995752a82ca785006b460cf9a1088c23e40ceb2516d67c098a615";
+      sha512 = "f5178ef8bd83658f2b097fb0d9b5623ebeae4d715156e355879f70ed13b91e8d20f9ce2bd4fab56455c9e45d18c0f6081b798ce3e31b9a473c40da1366538720";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "cfa60a1fda69464870382ded848f19b4915de27bfee14b34f429094381c7400069c3e6a5651cf8db133487957d0e4d9bf50c253a8a0884452285b5dafcd4cf0b";
+      sha512 = "89c2f4a5b8b18fe7d49333f6367696cf7e937b3e62726753d9339e498d9929969f5c0268fff21738ee20326c89e691c40e95b6d20c4c7b1acfc535d58e681b14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "e78fd95675dd40877f1767b53e1f05820afc0695e0a30b0e5e344df1d8d5a38dfd3019eea1bbe4f37b09399cd47a5a134f7d984a0a65c35ca93b5ee40fb1058f";
+      sha512 = "213136c869e9a4a475e5af94582190a3e6c25d49fe260a210221571bbd604ada4b60c254dfd673a9aeeb9d048d4ffc5123577f6f7da0b440ba9668282f3d74bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d11928a8807b2d1bf2b03ec7796d9950f5127186b4fdf38d38e6b129488f65b437625a3fe5654c45b134e9585458f72cd7d711c312f0e11acd67c941b3ede92f";
+      sha512 = "981c5d319f67de4c9093c57623d1b5c1e5cbd8f640530c03192fa11db3051ac724e014f139d7bbf96d76440a594ed33e4384b591a882c7da7974105ceef8ba8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "233afd0bb1788fa12b7659cfd99556721dea2914afe03d807e9756feff2c4e0749cd8fbdf1989add700b6afbe3c18402c9bfea6343ac7007a19914a2d8cb3c92";
+      sha512 = "96a431cf96e77cb714a31b3b549dc1f7f26416ed0cc32c804f1a139fabce217d904cfb713e7dbf298ff6c42f47c317be943fab26840f9db6a58d675f95466dbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "3d4c79999c2aad3a4aa71aecc7f5f6f25879b76d0e19d1f6b94f3d5998b43c89a35dacf8c9d158e6273bee543facd1119d4129c31a8a4df82974b0d6819d94e8";
+      sha512 = "a190976d1e10338ac056a452f132ef042b997ab38e1c9d3c3e36d7ef1de843ea13d59ce28fce89ef25d6a98b3d4c7840fbacd619001e455eb4e3b3812178cc98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "2c71544732e5bb89a9296ebcf2f6ac390c9ce438d4ced4f0668ce032e13f2e1fc96d26a8863c7f3979f509171014c600cb8efc9861be35a52084bc9d4463ff0e";
+      sha512 = "2ed8460c1e972535dd0432f25ca83df290d5c9562911df111ecba32e481de72cf30564f653a00b00f8877c6cc5c2c30e6ab874aa5b3dbe6065e4488ed7ba88a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1dddf978db1709a4f6b1ea71808fad8ffe15efd33eb83865736c9e50bdc4b4f3ff0ef7277408c538babc107d1fdd075cf1563af6c5684f1b98a74a3e5c72a6df";
+      sha512 = "b7c1ccc3a45fd41481af46d6a00ffa7b2cbc2855138d958e65cd95712800d43a5fcf7092de4c79cfa98bec3c64504ea521aebd12b712d0ec71a8d987aab871b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9ee5faa668ba132eb874f3f0c0e05b0f905027e6dc1acb92d3ed951072d4484424a697c2db4bbc1b44f8815ea1f7ff0b222dc955a837a69163fca0a0c0c192d6";
+      sha512 = "37df705938723ab60166634ca6c781e1b46336e8d076655c2c3fc58d7c1d142ca74b8500bc19ef8b7a2fe84d59f3600371c7e1ea6a445429aebc274177afe601";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b36ad6e52f18ac6e28a646b296db2119306dfe64704a2e6a0ebc4480c743017909ce38da8ebe544298db4dc290949d51734bf1641208a84d84d4d4d88f68d2bb";
+      sha512 = "9b1efa7dfce319ddeac50c6dd732203ca5e1dec1cecfb1c2fe817d1711ed4821d8afb84b7ed4d7056a625fa08909884a08740b955cbcca696459b4c5753eaf03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e8cb2fcd5f3ad44db46235593e1557ddf3a73c1a3440c67e43b68fbf8666cd5673be4ac84ee580088fbab536e301f3e7b6348d20ce6ba216df4bb2c2634ae568";
+      sha512 = "5cc23cefe43ec331472d25b276e2b23043c36ea27b53f574a6d159c896976c8f188933b5dc830fb172b499e9f0d371023c588eb3be72ae4d52cdf6683664101f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "9028d5fc39cbfc454d12e24164f27e8781801c5ada6806b2c67adc0c9c5540d1930172cda78b25f3c1dcf96a6f53c8934c11ae0b4cd4048ee62f9c4d487e2475";
+      sha512 = "a8df584f07439b1d0e76e9cef7f7017a32531039a9ca57c35a444b06ab67aa6aa7727b42a16b8ab1567dcfc60a75cabcaf96a3dfbfbc2d7f2d338bbf2037b80a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "25ba55bc0025c531c1ed596355e5a0906cbd87959ec8b3a598827810cfcf5fb573dd572aae85e08db890ae6c514378fcce98eed1362a8532312f7f26ceb8bc3e";
+      sha512 = "3738b5a31f81615c013bd0b917ab9d31348338e371303794f133297dc17a32fa5be5d1d61a57f3a6b6103fcf8c34614eee3a2bca45114271a7bab7f03ae7665c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4ae8604917283517e0d7a94f13506c0ab68602674ad3378ff67a0cb78027a78f457225b54951dd11e471d0a4ca67a6beb378d0549f1436e2de59b4a352082c34";
+      sha512 = "e9efda879e66d1ed364075db1ffa11ddc1db4860de17d4c90c5586e33b716541af3e7c4716c98becd01809bab85444e933de877aef7714edf3b4fcad4fa61ed4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "91eb963b0fd032e02227612d98ec6693bc665d783448163fb5671f4af23c05c5c22199ebefc361f671b880aa23967a48e07164316c97433fb52ad03534363d93";
+      sha512 = "c46aacefe49d734ffb9dd885053c45102b4d8ac89b0babb45ca3bdf555ef854ea41580e59c3a2a3947300d15f273fe3f71aaaf6b05b74c0a67f3a8c1ab820c4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "855bf9dfef4703d7bf4852206cc6103752d537370712db513e40ccc9fa708bd15689ee415da163914d3b5686d2ecc0ba696c9ebaa66ea0a7930401ebd2f373cd";
+      sha512 = "b17c0aff399b62ea56cf5e546ea07637156ca631dde0da47a0a52e55ed8d097d1611c4f1571c232ff256e1092496f601e224ef20e9aa0b03f42643fabb5b7a39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "6a23105b44d81b403ed01d46ced348c5ed5704e517b098404546a5ba33dd68c4dc631146a9e16ee0a55cb7ffd8ff320074657db53641f914193d338eddcaae01";
+      sha512 = "dab6654be6f4f6bbdd199151375b92428f2720ea69a861198d233af27ee1bdb822a5890d0cbb5841456a1db3a8691e85cfad86272b61439dd7c2cdbfb32531ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "34f7dfa2e7711a8520246efaa3629ffa783f8a3cc67cb19def9465ff4c3a3abcea4d1ce1df2ce9c65feeb050d2a27f21cde9d95a5681b61c006ef21c4d412f39";
+      sha512 = "76bdd88222fa792374cea43ccd8454042937c99738b0ebe79aca175256df29a7a8c235c290a1bb408d603ca57ff2efe13d3571a526d5e5b542ca6f9b7560097b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "269af8980bfaf7db00aec2d385ec0eb44ba5836de791f698540074565bbf1c9ded54cfbb870014fb418aa3b451ab6fe3636223dae4ccf437a4d68c9bfc8dfb15";
+      sha512 = "0cca4ce5f283ebee0d5c0632cf9c951c1f29eadc84f1cfb91ece7edc47da56412e9918d3636d21c5d78993d8a9382c8691710bf03a68482e792bcebd10713bb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "65a0740c37a2b09650bef4586306bd6139eadb43d4f3743c7ff0c47293e77b7fcf74f596b1982305b926a66277224fac3d1a190afd1bf2146503d3fafc8f3e4e";
+      sha512 = "4c80a265ab9869fc20dd5abb07e301de954f24acb870c994e100db0f27ebf32b0f55ba10e954269cfc67e39fe1bef73575410331a941b4e0cb465e082954fabf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "17886662bb27dc76002702ef99e3923a52f6c0559d8c2341e09105ae6ef55bd3143961964db46f0a5c8738d9625ecddbb3c65bc9ec14f9b669be327dfad5aaa7";
+      sha512 = "4cf191a8511cc954077698ba057f29390cea82fa3bc0a774db8a767a8d9139bd481bb8c37ea8083d1d5da2492c2404de3f837f5508238bf3325c7aadc63815bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "82eabf1c23e28c5c9f628a4dc3b6ad73568228422b33665b7fa9b4666a4defb79cd118072e0276a314b4f5580317478e6f2df4a28d3ad8a7f82f87b0b688160f";
+      sha512 = "c86ad85cbff328e4f213e25217348acd4fa45ae531da88d9282f611778d9effea05c25648cdfcd0ce3381d5124ce9f3d7b61c815a4074fddf89c713f9c8a25c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "e8563b0d1722fe1323ce27418fe0f3596da9fcfb9cad18fb3c09ab31ea86aceae7f91a64aa0511d98ff883e4bd27304f84570271bda13290b5716cc66761f50f";
+      sha512 = "4b05b4e17c851558c38ddb474021d5f94677c44fdc9c0040e2a575bc44af4952ef5a47af57a00f02026d54e24443c903dc5015d0aceb112e496b77df596b3e66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "4c439ed929ee67acbc9c58428fce3a47beebbb6ef1e4ccd89609530758f113aaa88e8051503fcf93b665d702a4840ef5924640019443a1ccfa844eef8b2da83f";
+      sha512 = "4c11b960a01d68c7d9c21dc7c76a495e24ef22e1f8e41df8dced33cd02456c8d564b1bddf9b06888f149c882fec1ca1533f9bad3fff0517b4bf6dcfd34fb6f0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "0184913e520efefea6eced2f54af3ddf0f0f19f419ddd788471c9bda3429d732af3dcc281c45a175fa904581f48c5f70ac0a9fb28d2a412aa4d81aac97255142";
+      sha512 = "88ea1cf62e9c1ca08e63820517ef8ba17c977df901e63a5c8476d0ed178d93d7ba06df55ea405262f117a8814c096897c637728401142a0964756b44ebca981a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a6546691dc61bd7023a61c45bdadc3158e6362185b0b3d4ffa20195d1e67d3b48856b557a714c813f1b389176d835683ac52dc1cccb8b08bb04fca014a2e380f";
+      sha512 = "dde3e01be8ad1e3453360771dcfbadbba5d8e171308c217da456cd3e217792089a7f25e7a320d80ea2f81c658191d623bc6bb52ea4c2e177335d478210f168c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d4cd72a92c0826788b886135ebc17194ed265cef4cb9e1d288e27638f7467ef34f8f2be6722306472e8bf62e54c11524574f21a7d5ba97e2074daa7257d1b8d6";
+      sha512 = "409fd20d41998df4e86e2a42f2054eea525fcdd47256e97958b8fce4d483ee2e35317c36f91aeaf9f597df0d62cb84204ee1822a099f1ffaa3995dc02d9606c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a7fcc96ac456ca06ba65134fea19469c3e1b725b3bf9683c3d6bd2f9a3aebc5a6d306e5dd15a2e05e58e4b1e06621f20a2e446a3395cdf8f20f1a7a92d1abeb3";
+      sha512 = "1adb25e8e9bb44ec79f030c789bbdadb2c2711c9cf89de6341cc0b7590da0327d865c90fb9633651246431ee8f2b80e90f58f67692595f26cb53c56c6a7a2d50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "1556d99780c2c9b0f8b99fc37c4299322d518cb22486ed1af7a778a7f3979acfa47aa333a65daf337193691695fc7101503c81327d82a624bcdaeeecb6ae8b6f";
+      sha512 = "cfa3be244a4853dcabe6e34f0fe8dbc2d940ccb89ce92174f6d382574445e1debaf66bda9760752a15f4db74d017c9d277f6a865d32f459c9c9caa9ed908813c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "31e0e6c4bf116ff1a0c1b5d7c6548ca3d629cc07ffe83c2ac82b7c681321aa57227ca6c89a28b83f4ee96ed9739a47d83a02eb3782cdb14480b382dd46ed073b";
+      sha512 = "09683ea1dba929c74372c15b943c5609015c88a77b578d7f3e68bd9cf94252cc9289280fe8c5d93315551cf662460653d475d64ab7d3c188e4c89b47ffd23c21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f0fe6026339b49d59b8208e6e97d3645be34b90c37152d76645cfbf14a418a97d37bc3cf3fd733a41d085b315d5c975cf88521e7f85407b54ff83e8ecd0ebf8d";
+      sha512 = "ccc6bbb0513f4dd8df91bf09f58bcb2f75de28f0a33da70bc6bc688f409651ab1a34d88f0752eb30afa450cb412e34e015cba8aec7cfbdb62dcb46ed2bcfed10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "32288fd8ead53b0eb74621301d1d0f6ac9c66845b65ecc5258d2f1c7e913e83a25843268e6ded535c81a7b536a3112e58f0c9f70d39b186a6726c119dce6ba8a";
+      sha512 = "d5ae8e88f143ada1ba42a90c0ee2d20655204a6521fcd8e5e286d666e5e7203ccf7c5dde52df5e18ae8fd55def74a4a2a8bdcbe681a7addcdda3bc026117e2ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a398763f1d467b6d98b864afa84113ef59ccbaaaeeb7e730f65d8d898a534e910b775cfff1088ddac4cb7c0fc714be2f98c6b7df9e30a751fda1f3727228c51d";
+      sha512 = "8e7d166d15f00b71be942987f964ff03499efd677fafd58d6c607b53fabd866c7666228604c461252a6d30b417d31494625fa829e3947d67069769eb2bff5c1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "2cc3e64cee65d4ba1d4a4e755430664959bb5726d575062d2147efab9eab7c67797c6236367456e105b227907171bb169952ed18a0f8513677490cf065981e16";
+      sha512 = "2cdc4caa3377dca66e72cb925ceb201c2726e814aa12873d74aa2daba8c5546a649c5c2fa5e953bcf6265d642bd0b7fd5df3e7ad181190bbec0b5a626eb8ff89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "774f60494af13245f3642120b7401fa3a9a98dcf53b4482141963f7458e6a1be4097161938a3aa2bb67940f0dd22f4ea447098d907d1dcd55b11bb89a278108e";
+      sha512 = "d7ec91a65762419d7ce8e7d3fdbd19675b19e8441fb36f2927d89eb1e7143a3797846fbca1ebb0a5c78a7fa8401f09a0be445eba159e1ccd722e0a4523201675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "dcd4955e1a61bd5e90e7b26dce4daa71545b337245a42b44ec5af9d7a9cd455b4892cf52f219b370a974d5d296f1d93ad7625fff45292fa7711bf36139327799";
+      sha512 = "0cc5216e10d54635b13686bcacb59693150e94b9d2aca544ab077860a1d51554d86dffe38b6430bbc722b66335cbfbef878068e56b2464b5e3f76d96454eda21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "105efbb4f846c61777b3717e377167e5e3dddd50804c52694f4641756baa2350f54ea01995deeb0a751b23619c55b1806cade1ba1c3cd7f7cbba23206fa19f7b";
+      sha512 = "05f4b6419eedd96b327d2d50da249a699ca5bbfeb42fc5dc58c20a87e30280f99dbca8aa4eb803306abc7eb02f42a2bdbd2dd96e5553f21e289ce5e9cf83c58b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "2ef057899464c031f224b0997138dd1611aa0841f2ef2f611d8e2b9ab3849bf94e287b4ea8e08e905f42a92e15f9023c592a454d56f4ceeb7a8a87ff99c0b0fc";
+      sha512 = "59a093c20ef9afb1a25d0b7453c532558209abcbbdf10dfd20c4dde8a642ca4d7c4cbad912756b44565ab9d85b5bb33750e5d8c4636feea7b8a64576edeb5220";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9d6fbb4afa5255bb77daf9c99412b8bfe44a9d841eb1940e18611e2480da2f7f4fd18452c49b53880832ea671967699de9a467405cebb17fc268ae3a7aedce6e";
+      sha512 = "676e9384493d7c93a3b87031fee59282c51d0325374e989c7a505f4fff7e8830fd47b972008005566c8bab81b3b1cebc24540b4e886d2d9e23e7999edd8fb373";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a10300126f8937686d03c4acdc5dccd9570d7de29a25021fdae22d03fb3a87baeec45f35bbb3317888a34f3282e03b2b6ae728743863691f4af691d8071ab567";
+      sha512 = "28bb39d6a8d6dd5748488f950a768e7993758860a6f1ca9e4faac044b3bec6e243fb24bdbeb650139f55105690e50c4415122408e5d3fdf5a491229356c0d726";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "8b948d7c34a13556246a2b4b70383ec847daa70f623e121449e9aa380a709e38ef40e9f864a3cf7613ce549876452c880dd2438d75315a3c8eecc3ee3230862d";
+      sha512 = "24ff512326db7e876b3c809163495414861ccce2498a61c4408e5712b21fb6be140230c2ee3c2c66925dcc2d6a9a554361df298e682c650758e116a6a8cf55db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "dcc93cdce7d1d783478f85ccee378638c206221efb5ab5528ac2387d9afcea0a58370bd84668570902e03cb06aafd580cab2121d49167ddcbb6ac5e2803d6cb0";
+      sha512 = "2c8fcdd6232a0b143e353a243df3d204209456f26a36e137801ce6b47b18c71b9b189416f7b6d42b9b728b573c390912b9e4b02a39f97bf48d73aa930035f01e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8de7b0c54d5d05da9598b449015d505813688f1c448a572513411acd9aab4720c03c15d6d342f84255cad7d2edc1891682e0398b9cc165e812704bfe9e07d8fd";
+      sha512 = "72879c15689e0af10799c91bdaea23393830edef94cc6d7c339080a519fce2bcae61d5ca213e3dc1d7d3692f17fa86e009fc7b090af6bfb7b2a91e00853347bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d8fcf05b0072b03336b67df81eeb16442498345e624cdc68fccecec07d89a39df95b832968c1ed0108c0821ec71a89757d62fa9657a451f11fef25b0da90f918";
+      sha512 = "d117382ac21895542da8a3f5cd713715a8ac1f4b24e7ca96c24a79301a9af0be683c7d95f761cc4534a7ce71bb9fab94a766dd0e1f135789e0fd834910a65f06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "13e135e31e44bd08c784bbe5222f14e220579aeb1981d1d91f0baf67cb32157499c6de4be1ac7086d001ad6b36c6adc44f32f4a9d8f0aab727cea8fd60937e04";
+      sha512 = "32375c57103208e9f62d91c17799692ff5cfa675c338517a18f04aca6fe9846e768f334560591996ec225ede29fe74a8293eb2a61f7ed4ee3bfdb0238cdb354e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "c99b28303f9deb522c9e06e5c858316314638312607b64734ffa681aedba9427c0911810c87f286f1a785b77892e6e38a2a1eeab492458ff8b9a9f87de635577";
+      sha512 = "4ebc73c69b461bd5aeea6016f73cf7be4277e0bf15b21f950e219fd83ceb9deb2d950aec0bbe8dc95799756e892ffc97149116ecf78e6e28aeefbf090a894ee6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "cef5bd55f8510f3ff865fe8e04bae593badabf59ab9251a336a886b5af9f91a83502bb612efa8b0b295f18ca1b42da75cc3d328bd1916a10478de847591792f1";
+      sha512 = "095187047fb6336cfb2be22d65b65ae6675661a6a806eb24124025af62df741e004c93406e2dd2a130cea1fd9f97168b296329d5803b13e0d9f7a8c1fe032fab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "0bc85a9bc5b4284db80cd18d414fbe49dafdefa58f62d7c0b83a06a1e0c6028721f7d2624a1a4d948df16bc316259fd27ac2766a55b1989f37f52f8fc9d8c517";
+      sha512 = "bfaed831a5d4f68318cfef05ef0b19611409c4712fc41d62176684b322811055802103b0c0062e88218d3aff5beeb395b3e0531dd086934bb19aaa662e0360dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e35e81dc05f83f371846c9d31bf62b69ebf4ea28c6e2a53821ea6509b4da8d575ea7ed616d546d900c0559d2da7280e51bd7223e790b161787f9ee85e2fc11bd";
+      sha512 = "2cf29ac5eb6923092a42cecdef22d399101eac90bdf0e587d608ad03ad10a840068efd71e93e1b940960c83c901cf21ef8adcc43616a59adca94aa507cf5dff2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "9e8ff522b661912c1d6cdc440015dd23ee2768aa159c157f29be574baa8e74760311e623c6e9d3cf4e23363b5f05a5d3ea74743b6f95b256045418c21e904194";
+      sha512 = "3359db005fe95e03b91c313867823dace52fcd3919370cff910802f64083a22faa0e17d68c64432985b5acb086cad50fb7f92f176529d8ed213d5e7290638f23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "f6c1dccce1cfdf0b92dfe076e9cb131763ac72bad4d12610e7baa74ac690b25d567c796b8a3509ad7b80b2b44a87bc0ef41e52134d2699573772c851b3f04cfc";
+      sha512 = "2a50c3cd3b0a56c22e07395835dd2d3e89e0adbc43f6db42dc3c837d08c5c5dbad6b3f66a3942c215a7b889046aea7d2143b0afbb2b5ecab62dfb4e9511ddc48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "65db4e9da91fa1033ae5efd14f60ffdaf6b1730e9f51f4bea7142bbe678118db19098d0e967b6ef08b1531056efa584cca6519aa0c5c490008ca740db6a8c50a";
+      sha512 = "57e11ba5a7815dceb0d14fae9b89fe4525e2574fbc7595a3d211b7f85c6dbb5c2cace919a58229168540c68301bcb3778e53699457d81ab5b2be1a920d0b4150";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "0565dcf2e97431b5ab728f8c73e5b26e9a411f26d712c3bfbf9f61cc7a719b2a38578b13f2ab8ba5d1e054a59b9e1eecbb5a39cd188c772a7d5dc57678b9f334";
+      sha512 = "d61260e8310e4dacc0db02b09dd3e5259120ef6087b718daebe949edd0ca19dc58a2a7fb80d0918026723d07d6ed61fce4f76de2c5b2b6fabff6c0997d3aeaf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6573ca6f2010c57e9a6aed6d6e14587097329e1ae144b4bdfff0b0e10d0cd7a0bcdeebd702460b9c4555480c81e5244f0eafb8592decc7d92ba8785bb1aa6107";
+      sha512 = "56b89b7da88988d8786b41ed8ca92a88b27f3ef6f1bd11930704b6a1c4b1a385d7ea89c647e9419e18be6e7f312e8141f8a91680f3c318cc3262a24c1564112d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "c2b613252726a185af0acaa181c455d0e048f3895fc9b4c781f25ffd8496c43d32a3f5618df653f79bbcc403c9bf869df327fa31463515b5fafcdb7463f01e9e";
+      sha512 = "9437e094beb55548663a12ffa9185f6a221b3d181aec779818da786ecb6a2127530b28443e0d27f92512417fe6bb775376291261706932baf4b098d4b2af4a40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "517370bf3ce8d0ac8fe765d93b47680c65698c4de87504d391b67b8605dac7f1e55db38facb8dfc4e35187828d41a63ad78b4d2c43cc6f2849c1d5f9fbc4e2ad";
+      sha512 = "6f489ca999a25af54759eeb46cfc47984cf824257256148abb058b442c50c32fa1d2395ca6222ae20ca12f49363f7c99693edbf01247dfafea3be034e19855d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "8c84e5c6e4106ff4118c124226ab0aff24cfcbbc925196b9c9a7b636ba975babd707a14abe2c5e0bb3afdd00d098d75dcb060a448c00f113e4a33c0cb884de66";
+      sha512 = "a367ae72ffb53e3cbd3bcbe648c5eacae9b360bf2f53070343ef72a18af28b858a1f0a65dd0004f71e9daa05705f5d915d9d3ef1ed863470be4d7074ca078ced";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "58c2d937db74b8eb0335b9e3dbcf11bf0a1bc8bfe9e5ee55e9e3ec6cd9a7f16b23e48d88824c2dda3d7f1f1175f0036757f0664aee8d60a9aacaa2e559cac616";
+      sha512 = "d18e1ea82f688a95b0c52b88e5cef69d49c0ff57b60a44aa8e2244591bd6e7663a7642246c6f21f53a5a4620e4d01ff86af4ae155b6312aac05e612d5fbe54cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "ce54ff7f7a4ecacd7ac73e48fd35e0b39b96a7e85b184f77ff1ad66ee3f6d32407ee58ca882afb2cbf65673d9e868f8a58962602097a40f5b0ecd5ef0a038b04";
+      sha512 = "f27e68805b72906d39016588d4296b6a59089a2f69531efac383219f53fc1e9c8a45e875d9939fb9aefc971ca6f9cacc85b477d9b8e21c5fc9e6a58bdb086088";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "e3bad92c631d647fe634b468c27ca1e2c81a69d14ffcee3a32d41d2d21d95f7196b2f8c426e51e81ea4f920ee0983290597e0b1edf68e182ccb7d87528da49b5";
+      sha512 = "2f211b812c5325a7a59518fec88f6c497977068600d9492263cb5e0427d2aa58a3eb5423b42747bdc88566df30b8ae68fbbb5accb799893b5f9a939dd8f55047";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "470d3662816ee35e6af0237ea6b9105483abf538928ec4cf329e596fb7c7b6e73ac6b7508e53e33cbbeb43bae1b115562d7c8c03721fec6ef0e3036576810963";
+      sha512 = "ca396a60641ef8694ab59753279b5770c264eb2cb25712b939cacb0f1ae6631e36ccb33f714e69dcf18cd935e1e02c6da0b064359461f8c7aa1fb322010cf31c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "35711515d5fc70e8c6c54d2e5f31b34cbe98f8ef21bd25135f64332edda1e5c336c24403f20b4443999354caacb3066b805d66ac7b7f6165bbf3bd748983702c";
+      sha512 = "0ca1a0febeda1e04ec3384dedffa72f731b18a6fb4b2345169d90f746c3560feaa59808da8ae7afc1ed0f08b3db6c38940df63574e1aa662ad493792bb71ce46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "21475be0c1992ee07b5a2cbfdcc0cdd25245c995270d93ee08c1f6bd01003809712af71edbe7be7254acc83cb930c0d26aeb49326aefe6041b3aa92169f2db65";
+      sha512 = "b4c640bc03720e2c8147b3ccabd2e0c7b493cf9f06d6a11d2f45812b33c7d066d4788aa90e6b3e2d84b7a7618db5584c97e8097541c45f74e76f9e7a01d1d516";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "18b75e3122bc57cd01a98f81d922e325a7d1ebd56b09963a071a14d05ba679d51e251f0d0e11a60c832c21e5022cf3a6e1a5292a525ab53e4c2c5b222a3442ea";
+      sha512 = "f13fc2bd42de9cbaab6a2ada2bcf8c27e277682ac57bead92a69e5c5824525832dd1e2f73aba3b1534110243dd11f9d95e3dead358211bc25e008dd09485f10e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "687465367d3498bab3cbfe31da5b0b4c31414d75d7af605c9873d8d2522d8502d3dfa271334e5045537b840e452f6dcf65a6f675c653cd07174b1bfdc6a95738";
+      sha512 = "5687c96c22796a75da37efc565a0652a0f1e2f470cc55898c5aba6bd399f4dc8a9097682fea2e2a1037bd6e100f3ad7d869b061a24c78fbd4e5db7eb6d938b4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "47e5866860fb3bef65399e7e3015d2486bbf427970107c449122b6c613a90af7d989c352937c39766e5839dd6c3fa31bec59e52fa013fa983a64125a03be228c";
+      sha512 = "a5a75325e98a510c506e056f6e1096ad8d0a7f4788ccae27092f407058a17aa15a34eb600820a723b4266cbb0874c90d6c9dae9cdbc414611673c79f65b443cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d33b77c954f66d0c575e7f2cf1c72e0a2da7ad9faca7c8934f96f8c42261f2e2c868378911eb7368ea05dd3a63207eba4cbfa89262943f2e551920608e0fad9f";
+      sha512 = "a79f703d41ca518ecb31d6dfafd776106ec7d3423f9041507770f41018cedfa71fd6315b2144e2bea4c49d83c0bcbe9cd5c57e4afcf30e04884eda252eb067eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "439df5fc87e7400c428c9e3c221d28b23df23a380ad18f441b4ef97149e473fd63185617769217a0fb20dadc2cb8277a9163b95ce580e5c7ccd308acdad70c71";
+      sha512 = "fe1a0700221b22afc1cbcdf7d726941b80be80d96ded4342cba4c9d54a0c6c8b155a879215e5f83d19471bc306cb2311bb731337ba260d0c7d537f9406ed0da0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "035eb9a6dedbaf84d3ac03afb68884a1431c37f0faaff9c02679a3bad24f50e22ae7b8dda1d552c8f50ab267446c32435ba18c06afd8a561ee763aedc323c7fe";
+      sha512 = "6cc3966907c92b9e0fcde5adc6e107782e5857958514206b4c25859491f1d864cc2a1ae747d0fe8ebb7813a929ce73b3e66f18cc139b661eaec2456086aa98d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2de2fa51df5a6bb63124f83b976c9f330122b44b407716f3db83465dcf998c667af33ae86ce63989099e92bd8380cd216f82d1ebcb327a55053e31902d4e0923";
+      sha512 = "18fd6dd3d3af822e71499a6517517b5a0e3a71b92883e37f668c2311e5a4b56bde0ceb2685e947ae2edcd8c481a3c3308cf5d3b5d8f0da92107e074614943a05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "12ef4e53dcdecafef1446cca82ce7446ad9aba0af9a4f8b83155d8f1a4447a3630eaa39900fb52896e12941d2d9d2a699a1b2c848d7a08ccb3c592a8c0eb5beb";
+      sha512 = "8e7ff27ba8b2205691c280e0e61e20dc67a00f37b7c5a40b1619179f1747aa76d37551b4d3d10323d521c815b01082685395dc8d93fcb8fe39de8dc2a12df917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "129d2f2b41066cb2a0c476d6f75293ce70cb026d525334ed1218defb0a7dd8c432bef7564b008885a6fee277c3d41ec4015940c740e5018b1ccfefb7ac1df50d";
+      sha512 = "6470e39996855fbc7415b637965ddd954d7e8fe38230c5c9d5c7838f9a945d52f03aafce1015c30ce03b8eb49b6dea2f974068518fdb818213b91100cb98eac8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "8d0d9a27b5426b4cb6908fbb02c26fac6af6564073d6ceb94fab9f4fda6786f41f0cc8f115be011bf208c3625ed165eedfb69935ac9fe190121f515241fa8a12";
+      sha512 = "b900a63c29c0d8251419eb87b700392ac3504fa49ccc732d181a63cc7b5a3c26f0480b64348823f0e6dec6beab126c3c610351abfcc3af5bed85cd655057cf5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "50c6208d9254cf877644c0b409c699a9b7de393dff480c2b6c16fb342de978222c87e5766960e045d2b860c47058b5fa59a52a3902f55169723783ba0a19a57f";
+      sha512 = "867a9ee9ad08b33936cda12edac4de00e1c5b27534ba65a0f16ceb72b2713b1efcaf31c058abe1a64f296e3af2554a9f4c38337214a4f503552dd3174d6d6513";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "ebdf94a268c03eacdfcce2b5521d3e721c3487c1eddc80e2783bc210031a0cef484bee4d0d3622ff636f7524c0e9f294b0fbc0c9d7c6ca9ef9d793291f97e4d9";
+      sha512 = "0d65e598adde1f32a52250701f511993789c5ac9e68448fa5c7041a58714d2684617cdce37f578a5d2a498ea09a35af814d5b06871b0ae9bec8a71bec8bbbb7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "579d7bcc6d85b375b9443df06813d908bbe30caf50897d22f958c564acba2aa54cc4b8671097c7d094ef0cebf32f46d88de7ed748590d70063445360b73441fd";
+      sha512 = "a6495f122a2b6f07eefd8e29807155f381d1f89f3506193551fcc5d8e0f9d1943dfb5ca18debb24df965f1d1db856d6aa0dadbe98c2bc02671567573743f66d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c68d38b7f7e665a53c4d64d92bc88d7dd2254dbd8ad3d52e4dbe463a04186e54f813bb455c9cbc9e6451c8752bcd1fb5ef22cce5189fdf2c238a7713b2553f4a";
+      sha512 = "25a81d4749c1d95e36675ce329f7ff0222a1dc324e69d01681d39e1bc751355e6928b131bc345b50517a45c2dc3a1ed03cc7e9c82d8dc3a169796b31d4470ecc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2159f5a1d5fe6e5adf10dc575fe0540a2036bd26a9c0bbee7f45a0b582bf0ba0515a474f87ac6a7d7f79d743bea37e51cbd2a5c057a3a934d8e480b38c5affc1";
+      sha512 = "ee156726a54ae37f81a1da32e2d67988b4a0afdec52505982d183d6ded497a4257b81388728e733a480726076b7d61fc020bb741d4b640b19b7d24f7b75e86e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "291546ed7e8bc5d540835f8d149765765f5f4dc77b9f199e630373c1302a03c0772dde530b9ef391ab801e921a1d1e5ff407a233269988076e49dea6cfd0cd8a";
+      sha512 = "213541ef2037daa9a851fd7acd846da7b1a3ea8c162362f770406b653916116dab59bf939e8831a10f76ba6928a1e830258e2091811f66a7c6b9a1e4a360880f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "1b1c562bc9c0474a2d2313fa02716d8582b92af343ac0061d83f5266125533cdb65406e93857bf36bd35c6154bc0ef96ba5d963644df039bdb75722c177b4249";
+      sha512 = "32d550663ea09aef0f40efb1215f1388ecdcb3f7b00e4975cfb8c85912ce3c0b31fdd657672405a95c4dbf75952f14f377e6ce7cff96c5e663d7a1b27323324a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a0a30765b877d6278d2e00becd63bc29778dc0898edb0f1cd67a6e5e8eab7a840755539ecd7b7c99c6abd0f92ad4ca56356be7b8201d2203e2973025350ab94d";
+      sha512 = "023ddd41d19b74fc03731783ee2af94338576abdc9d5b64ef0a56cf473307241a8f6f89f2a053eb8d8ac003d5d7d70d97edacb47cd22039e9ce5b8472dfa6230";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "95edfd17cc60fc097451742cfbab507ff2456d2621132794b2c4c0997a2bc9dd94138e56bd1ca0f3a43964fa5ff29c2d21aeaee2666ddfc0adae798a84207bff";
+      sha512 = "4e5cdd14e31d280ee1d7b19e0b21571e2ce509f367daa34b83ec903d978ad460b0aab82da748eaaa8e1a01b6a2c5bbdd5c53eef30bf486bf6b5f3228cc4cf5a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "58165e2444ae10252d8eb81e55d2845c627315b8b1889255e54d6251edc571cbe42a6616a6991fa9b5cd45383c48db7f83069eb423c6951732ff92aabb3c0033";
+      sha512 = "5800be044bab8e785288f26124b03fcca04b9583c4ac98add9679a57d427a92f3b7d77da045e845da581d9ed03c46217baee12cb9d336634881a5cff2aee169e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "06e32f99550442c2a42f59423585f9821284f930a252d36c189f857d874cf8d7ec24cc26717509add8402147ed2d7175c937ab48b22e1a6eb748efedbdd29d2b";
+      sha512 = "e62b9ea730f9972b7dbd32351a3b04f42f28cc22fac3021678880e206a0d1e7f0a2300cede9d7f1caf3d36539e40aa6c9f7b801dc89c79860d8253a12e22fc70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d88507f09710c55280ba4df1226c1d941d35fe29774dc37474a0b5e61d0b296d9c7a357af21a83a4394aa1d86c5bd2bbb320f7628875d9c9e7181086ce301b06";
+      sha512 = "8d629e2507fced857b5845ee1d9a191e2e9a4931d5eaeec4bbf2aa61d242db053753491e9bf196b7a2ac6a9ed85feddbff3044ffa33487109ec7ef4356c4c184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c81c4766894a5db74e5bb73525f4b3ad69ac19e25f877f4624197518a3e75396041dcdbf481507a880afe29469e0eda59dd4ae7a3be50cdfc0a3a77b8299c021";
+      sha512 = "5f544dff7a5c450ca05518d41d4da8aad54425118422b59899111018b8e0f74e51b4aaf1b98d0bc7cac433be7b4a45bb6ac60cde1b32bfeb68119b87d929b33f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d58e2348efdc70960ea475533c4dd9b25e581024ebe2810a7c103d2a842568ade2bd4a53e27dbac1f2ff2ef70481b330e59d7647234ccb34480bd812f6552398";
+      sha512 = "fa604356e44f2ebbc2192accd634f4ca17f602ddb5b9581d023c69988752d2f9a1b33173bf84a101f797bf99c8bcf6a7e34c6f53982fad2d419956539cf56363";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "573669040d33b07afec48131953a368fb9cd661358c06b6ce056514419e6fd51a8ddc4c546f0a40ea816338b6f250ae4841f7f9b7ddf8d3d57e73f34ec55796c";
+      sha512 = "b9c60aa1bd66d9f0f56a260aed3fbeedf2216aaba539246c631f46c5fb3a23a8129360100b37387cc312acfb118d59a4e3bfa17555a57b00f1f233ef97f3bd5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "22c99c2e64ccab01af2723e6edec7a50d7b2b4f9f0f5272d502b6d6e866551e72c570ea140e9283b304d1af4cbc86300a0c7e54478076554df8bcc80c9e33415";
+      sha512 = "e4f149c83e67432aa31d9ab91c50208828069e49df69ea83ee4b3c281bcbfa05dbca71f678725bc41ae044098b9e4d61ca2a13188b06412ea58845739f76403a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "7cd232ab70caf61a9202f2598dd85be49e7039fa1138896a719fcde3f63cd8dc893ea4c0b9bd832cf506ce7b9c235d84fb353ee625ef0c70ca3e26c2c1c69315";
+      sha512 = "6c4fb2984588621effe18a159ec17e1c04a95bda869be2d8498afe07c29e461d0f95c84f2959169b10d728cf3bb62d2c6ea05f794292953ae8c07c831051d1ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b73b7e75d08e8476b7bceb3f86a0ab7d632e2bbeb3916b13a2502bfc4964ec1f98c6ecc6941a92d19dcfc29987097d69ec27711ad011db5f8205f79120fe7904";
+      sha512 = "18ba0661a6d63004ad92df206aafe3215f50e26e91aebc3b68fea238aef4c0b8756cbef9a6b2078aeb5ca0b38de8a1988ff548f7e3c5d8ac41b85eeaad88a911";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "6a8c4ee3f89bccd1fc69e8b896b3a66f9086272deacb0f112a36335a432dd3e0ad6d3017036b931fd7951503b8e00d8f11588fff118d1051702a0477cb360697";
+      sha512 = "53859553180c85021ad156ba21a7a24d4907d4766646689f7f1835e4c3f4f5235cf0148363b0c2478028c3443510ef34fd09b03ec70c21b7328ee5a61f0e1c99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "6a84acf5496974709c2ef4220cb56d4714d5eb8b4e731de17e4cad9be9ffa2e95d82440e0e79e19dc8abe91e56d67f09c4505f57b62c4870accfe1d4685bd97c";
+      sha512 = "e76e4fa8a48dda9e2305a9e5e774559e46199b2849ddda8e14bfd07af7c5a1281615bdb743e2492ff7efdea66d9b8f2ed2ebfb28920cef7262fff16178f596fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "274173672d91953fb715810f314bd8aa5c5b6660e8fdccb91e09d2e3b6ea20d50e2cccce45f201405bbb3b0dd41b1f7ef629c6caf5a59b9fa075e2a5c88f556e";
+      sha512 = "509c28c1cec65d471255c79175a9b79c9967beb0b2b772bf0b3417bbd39b2d4fb8cefac5e06d7658395c2770bd6384ffc85c73e5939901b51c9aa049e7b4c506";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "5d742221592d1183d4f66dffa5d6993eb81e9ae2bc24a664cd41006d07975f7d9bb5f040f7f7ab763059424ec835e6d0def4ac64a468a472ee23c74c883687fe";
+      sha512 = "a481453b0f458fcca2fb622ddcaade281f12c6e89f66f7b6e444c1a63c79265c49b020a67f24d28319d3a46606b49dc6ce8789b638604afdf618e28ad6bfac4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "f2e9a764a65712a5bbde251050c39d6eea91742afb4eda9de14c9d0834d66ec4db56c801771068f0f67a2a38dd634914cfd83721dd78aa7330e8f6b7089a313d";
+      sha512 = "11aba32937132635c0334f7760c3232181d20f6bf972d665ba59baa5a3d72572693a36067e5513fa89ca2a911f81882e23a854d088369ed4ff6a146c6d743b79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "87e2b22d6c3d8050f65bd740c10d37f30905091f25c9a58f90f221afb2a3063ba0006fcc1f69ee05f168d6bb7c5222f022bfa5efe0827e7aad00568867797322";
+      sha512 = "06cc5f9bf807340548e63fe3b32ea142dff202daeb843d6cd1677c6f61459a9225d8736f0e071b598760e366de50dfea2659ef875fa5ecf4071f92a01587ea29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "9687868e5f87282de362e1d2be7b54c150994f33ad92dd5cc4fa0cbec1d817b36777b8f0b95f50c691b20b83f8b5c4252ed40541b4fa6f42a6a10dc8dc1f8b45";
+      sha512 = "8f8973f321231fc8f2a4a1e5dafd7960fb34c3fe3b66d9bccf449a182ac108b29bf1bb2d04fabea44bcb8a9c4ce4ff0b870df2f40a3282e8384e3371ce56f496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "593c1191094b080a76c834f18c63f5f64193aa1d3b48fe5788288214ed98e90e4736f4b8ac413982bd9a793b39e63b515c293abf5822fb9e3b8a4a05515fa667";
+      sha512 = "87bcd40a4093a822346f2d2241eda1877764246171766be07b32be4bcf5b7640e438b19f9b1e2243c2658c7e4f176c28c9ef115d813b5149d384f0e5c966accd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "74681ade8b802805525bf61c27a2b604afb584c0a9eefed283eda67b46b4a2ddc37df527f05d46bdf3b650a092eefb600ceaa683a477fbab80506ca4b1ba48a8";
+      sha512 = "002fa901689602a3adb01070a5ea8f30e306aceb3f3177e52190959d72e2afdc5181fac58254dcab7d77860e46ed0e8d9f56eb74407467d147e29281dcd7ae39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "fd43952d81b426cbe4151e091b3106b539211f9fecc390037e937388ee28ada5059442698ab93221635d1d1454fa00660b80507d10bb7d0bbbb775f3ccea2957";
+      sha512 = "2a32074a47bf7cb67b1f35b0d20bc253a9f128c6ab6d69329cc64299476a94b20d45c878b48a571b4d37ebc667c7eda5ef91d2a0fcff104f7f08f1a1627d02bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "03a312d7f7366d0b94fff50b72aab8a89f5d24e060ef14cc63933b08e0c9d8134bb2679d9d8435ddc18839383edda514dd9be5452742d340938f32267371a08f";
+      sha512 = "7f8e5cf1872945950173d294f49911255d8bee514c5d839841503f0ce38e973ae301d69724831a4841a17c40229885e41471ed7fd0efc89704c197ccfdd7c3de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "f25801ceab9845ee8879f793a0c217247556fc965bcd9961de22d19ad4d0054aa7a3aeba28b09be32d0cccea12b799227809fec91f4c9853c7ca63d32b7a7ff2";
+      sha512 = "4284741c8a3505de74cdc7cfe903e696fb4e7ec832b08b9af89a32345d10658030bdb0219252fedb0f04f7939fcef351af9e3816584974e3e26430665767802a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "274d46dc058e017646bdde4cb5a09e703f390a75cb4a17454fe209e5165cd1ca8758c45857a1c7850e084d0e2110e4be3544667e8276ce153b710465a8a9f188";
+      sha512 = "19eb961a94b11a6cd49072ef0fbd0fbf243a6e66ff2115ca601ebf8b9c09e98c0a3c27086c923bada407509bb7a6e08e1163120a121c88c0ef63c4460d04f547";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "3abf6cd33273e42ed501bb913fc6784dbae65e61dee4ce69808bf3f704dc3613f722a4b030a0f9b9cc6a09a673d269238d8c9eec18b23a2b4f8d9a34bf32eddf";
+      sha512 = "537a30a7fb0207c120d42b2f77ab043df3a6ef9454cd93584ff95ddfc084bf69266a9cc2efedd00b69f198eb0832daa30b805a5007d6b64eaa5fa248b4e4435a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "00f0af1239b2de5d4f967d46dcd5dbbbf13dd06b59539a165255cfbd5b8adad19295a2affbcbfc23cd1d8418a4e05f0024bc3f6d5bc6628ed36168b5ebefe5e6";
+      sha512 = "fdfcf95cbcf4f987d1c83e63189c68c856fb9b22c158693fff17038a4883e1080d41af864057c96635b1ce5c7e7260f8e40546b78be420e60a098a79252319d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "e987419db7b28f82a404c80866367704a37580674d012e29c465856aead83cec4eb234d265167c70acffb5411b2766ad64a879c456abb31cd65fc867c339f583";
+      sha512 = "4c0b5adf6e043ad1f1db1fc6dae2dc4bd9b081f890bb560436d16e8766582c44c2eeef2662b7ca4042f082eb7c6ff73d816ac9cc505a2b4e6dd2b960bee65fd9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e4c268f4729108302c2d2dfdf338ca30f66bf369e2444b22fb0e5b3f6a4c383d0c2e5b2917d18d661980803e930495d943197cb47aeb729c3f1b6d82be14bfd8";
+      sha512 = "c84be688e42579df606c86ddddca874c5c795dd23897f26a6755f0bd70247f9706acb204fec72529a94a32027307a4f587c8746c8765994179d99db3ef11ff3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6d4d6bba03f2ff18da53c6f7f2ad9138388a7fed7a02e54bbc8d09be24aa955d5fa1c5890934c768b1a371abcea4772cc455545e9bfd03e63b3b98240f12ee12";
+      sha512 = "39dcd7bc909dad0b661f2e0fb9bf34d24ec96b10e3ffa645ff59cfb431e303223ed0de999184de3ec731a500aabeb869d2c1e12b67868ac1ac71f2451f192cd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4a1017f1f69486d56a637ab41c7c49f4f3f42cbbbf2a2da2a57f61f7d87c2ea43e7abbddb0fa21d56bd13d72e99881fae540626a8b7f069a661778edaafe3738";
+      sha512 = "20dd0f2acd16ce48cbbb54944b44e389ab6a3d0d3f37b4cb01ecebb7e6833b5006135c4a20b7f55ca4d8d4d2dddb124b06534aacccf4f2630874d46b3c5fe36c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "5eabb44a30500e5f8ee52e4f6ea8d82133c4ccaa5130696cd5af1f1e61efd47a0ce8fbd94e1e9ad87c2c8d3d73b0aee23f0f1cb933ac7c14596dd6b2b7baacb4";
+      sha512 = "c31adc5dbd09f282470d16680f5f80e37ed020d1b77d394e157bdb4a29fece2edfd7dd585e4fa3231a0b2e58247702da270f728875fe9bf886a68d5eb8a48a7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0018e56ca7e476d7aa8fccc55dfed365ff28592f387630fe4d72828be67da992c23d28206e6399b942987750756ad4ef98600463abfd86442eee3a6caca7a39b";
+      sha512 = "1007c55b9481d35b9611ae42a71ca0135ae65fbd9a13e61cb5a90c4698ed1854fbd4129d14e394cc605362da3b2c22fdaba5229831353831ac21f3390af06376";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "7ed4a945cc3947de2b31e3045adfa2387e5ac7bc9c6420cee1c8bccab27e05278707b7ef15728ca0e89cfa2ac62fea0a155a0007c8f61178b56e8ad99ac8771b";
+      sha512 = "3cce46878580911ac18633095cdba6b180da1dd34ebd3ea0070be8e1ba3c1200c3cf46a8e00c246c95b4efbc32182f36be12685dd5873f57227e07e6a826af92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "dd45ec9ae649d43f7bc14c564cad8a5cb0c688b18a78296f01e60ddce161e43ee7f9f1d422378e560bd9b8b10d2e061e9e50d3173dc671d775e5fd64d5b977fd";
+      sha512 = "9f973ab872f47ce77130482cb4e9482b16edcc0445ca7f05d6b264eac288263e97326938904b09a43081766efad4c226ef5b5150ce9e4c640ad369f416a8325b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "017d2a07d554fea7dd140d7bf22998b3aa575086fe3145503a178369187c1f3afbd45009f08ba8bb0b0885b645ed0576600393315b02e356151c2c64e96055e1";
+      sha512 = "d681c9d2b0a345f144c4af91b3eca2cf0e23c0fb9eacf942ba459bf1b73e4c70122b20131714a3b92d6404f455877963a80bba3e01d2d674e56fcec8f76d4346";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "f24185e0ed7eb3f1982be22b74276aac1930af09f30184ab5c6ed3d3b2adae6c4ad05dd4d9ddc8a743c4482f503150f2624531ef1cfb58ae88b10a59773c314e";
+      sha512 = "1d32114be5bd45bd434cbec1a7cca2877aa324d57c02e1541f0eb37d79dd786f7b55fd42b1909e3ea3d6b4a3ea849f671922b8d95bab258b6f948480fe6205b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "28ce5d1cc9aed67c5ae6735e9712e42bc30233237f0597e12f4ab96c6a8119bd6d710c646b84c830023b41aef8a5bb8694a652b644c7ace78bc55381102b237e";
+      sha512 = "6ded88d5bc40b5878462fbc17a9af5e26a6b3cb05e53ef25050e24f98992e226d33a7855cd34eb1b73770e57cb9ad53bb17b9d711cdab969338c6cbb38837500";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "2d73a733ed3b6c64be8de608a00b11f1ed2e300fedc5111f9a92b1c0fe61b61eb043b6b9c71eb5fc497813d1e4dad4b940c472d119697c6dfbc6106751742834";
+      sha512 = "543eb909ae6fa971023cdbffd2a312f269ceb9fa20868d83a9e63bffc9936705a85919826577ed9a286e89df4a279d8a1b123ce48247443c7fbee96457ee3c7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f3621d39d396a32cea4d3fa41c83bddfe0c9d05e3fbd02805f1b87c9bb8ba517934602d06f7cd7c8c80f5ed4aab3df275227766aa939dcb5ab35305eebf1b3f9";
+      sha512 = "84262bbb055a96332f34c6aa26b9bbad69ff9e066cbc60829ccfe5a59f64d6c11838d45ed56aa3a9129c2786abae5e9f5fdc496759d87ba3f98a7e1e7db548d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "5cf7ae648c8d6db5d896a76183b9f06275199db489dfea6aa2c28bdd9377b22a5ba4fee0931a2c18c22b94239cda8d972438a63f2f6aba867051f8cb0152965e";
+      sha512 = "71a95fce457d0e7f07159241df7739b5cce62fa29a53729fbf1157bdf3eef85fcb9d277b9cc66cf67d767102e7aa16c6ef1bd371787fed4af29ce620b6b5ece5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "301de07712dc015e5b769aed8247461c8e15bd16955621a517206fde83c6c4599ccfb654e729b3a22ae6b51952060cb27db7b315f566b670d8c2bffb514959bb";
+      sha512 = "f12e626f88ed3e726be24322d21f126f3f30cf0acfa5842386f51d5b7cfd222b96978910804f631bb3f5cb4eb27040b01c9326e65f61b6167e49e60d6a40afcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "65b8949e7e0ca1ba596c7a40e75c3c463646dd72a044d989e68caa54b8aeab02403870040b7a27ec8811adb62046c3426e38038241293bc5e0308882d20d1077";
+      sha512 = "f5d0a876dd4f6644af01fc53080b6126ff9f128d6ca990d0e125c4ecf04a47c770a87e1fbe6975b3262449f0d066224cf9de1964cde57d0c3d7d50b709131675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b49589dfa85defb758c71f221f309869239039b5c8d30d40a6857d4e92e3113741a8eaf6e55e073f5a9bd212030d6497c05185c220a3249ddc2a4a6c6880e3b2";
+      sha512 = "af9e5e2fc9bb7e84aebe8cc12098a4a3a8cc405172a7ff73cfa3c8772d8a5515dd3c5647d7d51066a0a7612553313c5a05044740f66358452ac0a8c3d6dea227";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "a17982cc3590d552f907a3f9a5af3e0c3f234b40a1ea285e6805cec57b793645cd79e2c37422a2f83d1e70617a1b5a4f87b5c315d9fbe98293e061b2f836bd06";
+      sha512 = "0851f85849651463b8a841de88e69820f101b468a706e5bb0986debee21f0d7f0abb9f52f7e89c097361a21f6fcddb4d57f17015d41b1350dfb36b00b246888f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a9938d962796c573099a721a3fb8a4321378ff532e265bc4ecc3b09fc41268e236e0726e808865f4c655aa7f88f1f04ab1e73930a1a9a4a9d634af1bf8bd55e2";
+      sha512 = "b16ef7812f4f5f0cb4655ebd792ba38ba4858dd93713819a26ee9ad794d8754fe55bf6dae0bb6c371424776f9dad8c13e2449a43a1f14876ed309b2a0f9312fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a0f4a34628d805ce67b858a7f96368637c90c126c52e7fa26e540483ca201ab02d734770006ea1cf2c960f9cf614b9f0a326ea74a77c9e0abe3a23f3d6acbb90";
+      sha512 = "e337b418317b2e7a36d265755564fd6ac6fc227d59b31410b305502d1002b4d8fac06339f2c750bd9b26cc42094c89fc4d92d89c6dcb7992545489777bbc1f29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c87b8d03a22ccca2d57339797182ec37adc12b40bf4b83d72120b76792cf28d373f0948fcf0a06c2e983255951a026f207be8153169d4d61f493dab8b25242e9";
+      sha512 = "b83ef927a63ea25990f0a6690eba195360369e751ae0db446ec093e51a5a7c187c3ff902e3deddaee9b395359db4a7edec431565af167fddfd931d97e8078752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "20d20ed92b7fb5fa440b39c449000b391ba85bb3a4e98164c0529c150535cc992fdc7d3f6e8585d7404976e0a1204aa62e43fcad190c3999608dc6c5e9233497";
+      sha512 = "af8447042c0500fa5fb6f16f10a0550bc70fae412b5f4eb8e39fe8eceff10b22cc0b11357612ac1c06cc81fde74d9ebd2b6335c7c84c0c88e82bc6671257e8bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "c97905b3a5e3ec660b75348c2f9406053be2536600ce25bb43bea507aeab7a3780c8d2d972de05c17f605ce3a728d6197e1f762773d8141576c1e3e367f44250";
+      sha512 = "e59c323f6e4336b198f4785c1bd3d8a48577eb2c202a63c264b604ff16c2017ce43a9b05f7c0698995e9dd83278e817a056a14a5f6242065c2d50e545dd99c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "4a89765b60bc1c82d06f503e62274b266520bd1ecd1d3599074351aa825a4280a43ee05b8cabda9c6ff44451b09e02006e717eb5791942ac9989d1be79041655";
+      sha512 = "691faefa9a8f7ede8be09126174d8170c62c7cb670ac9373575726ea4eaaf64cfafc04312ca21e334f095b226d5d1f1dec860f6cf2e4a482adbfc22970c033ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "af73da40aedacc3aef9685f5916651564a6e329e4e1a97eb968373307d9f4a7d8ce81f72b770166395305e5dbe9043478d6164f89f40383b89e10dc3a2c5a107";
+      sha512 = "b65f1b2ddadeab279afe964da9097211b4cc5956ceab77cc48cea5ecf6815de03ba8e89f39b5c3ba4f7915c7150b8d1951c7fccdbd7f7db71a53b732aeff7182";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ea63038ec96426dccd9b8ebe13ff632794b3a320888b3f6f152a06a3c9e4fdabcf6f600351e5012b90ec924ff4dd9826dada493d0adbce4195ec9995a333a2e4";
+      sha512 = "4eb20efa50dd34e23b08f1bd25335cb296c8d5c4ed176e7882da4e466563e31a4cc1a0c0ad0950a7a892b28000811c70c7158a7e3da26c02d05129ef13fa0566";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "797d27215aa0e77a40b582bb7f2f45a1411d8d4159bd61a55fa72023c27f514d916f2b1fd5a2b89c240c1ee0142f54cd2934e4cd641f616d2efb6ec5ae31b98b";
+      sha512 = "4dab2d22e41590494366c582ffe8e80a2a635dd1b7d57416e51cf0c723cbc1d40c6964a30572283aa7c6d6312c54cb97a6610877eea1b4bc989ec871316cb93b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d3295470724ae625f603db98d305dc67964154e86e7b28d80bcc688ce87525bfe33ce3d60f315f48f70c09c1d1301656a46ac2acc8b312a430f625af9e2417b7";
+      sha512 = "f321afa413c878e4ed9b80c1e7b356a70125ae3799b2b47df32a011e60908f86a27572639df10d4826922b73b6515f463a1e5e0b3d60f8c20afb8d23c18ccf88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d9d9094f4cbb2f5659b598e332256bf77ae64cc162bbb8e8998e2d723ea8f2d65e3632b60a358e9f2e753cbf877edc59fd21ec3d3d99608bfd9090d24957d641";
+      sha512 = "d177a9a730911104761d6a7968aeb1cab62347438c5ed30099fb1fa9c9701b87562f081128062b3051ea6cc0495a58e4a8fd9b8c82d4ed7108d0bfd73da2fec1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c9c38f5bad724e4436519f01f0e25c715e7e107792ce9794fc9bcf7e9bbd687331efe004b10f18cc942f668504a43bf52ac2005d2bb663b28c99943dae8dcd01";
+      sha512 = "15e665808dfbf076932d17196e93f7db271d8f948ecb060a5f41934d59d75d6e7beae2b5abbc4cd5ba86e59e493c8f41f6a316f4be6603c0ab009714fe073391";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2b23f50006b2bbc66e79851b91dc62c948b75a00651d294afba17cf124f612c3bb2d39e9f8a56a74db7a8d22b8487ca7b600a453949973e1776be50152d5fd21";
+      sha512 = "ddc63cd63501e93c12fb687804a2d8ff7b5a4e996456e33a2d9b3531e72d9c85cd7db328ba3f7195ae5ce2b565d40fb4a6f2778ea7f6161596c3e21f5491eb13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "237882a2ec8d52a77fe533866171578780f74edcf790fa4515fe98c804491f86f76b99c645854778868e9ea58ac3b2cf75d504479d0c24fe24911c795e6e5a71";
+      sha512 = "1dcebfad1e5d987626e2941eed30b5ac84dc304231b76963c062561b1784dbd6f42bc7d01c2008b32cee7868158b786cf30dae7c5c8da1a6d8a176e9a16af591";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "d4e20f24409f05b541d5dd556b1270d609050b650ce708e2ed33e826ddea1c13103b2983bbec34ce51c52b7f2471e3c451775d6520da34d17b2274ef1db07fca";
+      sha512 = "aef13bc353d294944df1bae358572c9a7922e8ed41a8225d987ec6b4997aa317351a7684cbba482ff1928b63d3238ee85d07198bb8cc6dbc1a2e3b0fb9c29a57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f3c4726995f3daecfa23ea19623e9cc9c9fd3d90049176f16f4d68a2a17e6890448432c827fd6c1b9dea09787983cfb3e9d89683a05923e6b4b23b3c67fb0693";
+      sha512 = "5f84a47f2a22cfe759fe42b832bdec237b7cbbbcf26024a1508dc1a893172246a52e4f165d57bd082ff6780f00ff2a82fe574e4d521b29d98f0dfcc47ac152a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5e6941c9a3a2582010b95c45dd7b49b6dcaab47e54e5ca67e7b3956729c5ad5978dd3d4ba4cd28dedc9d89592ca95b895377803836214730e9f1f9e5b4da92d4";
+      sha512 = "303b4320405c301245095f0308e9b3757a502161bd43f3f6c5ea9255656dc1f394322718535887f5b3038dc0d6390483e74a6c5ff45fc28296dee3d83afc9425";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1a6126090610f906731f13dba405f167935a94e9583ffba4f08242b3882961ebb91de720a23b39ec3d84be5213893a9b82e2e9ca91c6cd70466ac7ef1bd600e3";
+      sha512 = "0e9eacf033d76e672f460b7b133ce5025fda39aa4102e55199f67691bc9acf121c78c5251b9ed1e7ab49d93b83e4bdbab6bad671f39c22a490103266d09b667a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "bc638ded0b4b14c0b347cb5c24f0988ce697ab29ef08f59633123ca38b056c4f7bb0421a6045835ec0875e663b9730d17cc7f7ddd8bcdc98f5a60cda61461ed3";
+      sha512 = "9b2ced81ea8deb62c0fb2a6fd3e660362ab64ae2ee706c06b6af0eb33f25df4bbe6386019cfd94f240ca4fba6e30d5ed51ad4c5b319afd76a2e5a62d6f0f023d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "fde6511fad810cb5d71fd1fd0864ac7a40dbf4535416ff127f7b12799ee9e220e3afc93fbabebaf8d6cbe939e54692ed3edc5a381fbb9a693c393dbc8f970e90";
+      sha512 = "1c4d3718362aff114193e92284c981a9bae5acbf956aeaf96d0ec23a3d469ddd064f5d7ee4bbe8c661bd644875f08159656e7d44949c59f91ce1a88e9404ffa5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "0b93c21e1d0c99b89393f8fd155d62a4c72a8c1ae488fcc081fa0895fe91ff056e44e2405e45f4a7139e9cba79c5cd6ce855f614f40457bc9adc6d592dff6936";
+      sha512 = "bcdfd59b76db31c01ee7a69551dc5c025858daf3f71a593f1e8959c8af20227ce3240234aa94f7bd53e753bfea796a29b7f82c924396a130cd895c134ec0dd31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "cc33a59bd8b5e4d07204fe2dba1135c02cca9ba60ba6439879b5dd1d7b32a21e9d5809e57345a649ba5b964567c3d30648508c1292a84dc381e747ad475d0058";
+      sha512 = "207d4701dd75d5b88bf06567b13934f59de38b631683275ad7fb2bacc4c0aac62ee5acdb1520c7c4e2671b33b06fad119ebbc02d04e583bcfa732969839455c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6c9b8db39a70abc07296597818a60d4a576d2bd9c0231817e85fa17737d541434cdb838a97011608165c1da759d5b9d295eebc4a790564ba37b56c201996db3c";
+      sha512 = "01a29678e43e8dc04c0a0340c6fd7c723584a398e797472932792b24911d2009e0a952f4031a3f11ce7c803b4c59b8d8b934d60ef3373204019c4bccd4d44639";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ac1017981cb75d361d1f8c7cc823fca38303c39afbefb3ff87d48d95baff2cf0a4dbc9863dbd55fadce85949e52e7e61889c05cad874686ddc073ed6e5acc228";
+      sha512 = "8037052b3fc838001f3159dd64254cf36426f9d11417dbe032926c263648dc9b53f451d9add606e6ceca0ae4599ee1949d92ba8f908fe16cbfad1e1a72b60279";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f5f1f97758f00c25f39f73b8e52a8c006fe653ceee232ca27a3e69d3b2abdf6316c237b1944d26dd39b51300aa72cc20c4b3d304aa6f1446a96b6165cf4f8757";
+      sha512 = "c5b2f583b8fd0cb8fad8057107663e875ccf84d53e81b2cdc32492924feb33cee1cef726e7455f316144e6cad8341e4b8b74b49ebab26de22b88a4833ea25724";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "9b1f37e9d97126cf3ab5500c6cf15bb161a286e0d878fe58014a7b5024942b944c9282b9b9e9c3587170a12d7ef69095e21d1db729c2b96db29c97b9dbfe9a42";
+      sha512 = "f2adaab166d20ee7b88fad7a3b9f1fbff7dbec6da77d48a44dbd4e1c74413db847cdf9b234f73fbf8cfb50426f0cb67cd7d9ea26c36566154428ec5b28770435";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "14937d2fad302f93b0011037c12298c7319a1020f5e54a7c54f8ca2278c5a1d6517fe0732292fa0b84edbd1af089c67f41d6651ca918c677d814ab537bf52126";
+      sha512 = "25f088cfc5d1fd4e52db26fc530e239765f6c25329b34fb61c54a4b7966ada5b83e476edc5d57edb9167584709d32dfb6c5f04a45262d4003f6ac3f6f5e5d345";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "61db659af8241ae107265708a50683aabc1a920a35e6f32bdc5559de0e0aa5409f577b4ae5d49577ce37290ad5ff3f281f3b8bb5c775c834acbb364d499e5be6";
+      sha512 = "202e9eb99e73e0eb78bb04f3b4ef677533e78f9b0713a7697b8b0e98c3da5401b3dbb240b5165df35ce31e4c809b45ddf99ad986b953a590dfe77a8e103e6da9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "2bdbdcba25483797d31778851b9e611ffa15c0f2744a56a8e3447607bb83be8fe179dfa7b3a7d24f017fe34f9f38dd8d8b3d41a1cd783c34b9ae1c4929571ef4";
+      sha512 = "bb3a223835f8a5c0248d0b2372361763dce8cd2980ce32d7f9f89c48ad45708ba7687ed7a525778e39fc139a39558269101bdcce6cef6a3476ab7470b38d52a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "19a4552318668d0e11892ac4b4fa371c82e72d0742ff26b63a9c6eef0949af261c352777feea41dd6c17e168f868652e75c4f56a9947dee11886d264a402ea06";
+      sha512 = "0d804e8567ea16f8935d4c2eb0b9c72d7d701b10b2ade4a08559ed300799d2cc904a40e38b4d4200d4392b646c319cb2421981e1f238b7ec1d44e161239f3e8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "51cdc0570513a3856c4e13f30dffbe7a55c30dd6a88d47528637c1159520180aa6516136c1f066f37bb06f79f8326ded3b3cad23b0f244bbae11476d68b3dddf";
+      sha512 = "7d764f40f4695ab30fe8fc8d8fa6d90a4db123994d2599ea81a771962832e03976361c06c6013f65f858f323605ea812d3aee1946ba02b6be11148a0f7fd3761";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "afc8732c67674956ecf9e0678d9459ad7328611d3f60b222871444c7f0a55989757f6eb230157c2bddd5833bd99b7fac3200a8a233ffba392f1d028f3d52b5b0";
+      sha512 = "1eedc5f92c9d776306e33f5faf984256a9a7b6f00c88d5e844a1acef9ac340bcf48c8016b1b398e85f40a7c6e211aac3cc31ce00a6f583a0b07a1cd1f3c9a9a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "4b7acb27a1dbb9982c624f3bb5b9d97add88fda23155ce4a8d0f6436e68a9073ea3df571f61e186a473c3c6d90e0af1f43d23a2708d04192f206d3f9d9c726dc";
+      sha512 = "90107ec2d734c3bead2ac24e0033e2f26ad11dca5f43c59bfe75ca44a33943f76346ac0497659891ca4aaaa10052bb157068a23f2e50fb7680c7f42fd258abaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "4797e5748f46f9c8939e225011fc42a9ef800cb1b1e26a875d59212d7617aa83d9add3222f51736c3be8bf5cdfa2668c16a89997f07e135438bbee936cabc1c5";
+      sha512 = "472877591d3f8ab1d1dbfa6132e8a6e909a62cdf5def3cc196870f0614aa0c02df9fed0138fff0b8eee05e594c887bc02a24880b11bd57c23dea5b0b0983b29b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "dafcb551c537397bb2d9198e1f24bd5ea21e727c6e35467782ba9b1a4a7dda6adf8fe5cb1f7f42d7da701bf3f5999244de5d3dec2cd16331277ce0c0eb0d93d5";
+      sha512 = "8abd3ab256491fa5033d5935fc0591dfaa2e9d49e6e988cc5a574533950c2f2f46739346766c2121b89755c073d9bb555832af47f177c43f39fd527ea559a66a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "447e74560fa96521663fbfde6b4f7b398a1ea13a2c2432afcaadae3bb84256a38d09d4af43bb2666f80dafe3df0cdfc1d8470efd2de7f8d5d0928cc286f4c86a";
+      sha512 = "266267334b93f63a5c70298700f0b7ba65dba2c32694a5dcce0a330d5eb6e8c023c25beb0ed20eb883da71e4488bf5e7ddfedeede9d69c4135f5ad9462a1aa45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6aa674a480e6d742c3309649d464845d6bd5654115b7171bb0cc5f48da05b85e9176c6ad20f58cc263fdd29e9406e3090b3061f702421c2563f8addce47827b6";
+      sha512 = "f8f23c2d0377b837c4f4ba35bb10ef8c4cd27a298d9a5ab3c9f1d05ec5bfa1aa05a1417a1e887d79e9dc7f51e6efc535784cef78021e8985d8e52f04d32e0493";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ebecec7d84d7ef6e84d2ad4377cd7d0a6b4ad12187655ac026df6691824b3ad1e5ae2d463939bc8c774b2d7d17eff00783083cca68436a3fa8cecd18920290a8";
+      sha512 = "228602ac0dfdd72dbb896390bb825611c81c91e004b82b97bff767b7b2915b44a379392cb4ae7fe3b5b2e1213b4a6ba4dac1877f1fd059358fe8c96d483e3218";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "46a8745147751200c6b13e10c1f41db9391cf066ae3475e0bee0de11639f624322a087ee73ae6c19c2236c91034f1bcade605ec7628e24c6104e83465a97baab";
+      sha512 = "ca99753782f7d750bcc657fbcf36a4d7897a33554e93ad10192a7381b490d420b23dd2c7d0faef8e85e9cf305dbe58e6d1c777ee37a40b998549d348260fe5d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "6b27353e212369d04c96d83f1b62118c08cf918060ba9d46809c1f3cd1141e7cb7e7e6662216fcc29f9917e6c24914462bb1406623a312d07fb48016fc705410";
+      sha512 = "86d35e76f7d67c0a89feef879b470443eb86b7199189066850d71a47785cfe5783a0b65684f811c9750e1f1cca894a3e6fc0abfc9fe3c68849695a8b2329d22c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5c7d44900276a10edc396a9829cd5ae581b9705627a8962ee9597a3b3bf57efb15caf054d7ed3bf6953c0f064a9ab29d1787304523be1c4c1ca33a307ba4a1e4";
+      sha512 = "5f8449b99cd446a75c2a2615fb9cec10fec2da30b72daf321baa50a177bcac90eef050798f0b1f99cd55967b2e7c350aa63cd9ce807d111816dfed1479296349";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "3d5e35caa8c65d8c6c9d88d0219d146d354089a5482f94c86a0a1a8a753010ddf1617df93d53a9eb476c285f7424b17b0cf8544fc6d969f3d7a26cefe858c8bf";
+      sha512 = "e3b40576f6cf2de97ba0051c8d9f215ce054dd07dcd5b8987543036ad002e01f3da3179fb54708de0999308604877feeae5bfb2298686629ccc7069e024e85cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f0ef50ea1caed890483c5a3496f4ca6986ef4ac526620c110187ee40766f6e1cf59d718d0745fc35c392d37ff1928a22f243a4d5842e81a34b84a63c53da6d38";
+      sha512 = "d4b92a8e92b4a0a731c22a01ee9b544a66393011cbc424bb9b46b935e80c82bcb3cd402a747a369673e97771a5c005ae0df300d358c531d2cc7cc9a8dda77bb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e96f335f5142a708b55ffbe4327fad650560f66ca96c260bab97a02e5c6ec38dcd6bce61b37447a8d1029284024cc9a6798df35554474dc38ad59f29fa85224d";
+      sha512 = "b683ef089694cd799c47b7d5f2380ca866d7d6f52e58d9eaf6fe317e83bc4b1e7a0399f3031d6cffa138c5f3aa9bf5eb295ec656d2bf6f0cf106acf8fb5f5e77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "80fe13bb2d037f3082ff02dfa764f565213c3b0d5a98617b6a290de54dc655ed8838522653bacbbf926e0daa34e5ccbd60198779996c771ced10030c46da1dc9";
+      sha512 = "91f436012f1acd2745a30be41dd7e8515f4205dcb51d8e02f7b54a9cd54998e1934787b1734abe3bb111c8d5ee6c7f732e3dd7d8090655d37152f5d2704fedd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "1612da9f841cebea951f1ae8b2f80c897eba920fd900748608495ab154e9443671df9969bad9923715e41c544e8ef63be3e998c4ee879fb58355234612ffbdfc";
+      sha512 = "f98dc5fd438ffa539bacb7aa277e9e0f1cf6945b9dc93b5e077c59f65ccee21f90eca04cec9e6ea784a9197c2891fac681ecd0b361e110422405b04b9d76bb34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "548058d77bc9d1076c1eb21f0a01be7fe028debc78ae083ff502c213bfe7776e4ac8480de6cf7338b80dbf38c475cd367564f1dfaa5fa8cddb5cdae0db2c7e22";
+      sha512 = "632d543561f33ccc79ce762ee5c93c4371d39867d2941d596d5025c0e307a676edf9ad65b3d1370d5689c7a1d54d36c1c470764d38b948e84137ea1f37ee2910";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7c0bf8c58d1c924245693cc02ddad3b886e94af1dabbdb3ae9344700de612018a75f233003dd2df698b2aca99b9ec4632e65d16c68980955540185842c9b8af2";
+      sha512 = "737b83ead2f9654c7afa632e534254816e7c00bd8b9220097eb63eb7b21472824670efe26e2e3a4a365d3720c0a74f96f16c38b6543c68165ed46ff479a22cd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c287e9cf132ec16e3e8427854941ee89ead1a29a8a68a92a7aa35b615fd2b526db825a3c66dc86f30dca5d149c2a5afc7c254af64225ae7145718602dddd631f";
+      sha512 = "f71ca5f154f30252d682b32eaba396fe7419a374737f6ab8c64cf9ab9c65dd8582068cd8ac1abb6aa2b687528b5e95019ebb0e18c60550dea519ab104d3e3c69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b06eccd2835a050c560f56dbf94d41f455b62a8407c5196cca44d7c9237cb451c42a4ef266e5e9348965b01768f314ec7bc2f437ed896e23100caba6f409ecf7";
+      sha512 = "7761d0b4e39a402cd48797bef220450438c4a0bee9987526ed8fb1e68c2dbbc05a3668ef76a7c5f20accc8079e8154f7e3ecdb824d8db6a299b032256f0826f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5747c1a9a1476ee6f6febb645b5140b60e5190eaea606a1edd8421cc1b66f6c98b710a447c6a8ed1b6730b5ce8dec47b69bf28810e17ce8b080624848618add0";
+      sha512 = "ca621f2849ac5c83a4de77b037b34f00a60b2dc1155dfad571296b56ff130c6a003a4c28c7749b3476cee04e1635892766abe7577901ebd7b1ca1a9089398634";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ec71cc4c702bd454ebab8028ed810fa51889d01f1b0d34729fbab44ce5489bea031f3c5f6ac5392954343ce050a96681d043406f29c10d317b976b5e3d0cd8c4";
+      sha512 = "4ea40fa5510ad66bdeda6120dae1af500e79d05ac970f5d67de6c94af5f9250e6f86dda427eb1e43b6fa544e33c33564fd970488836eb4d715f1af717f28302a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "147654e7bb5df1f62c9bc117d2badf0e3a92612b79bb660ca09658146644baac275a7d3f6f643f751bb585bef867b9ed23ceef55d72e2d02f1ff4f44e076e0e5";
+      sha512 = "cd9f467df91afb7fc193b97dfdc845ff958d0db05cf483ab48876316df6f024e49cdcb136e5731ec0171234bfaeac7e4facf50dd949e59996e45a442fa1bcd51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "baa454a5c4d8d7994a49c8cefd015052b0f3af6f55e15a721ac00e8e7108f83fa78e5e1e5c90576f0bc508574e2ccbf3c72524192a310b29e30a430e5928b8a3";
+      sha512 = "07cbd77ab9c33057d06340a056ecd34197f9e037527005f046a9b6cfdbd8347f04d6b4ec7b81774f0402ea642be955a2800ae65c7eb8c542a1313136ef44564c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "fdb5eacc20856b0735ba8e9f2ff47eee70e6c203b53bbc38cf65a4949ad939cc70ab640392bed4c6964bc4acc25c0351b4d9e2ee2b2d72f6b2ff3247eaa8e2de";
+      sha512 = "602fd5c1cd41c9f27eb8a0371b882fe3061125b80173f681640acf07678f00971c4000f8ab4aee3fc62313e4ff5a4ee4ba19fd44043d4fa2cad99f8998033b9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7da1522c7af4e9db8f3fc7a7a2fa30ac12a06c8c20d7d53e0a0097ceaced9124d861d688b6ef26e8f808ba672bfe12b2ad3e4ee5921a0771d0348bf99a5bd1b0";
+      sha512 = "91891ab6d431f3eaeacd2e33d8efb9069f3671196e613e2ea0bf35838f256e3d9e333b25842090b708e09d531e13e2a234577af6c566af815ed8c5d6e7133c25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a146f736849969e36b72f69661da5d50cc3ecc79542ddf84e09a12d9877b6d654734a22d28a2320b0e27c4443f05186bab2549f55e582eb6f2279bb1922f3979";
+      sha512 = "3f1a0fb3a98f6382415b24d9812dfa6a1d716716d1f5bd9094cd9b0fcc794cee2a14d19dc117e7acbab1c9743205a4e2d21964c79aa42649f27c65a08d47df37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "62bebbf542d9b2fc62cf0c9e4abca1a216c222ca97bf59d1c5639a04cdb13a230e80a1762af6f682e0bdc7042685b9104702810c2199bb4ff092e0a63b81535f";
+      sha512 = "868d98dc2aca742ad59e0d1510e39f6dfb571f5a5155ba2d515731bb067eb0f41730be49556d93ab957e71d3a1d1694a7da20f30f208b4125be1fc3491becff1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b3c4477e89ce0fffaa2f7f6d9d0b64d5ee6856e4a40183f07f87ec10393f73041d2c6d87a3460dd399f8bc96e11ca6264af0599e869b5d87da0e1415d5853b08";
+      sha512 = "db4e378e90c86828f080283ca009e8ed9d3376ad95955847b4aac5defa0f02552d80e78c368d56582c42c1c067027d9f1e9a817ab633a0dea426b84523844d58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "0b0faf13210802a911f899a0b5df4ca67bda2eb98a8c37b43f0cf9f9ec5fe9c7798f375c6369c5507e23e45f772c7f610d048348ecb18e5519f5796342bdb46a";
+      sha512 = "1e1935d239adabc17e1a0d57c614615aa78154d2fd68a876787f5f3f0ca02ea090ffe1b1803d9528fe8579de988cdd78812b3251f48aa1fff8cc69bb1ed46cbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "53ad88363b5c884a7660cbe0aca223e2baf9f3fac49b6d4928d7744be2e70d4feb1dd4321283c76fb4375c9b74bd5ec73511b43c165f2a3d032185d25b92456c";
+      sha512 = "6ab2ecf874d56fbc6ef6d1a4be74615c39e22da1836f4b20f65132c92789e14d221b589702aeedfe9f0274bbf86350b33b69a6af0dfd53505104e9b95f17c746";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8c1551b2bbd07e046ebed7604c0e64d5764af28f94a628b6cba3c68d0258db3f26810d8eb9755013724530a5656e29e05f012fc3c0477977dea079e02a755cbb";
+      sha512 = "e7b7479f4be29ba7517da68cd88aa3e9f35031c84b0aa5cbdfdb025682ced06d16f7af5dfc402d5bd4f23230e6f211b98720fb5c7b99a8edcf04b43fac3f4214";
     }
     ];
 }
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 53b24552d373..2ba7bebc0c61 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -23,7 +23,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.26.0";
+  version = "0.27.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -31,7 +31,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6";
+    sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
   };
 
   patches = [
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 07c9e9ba6784..79eb8bb233c9 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -69,6 +69,8 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/bin"
     cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
+    install -D -t "$out/etc/bash_completion.d" contrib/completions/bash/*
+    install -D -t "$out/share/zsh/site-functions" contrib/completions/zsh/*
   '';
 
   preFixup = ''
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 4946c065492f..512c31e3d041 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.14.2";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi";
+    sha256 = "0vh2zjg0vaczh5mfyykb2kk9d8mi07dkr8zy60bpqf0y1lfamv0a";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 5d476f54304a..2799f50e584c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.20";
-    sha256Hash = "00ncpb1qs88jrrmmx7f7l8wy37wbwnrb958x3xls14p1h1xg63l6";
+    version = "1.2.21";
+    sha256Hash = "0s7dywyz8p626741m32l4a90l1x01564xg2g10gvdb25s2phdfdl";
   });
 }
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 904a6812c489..b470c6b39d3b 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
-  version = "4.1.0.0";
+  version = "4.1.1.1";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab";
+    sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
      substituteInPlace Makefile \
+       --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
        --replace "lrelease-qt4" "${qt4}/bin/lrelease" \
        --replace "qmake-qt4" "${qt4}/bin/qmake" \
        --replace "-o root -g root" ""
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 13b861d0a9ed..99b6b5313709 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -67,7 +67,9 @@ rec {
 
   git-crypt = callPackage ./git-crypt { };
 
-  git-dit = callPackage ./git-dit { };
+  git-dit = callPackage ./git-dit {
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+  };
 
   git-extras = callPackage ./git-extras { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 41096441b8e7..654576a29e80 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -8,6 +8,10 @@
 , perl
 , pkgconfig
 , rustPlatform
+, curl
+, libiconv
+, CoreFoundation
+, Security
 }:
 
 with rustPlatform;
@@ -35,6 +39,11 @@ buildRustPackage rec {
     openssl
     libssh
     zlib
+  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [
+    curl
+    libiconv
+    CoreFoundation
+    Security
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index f3e2072d6dac..a07a15177d04 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -29,13 +29,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "21.1.1";
+  version = "21.1.2";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv";
+    sha256 = "1gl6qibvckczk3yl44h3yshml6sn3izwn58qpxils5837rpkwlc5";
   };
 
   patches = [ ./find-xcb.patch ];
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index e0aec6e0e18b..5c738dd7f0b3 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -47,7 +47,7 @@ let makeDeps = dependencies:
     '';
 
     configureCrate =
-      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }:
+      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }:
       let version_ = lib.splitString "-" crateVersion;
           versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
           version = lib.splitString "." (lib.head version_);
@@ -79,6 +79,8 @@ let makeDeps = dependencies:
 
       mkdir -p target/{deps,lib,build,buildDeps}
       chmod uga+w target -R
+      echo ${extraLinkFlags} > target/link
+      echo ${extraLinkFlags} > target/link.final
       for i in ${completeDepsDir}; do
         symlink_dependency $i target/deps
       done
@@ -421,9 +423,11 @@ stdenv.mkDerivation (rec {
       if lib.attrByPath ["plugin"] false crate then "dylib" else
       (crate.type or "lib");
     colors = lib.attrByPath [ "colors" ] "always" crate;
+    extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
     configurePhase = configureCrate {
       inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
               crateFeatures libName build workspace_member release libPath crateVersion
+              extraLinkFlags
               crateAuthors verbose colors;
     };
     extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 971c4d0f5e22..d82a92042307 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -19,8 +19,9 @@ in
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
   curl-sys = attrs: {
-    buildInputs = [ pkgconfig zlib ];
-    propagatedBuiltInputs = [ curl ];
+    buildInputs = [ pkgconfig zlib curl ];
+    propagatedBuildInputs = [ curl zlib ];
+    extraLinkFlags = ["-L${zlib.out}/lib"];
   };
   libgit2-sys = attrs: {
     LIBGIT2_SYS_USE_PKG_CONFIG = true;
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 1ef00de5b83b..46ce08fe8cf2 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a2febcad5a83b15dea74462890e3c48c13f55f1.tar.gz";
-  sha256 = "1z6mfk49hsxvcpv183wayirspx78xd1l0w42wf8mfyf0jh8grfff";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7988bc2977184737900cc54b2dda27af6921f5ee.tar.gz";
+  sha256 = "1zagnnab5z3zymniw5rrdahlxrfpnyf30iysa1lylgwlscnzfv0l";
 }
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 5b91ded959b3..2a26f9301123 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -9,13 +9,13 @@
 # TODO: ovirt (optional)
 
 let
-  version = "3.28.3";
+  version = "3.28.4";
 in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d";
+    sha256 = "1378zzqdwv0hnirg8k91s5vgkcl1brfild3hgach5jhg78nxdb4j";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index b3ede7028902..c8a8f8e7e322 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-getting-started-docs-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0x60aava6ba4xliy4p4i6jm5d2nq8hx9aqgnaw4d34fvmcpcy5w0";
+    sha256 = "0vg0b4nr7azj6p5cpd7h7ya5hw6q89gnzig8hvp6swwrwg2p5nif";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 9aa8eee0bca8..560d8446f088 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.28.2";
+  version = "3.28.2.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
-    sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid";
+    sha256 = "09lvpiqhijiq0kddnfi9rmmw806qh9a03czfhssqczd9fxmmbx5v";
   };
 
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index ed1e59da62c2..13f4b1ef6389 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-desktop-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "16nbgrp0hihvrsa6kmqk0z8y7ajravyagmkmq1nnwn27psi9g8vq";
+    sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 4f9e2dda5402..38f105bfcb0f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-disk-utility-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6";
+    sha256 = "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6";
   };
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 2d5080841a4a..81d401f8da2e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-software-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0j27zygb3g08q9i8ygwpxqf6g0lrivq2vhj7p7g9x0zh9r0vzlbs";
+    sha256 = "1s19p50nrkvxg4sb7bkn9ccajgaj251y9iz20bkn31ysq19ih03w";
   };
 
   patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 46a91dda70e0..c402a2edd8fb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-system-monitor-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0wdpd5mfrm0gwmwjvcj556c3mpxf3pcfnvh7x698i8if53ci0gw7";
+    sha256 = "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index a8efa2384470..6cb827bc504f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-user-docs-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "189j78d23c6jr5x5j9nxkbdqxg31xvmwvyblz7f9xi9ncy0qdvfh";
+    sha256 = "0gg1rgg15lbgjdwpwlqazfjv8sm524ys024qsd4n09jlgx21jscd";
   };
 
   passthru = {
diff --git a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
deleted file mode 100644
index ee48901a6d0c..000000000000
--- a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958,
-which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths.
-
---- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC
-+++ b/gcc/auto-profile.c
-@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3.  
- <http://www.gnu.org/licenses/>.  */
- 
- #include "config.h"
--#include "system.h"
--
--#include <string.h>
- #include <map>
- #include <set>
-+#include "system.h"
- 
- #include "coretypes.h"
- #include "hash-set.h"
---- a/gcc/graphite-isl-ast-to-gimple.c 2017-01-19 21:02:12 UTC
-+++ b/gcc/graphite-isl-ast-to-gimple.c
-@@ -38,6 +38,7 @@ extern "C" {
- #endif
- #endif
- 
-+#include <map>
- #include "system.h"
- #include "coretypes.h"
- #include "hash-set.h"
-@@ -75,7 +76,6 @@ extern "C" {
- #include "tree-scalar-evolution.h"
- #include "gimple-ssa.h"
- #include "tree-into-ssa.h"
--#include <map>
- 
- #ifdef HAVE_isl
- #include "graphite-poly.h"
---- a/gcc/system.h 2015-01-05 12:33:28 UTC
-+++ b/gcc/system.h
-@@ -217,6 +217,7 @@ extern int errno;
- #ifdef __cplusplus
- # include <algorithm>
- # include <cstring>
-+# include <new>
- # include <utility>
- #endif
- 
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix
index cb9f78aa0813..48e2ca0a585c 100644
--- a/pkgs/development/compilers/ghc/7.10.3-binary.nix
+++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
     # Some scripts used during the build need to have their shebangs patched
     ''
       patchShebangs ghc-${version}/utils/
+      patchShebangs ghc-${version}/configure
     '' +
 
     # Strip is harmful, see also below. It's important that this happens
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8278b4bdc5ea..2fc5c20c3374 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -82,7 +82,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd";
+      sha256 = "1w0gzqk70ymlpvh9zqkg1cd3ipaw4n85k4zsf49xl6kjp4vbcmwj";
     };
   })).overrideScope (self: super: {
     aws = dontCheck (self.aws_0_18);
@@ -1036,8 +1036,8 @@ self: super: {
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
 
   # Builds only with the latest version of indexed-list-literals.
-  vector-sized_1_0_1_0 = super.vector-sized_1_0_1_0.override {
-    indexed-list-literals = self.indexed-list-literals_0_2_0_0;
+  vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override {
+    indexed-list-literals = self.indexed-list-literals_0_2_1_1;
   };
 
   # https://github.com/dmwit/encoding/pull/3
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 12fd59748307..011f307e8a81 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -73,41 +73,6 @@ self: super: {
     doHaddock       = false;
   });
 
-  ## Needs bump to a versioned attribute
-  hspec = overrideCabal super.hspec_2_5_0 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## hspec-core ==2.4.4, hspec-discover ==2.4.4
-    ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## infinite recursion encountered, at undefined position
-    ## test suite causes an infinite loop
-    doCheck         = false;
-  });
-
-  ## Needs bump to a versioned attribute
-  hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: {
-    ##     • No instance for (Semigroup Summary)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Summary’
-    ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## infinite recursion encountered, at undefined position
-    doCheck         = false;
-  });
-
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## hspec-discover ==2.4.8
-  hspec-discover = super.hspec-discover_2_5_0;
-
-  # https://github.com/jcristovao/enclosed-exceptions/issues/12
-  enclosed-exceptions = dontCheck super.enclosed-exceptions;
-
   ## On Hackage:
 
   ## Upstreamed, awaiting a Hackage release
@@ -444,17 +409,20 @@ self: super: {
   });
 
   # Older versions don't compile.
+  base-compat = self.base-compat_0_10_1;
   brick = self.brick_0_37;
   dhall = self.dhall_1_13_0;
   dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
+  hspec = dontCheck super.hspec_2_5_1;
+  hspec-core = dontCheck super.hspec-core_2_5_1;
+  hspec-discover = self.hspec-discover_2_5_1;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
-  pandoc = self.pandoc_2_2;
+  pandoc = self.pandoc_2_2_1;
   pandoc-types = self.pandoc-types_1_17_4_2;
   wl-pprint-text = self.wl-pprint-text_1_2_0_0;
-  base-compat = self.base-compat_0_10_1;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b3f8efa3963e..418310581812 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.8
+  # LTS Haskell 11.9
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -94,7 +94,7 @@ default-package-overrides:
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
-  - ansi-terminal ==0.8.0.3
+  - ansi-terminal ==0.8.0.4
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - apecs ==0.2.4.7
@@ -291,7 +291,7 @@ default-package-overrides:
   - Chart-cairo ==1.8.3
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
-  - chatwork ==0.1.3.2
+  - chatwork ==0.1.3.3
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -526,7 +526,7 @@ default-package-overrides:
   - doctest-driver-gen ==0.2.0.2
   - do-list ==1.0.1
   - dom-parser ==3.0.0
-  - dotenv ==0.5.2.4
+  - dotenv ==0.5.2.5
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
@@ -906,7 +906,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - hocilib ==0.2.0
   - Hoed ==0.5.1
-  - hOpenPGP ==2.6.1
+  - hOpenPGP ==2.6.2
   - hopfli ==0.2.2.1
   - hosc ==0.16
   - hostname ==1.0
@@ -937,9 +937,9 @@ default-package-overrides:
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
   - hsinstall ==1.6
-  - HSlippyMap ==3.0
+  - HSlippyMap ==3.0.1
   - hslogger ==1.2.10
-  - hslua ==0.9.5.1
+  - hslua ==0.9.5.2
   - hslua-aeson ==0.3.0.1
   - hslua-module-text ==0.1.2.1
   - hsndfile ==0.8.0
@@ -1051,7 +1051,7 @@ default-package-overrides:
   - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.1
   - indexed-list-literals ==0.1.0.1
-  - inflections ==0.4.0.1
+  - inflections ==0.4.0.3
   - influxdb ==1.3.0.1
   - ini ==0.3.6
   - inline-c ==0.6.0.6
@@ -1087,7 +1087,7 @@ default-package-overrides:
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
-  - irc-client ==1.1.0.2
+  - irc-client ==1.1.0.3
   - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
@@ -1101,7 +1101,7 @@ default-package-overrides:
   - ix-shapable ==0.1.0
   - jack ==0.7.1.3
   - javascript-extras ==0.3.2.0
-  - jmacro ==0.6.14
+  - jmacro ==0.6.15
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
@@ -1287,7 +1287,7 @@ default-package-overrides:
   - minimorph ==0.1.6.1
   - minio-hs ==1.0.0
   - miniutter ==0.4.7.0
-  - mintty ==0.1.1
+  - mintty ==0.1.2
   - misfortune ==0.1.1.2
   - miso ==0.14.0.0
   - missing-foreign ==0.1.1
@@ -1315,7 +1315,7 @@ default-package-overrides:
   - monadloc ==0.7.1
   - monad-logger ==0.3.28.5
   - monad-logger-json ==0.1.0.0
-  - monad-logger-prefix ==0.1.9
+  - monad-logger-prefix ==0.1.10
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
   - monad-memo ==0.4.1
@@ -1358,7 +1358,7 @@ default-package-overrides:
   - murmur-hash ==0.1.0.9
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
-  - mwc-probability ==2.0.2
+  - mwc-probability ==2.0.3
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
   - mysql ==0.1.5
@@ -1653,7 +1653,7 @@ default-package-overrides:
   - raaz ==0.2.0
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
-  - rakuten ==0.1.1.1
+  - rakuten ==0.1.1.2
   - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
@@ -1731,6 +1731,7 @@ default-package-overrides:
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.4
   - riak-protobuf ==0.23.0.0
+  - rio ==0.1.2.0
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
   - rollbar-hs ==0.2.0.0
@@ -1754,13 +1755,13 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.4.2.0
-  - scientific ==0.3.6.0
+  - scientific ==0.3.6.2
   - scotty ==0.11.1
   - scrypt ==0.5.0
   - sdl2 ==2.4.0.1
@@ -1798,7 +1799,7 @@ default-package-overrides:
   - servant-github-webhook ==0.4.1.0
   - servant-js ==0.9.3.2
   - servant-JuicyPixels ==0.3.0.3
-  - servant-kotlin ==0.1.1.0
+  - servant-kotlin ==0.1.1.1
   - servant-lucid ==0.8
   - servant-mock ==0.8.4
   - servant-pandoc ==0.5.0.0
@@ -1951,7 +1952,7 @@ default-package-overrides:
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
-  - svg-builder ==0.1.0.2
+  - svg-builder ==0.1.1
   - svg-tree ==0.6.2.2
   - swagger ==0.3.0
   - swagger2 ==2.2.1
@@ -2128,7 +2129,7 @@ default-package-overrides:
   - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
-  - unbound-generics ==0.3.2
+  - unbound-generics ==0.3.3
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
@@ -2258,7 +2259,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.4.0
+  - websockets ==0.12.4.1
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.5
@@ -2305,7 +2306,7 @@ default-package-overrides:
   - x509-validation ==1.6.10
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xeno ==0.3.3
+  - xeno ==0.3.4
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
   - xls ==0.1.1
@@ -2333,7 +2334,7 @@ default-package-overrides:
   - xturtle ==0.2.0.0
   - xxhash ==0.0.2
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.29
+  - yaml ==0.8.30
   - Yampa ==0.10.7
   - YampaSynth ==0.2
   - yeshql ==3.0.1.3
@@ -2343,7 +2344,7 @@ default-package-overrides:
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.2
-  - yesod-core ==1.6.4
+  - yesod-core ==1.6.5
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index bad45c3a27e7..b6f5c57c73c7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4924,6 +4924,17 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "Enum" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Enum";
+       version = "0.1.0.0";
+       sha256 = "1zl5w5w3rqbh4awp4b4rbamkqcvnrzn944rjc84sq3rqad3wlww2";
+       libraryHaskellDepends = [ base ];
+       description = "Non-crashing `Enum` operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "EnumContainers" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -5554,12 +5565,12 @@ self: {
      }) {};
 
   "Fin" = callPackage
-    ({ mkDerivation, base, clist, natural-induction, peano }:
+    ({ mkDerivation, base, natural-induction, peano }:
      mkDerivation {
        pname = "Fin";
-       version = "0.2.0.0";
-       sha256 = "0w4gmfhpav73rkia3q7g6m4lncz1smhfa0rl2sr0602sc0694spr";
-       libraryHaskellDepends = [ base clist natural-induction peano ];
+       version = "0.2.3.0";
+       sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g";
+       libraryHaskellDepends = [ base natural-induction peano ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6084,8 +6095,8 @@ self: {
     ({ mkDerivation, array, base, process }:
      mkDerivation {
        pname = "GHood";
-       version = "0.0.6";
-       sha256 = "0n9vp4y5d1fx45x6s5a84ylyvnjyaq44x9r46zyh0dkyrms3jsqi";
+       version = "0.0.7";
+       sha256 = "056kil71f488xf87xlyx9p5jpah2azhbnb2r7hwdyxbz7izns2ks";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
@@ -8652,8 +8663,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HSlippyMap";
-       version = "3.0";
-       sha256 = "1kqyahisqzilndargvyh0gqln3471ll1jkpnayirfi9am1by4f93";
+       version = "3.0.1";
+       sha256 = "03gb5dd59mirwb11b98vbg60w2zwfsbr8akk7qbq01z7n7rkgsr7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/apeyroux/HSlippyMap";
        description = "OpenStreetMap Slippy Map";
@@ -9161,6 +9172,8 @@ self: {
        pname = "HaXml";
        version = "1.25.4";
        sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p";
+       revision = "1";
+       editedCabalFile = "1vnil3xdyhr48f0nxcaljbl1k5ibg5g5gghvrhykg447b0jvp922";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9568,17 +9581,17 @@ self: {
 
   "Hastodon" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
-     , exceptions, http-client, http-conduit, http-types, mime-types
-     , MissingH, resourcet, text, transformers
+     , containers, exceptions, http-client, http-conduit, http-types
+     , mime-types, MissingH, resourcet, text, transformers
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.4.1";
-       sha256 = "08skn3qvqfzll1hhzayqm46kwdl45kbckgwvzjm4bqa5w5jvh708";
+       version = "0.5.0";
+       sha256 = "1yr72vkj4ir7q6w1fnffra9lr0jvz2pfskd2g1zwg3a778cbyx9h";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit exceptions http-client
-         http-conduit http-types mime-types MissingH resourcet text
-         transformers
+         aeson attoparsec base bytestring conduit containers exceptions
+         http-client http-conduit http-types mime-types MissingH resourcet
+         text transformers
        ];
        homepage = "https://github.com/syucream/hastodon";
        description = "mastodon client module for Haskell";
@@ -12268,6 +12281,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Map" = callPackage
+    ({ mkDerivation, base, containers, either-both, filtrable, map
+     , smallcheck, tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "Map";
+       version = "0.0.0.0";
+       sha256 = "1w79zzlzh3ivrqznvcrg5kgaizzs838y7hd52nvxn5v7lax5y3wz";
+       libraryHaskellDepends = [
+         base containers either-both filtrable util
+       ];
+       testHaskellDepends = [
+         base map smallcheck tasty tasty-smallcheck
+       ];
+       description = "Class of key-value maps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {map = null;};
+
   "Mapping" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -13914,6 +13947,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OneTuple_0_2_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "OneTuple";
+       version = "0.2.2";
+       sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
+       libraryHaskellDepends = [ base ];
+       description = "Singleton Tuple";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Only" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -14749,6 +14794,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Persistence" = callPackage
+    ({ mkDerivation, base, containers, maximal-cliques, parallel
+     , vector
+     }:
+     mkDerivation {
+       pname = "Persistence";
+       version = "1.0";
+       sha256 = "12n0d5r03cp88svw0mfhimsr4a585qsq90cpszmcr3l5gsai3h9d";
+       libraryHaskellDepends = [
+         base containers maximal-cliques parallel vector
+       ];
+       description = "Quickly detect clusters and holes in data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Phsu" = callPackage
     ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup
      , containers, curl, filepath, friendly-time, happstack-server
@@ -16667,8 +16727,8 @@ self: {
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.6.1";
-       sha256 = "0axwf7rdwhl3ppq6qlxrffzbzbwvb8q0ygpnlzc2yvksiqzp9h2g";
+       version = "0.6.2";
+       sha256 = "1d5qw79809v7q2dvyz7h857lhdbahcj8915pz0bz95nmknbjc50f";
        libraryHaskellDepends = [
          aeson base bytestring cereal cereal-text containers
          data-default-class directory exceptions executable-path fgl
@@ -21796,6 +21856,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "acquire" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acquire";
+       version = "0.2.0.1";
+       sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/metrix-ai/acquire";
+       description = "Abstraction over management of resources";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "action-permutations" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -21815,8 +21887,8 @@ self: {
        pname = "active";
        version = "0.2.0.13";
        sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
-       revision = "4";
-       editedCabalFile = "1p2gaazj7r98v45d57hshgv6nxam5l47dl6y9iq65z5zqylmz7q2";
+       revision = "5";
+       editedCabalFile = "0hwla9xz275qzgn9n07311ksl3j40izidki1nbhmrmmmfjin57cv";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -22246,20 +22318,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_3_1_0" = callPackage
+  "aeson_1_3_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
      , hashable-time, HUnit, integer-logarithms, QuickCheck
-     , quickcheck-instances, scientific, tagged, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, th-abstraction, time, time-locale-compat
-     , unordered-containers, uuid-types, vector
+     , quickcheck-instances, scientific, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-abstraction, time
+     , time-locale-compat, unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.3.1.0";
-       sha256 = "0ljndkgibz3qbddz2451v1r9w8i440kpslg3al3m7gc82mxz2xrr";
+       version = "1.3.1.1";
+       sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text
@@ -22270,9 +22341,9 @@ self: {
          attoparsec base base-compat base-orphans base16-bytestring
          bytestring containers directory dlist filepath generic-deriving
          ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
-         quickcheck-instances scientific tagged template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time time-locale-compat unordered-containers uuid-types vector
+         quickcheck-instances scientific tagged tasty tasty-hunit
+         tasty-quickcheck template-haskell text time time-locale-compat
+         unordered-containers uuid-types vector
        ];
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
@@ -22398,6 +22469,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-decode" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, containers, data-default
+     , hedgehog, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-decode";
+       version = "0.1.0.0";
+       sha256 = "0x5gjp86554p09r8r73wpmv840d6dkc7vmqyq60nj6v6spq5v7bx";
+       libraryHaskellDepends = [
+         aeson base containers data-default text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson-qq base containers hedgehog text time
+       ];
+       homepage = "https://github.com/typeclasses/aeson-decode";
+       description = "Easy functions for converting from Aeson.Value";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aeson-diff" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
@@ -22427,6 +22517,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-diff_1_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest
+     , edit-distance-vector, filepath, Glob, hashable, mtl
+     , optparse-applicative, QuickCheck, quickcheck-instances
+     , scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-diff";
+       version = "1.1.0.5";
+       sha256 = "1kzvqzbl6pp5g49dp4qqc7cbisnkpqz0i18b6nmdb7f1nrhdvnb1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring edit-distance-vector hashable mtl scientific
+         text unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory doctest filepath Glob QuickCheck
+         quickcheck-instances text unordered-containers vector
+       ];
+       homepage = "https://github.com/thsutton/aeson-diff";
+       description = "Extract and apply patches to JSON documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-diff-generic" = callPackage
     ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring
      , containers, dlist, hashable, lens, scientific, tagged
@@ -23048,6 +23167,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "affine" = callPackage
+    ({ mkDerivation, alg, base }:
+     mkDerivation {
+       pname = "affine";
+       version = "0.1.1.0";
+       sha256 = "094h5b5l755sm79mr47dm5brp2jvfd2g0mdz23mcw1pz57lm0c8i";
+       libraryHaskellDepends = [ alg base ];
+       description = "Affine spaces (generalized)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "affine-invariant-ensemble-mcmc" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive, split
      , vector
@@ -23784,8 +23914,8 @@ self: {
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.4.1";
-       sha256 = "0fx3q5ivd942yly212k0qdrhwbjpx0y4sj1r2r9lbhxb2941rg4n";
+       version = "0.2.5.0";
+       sha256 = "014wrh4f58lq50n5ybdksr2k5lygs5qxsyxg48zpbzzz3p3494yx";
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -24486,20 +24616,20 @@ self: {
 
   "amazonka" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
-     , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
-     , time, transformers, transformers-base, transformers-compat
+     , conduit-extra, directory, exceptions, http-client, http-conduit
+     , http-types, ini, mmorph, monad-control, mtl, resourcet, retry
+     , tasty, tasty-hunit, text, time, transformers, transformers-base
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.5.0";
-       sha256 = "0g5fb1kwydhhi4pvp4skc0l26gy0kdpbrl3pixmnml5d2fxa86pw";
-       revision = "1";
-       editedCabalFile = "0v4wfwrm0zjzm1g2gw9qi521hlvzg26dm79x03zy8i2aqg8rqgri";
+       version = "1.6.0";
+       sha256 = "07647x7lq9kaq6bqh38rvdiajji4ks6s7nvxv2xi4v4lhwn8j89p";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
-         exceptions http-conduit ini mmorph monad-control mtl resourcet
-         retry text time transformers transformers-base transformers-compat
+         exceptions http-client http-conduit http-types ini mmorph
+         monad-control mtl resourcet retry text time transformers
+         transformers-base transformers-compat void
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/brendanhay/amazonka";
@@ -24508,14 +24638,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-alexa-business" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-alexa-business";
+       version = "1.6.0";
+       sha256 = "0r8qdcc4fxgpx7pgfkcah6pxq8dixaw167ph30a087rr74rfk0k1";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Alexa For Business SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-apigateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-apigateway";
-       version = "1.5.0";
-       sha256 = "1yamp1wlhji496sd0c6gkilx6n3m59wwvxpfh3vpy4wv93xh5494";
+       version = "1.6.0";
+       sha256 = "1s2snyx9s23435wsan8hbi1vnql3n3rgh23ffv9d0n43pp7kxrjn";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24533,8 +24681,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-application-autoscaling";
-       version = "1.5.0";
-       sha256 = "0iwrzk9wfnf46as45lv31qxghlbq823yphkw0dzh39vmqyc2zmfn";
+       version = "1.6.0";
+       sha256 = "1xqxlrw02r4w5h348ab04lrwp4cxk3sksx5xhmxr1macqb8sfdjm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24552,8 +24700,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-appstream";
-       version = "1.5.0";
-       sha256 = "05g5xz68v3azvh8f5hcqijvif6g4jm0bmb3y9fgcn21f4lzl6ibc";
+       version = "1.6.0";
+       sha256 = "1ps76yri9bnfkr4ya1yc9myrzpf44a01nrkd03kw8qidjcmnk47b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24565,14 +24713,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-appsync" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-appsync";
+       version = "1.6.0";
+       sha256 = "0yvi3gjzpb1i7ria8asc054p9jnxqilkb4gzd4pj40mjls28bxj5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon AppSync SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-athena" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-athena";
-       version = "1.5.0";
-       sha256 = "0chg6wgp20qlpz9w5sryy9i2cxbnb9zdh2a6sg94vrivl3q19d5d";
+       version = "1.6.0";
+       sha256 = "1nvprlnbr6wp96cykgnkbchp2n6vz6ngw2sxsvapds2n2swfxm4r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24590,8 +24756,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.5.0";
-       sha256 = "1jmpz15r5sdc3rmvbhs4jla3qnafyqaq1vyngn9276a6ks338ivk";
+       version = "1.6.0";
+       sha256 = "1lzqsn7bmq2yrdmn2hnic5cghmw7kxfmkvqcs8vrk2gg4cmi6lhv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24603,14 +24769,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-autoscaling-plans" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-autoscaling-plans";
+       version = "1.6.0";
+       sha256 = "068c1z74gm94gb34y5lvnn03q4l5bm7w7j2a81zyfacijvzzpbgn";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Auto Scaling Plans SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-batch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-batch";
-       version = "1.5.0";
-       sha256 = "0dchh04181kabhx1nl5cqw3kcsznggyrkzyrx028nfslww3as3mq";
+       version = "1.6.0";
+       sha256 = "0xh6fqaxgdsn4d7wb1j944npywn28p6srrsm3rpf7vbrc44gbc0y";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24628,8 +24812,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-budgets";
-       version = "1.5.0";
-       sha256 = "1kyi34iwg4l85a9ipkbjdac5wb2ij5rb1a49zww0izd09x3yx68a";
+       version = "1.6.0";
+       sha256 = "1dz4gi6qkkmfhz3yqj0pcjgsac4a2036bpiwayxdyzbzda2r5inc";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24647,8 +24831,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-certificatemanager";
-       version = "1.5.0";
-       sha256 = "0hnw9s9kzkrq9iv940g6zkaljw91xk9d6pya62g2y6dzp8ych5kq";
+       version = "1.6.0";
+       sha256 = "0sma4rbylmj7dl0irab5vh32na52l1qb34xpa6l4icx1hp397pqz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24660,14 +24844,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-certificatemanager-pca" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-certificatemanager-pca";
+       version = "1.6.0";
+       sha256 = "1ixczihy7f9hyhw0dxqzs5m3bgnkakzn4w0h792625738bhwv0ag";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Certificate Manager Private Certificate Authority SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-cloud9" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloud9";
+       version = "1.6.0";
+       sha256 = "1i6npad6zszpx6bb47w1kppgds08z3mw5yx5jlbsl1a7y6ryv29v";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cloud9 SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-clouddirectory" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-clouddirectory";
-       version = "1.5.0";
-       sha256 = "157myilbdk79nfyxvyljpajf3mlgqqhnypbp7psd41ypg87ndycd";
+       version = "1.6.0";
+       sha256 = "0vbmqpn6f4723cq9cqv5hdxyiw6s12yr1xk6wfjpg5j3rqa930kx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24685,8 +24905,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.5.0";
-       sha256 = "1s43xpwf26i9w2q6c2m3jcg8xr3wpza799krszr1cmhaivi1xmvi";
+       version = "1.6.0";
+       sha256 = "0dc3zb50vq3kkw65kkmrgz1vyjrzm1bmm3znj39i6slhfhjwiqhm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24704,8 +24924,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.5.0";
-       sha256 = "05ai52ljar9j8jwlp5bp38zpfdjybsfdm6y3yp7if86md99sq9b0";
+       version = "1.6.0";
+       sha256 = "18ilsfm3918x3lzwr0v470n7pkc2r1iknlmz8bqbxfgkiyc60slm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24723,8 +24943,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.5.0";
-       sha256 = "1644ldnp11wwn17xilkinm3bq8g9w4zfvyi6d95737xm1gr8gmx5";
+       version = "1.6.0";
+       sha256 = "0pqvliw77nk9c4ac3zhmbszlxcd13ibrg28rj31yi1lllcw708p4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24742,8 +24962,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsmv2";
-       version = "1.5.0";
-       sha256 = "0ix51kbs1ijwlzdy1drinmmyk6bcwrih2azrkqkd27fr6krnhs67";
+       version = "1.6.0";
+       sha256 = "0zpnzf062cmxaxvi36xfjk6q055xg6nh6ikralmnl6winnjjam6s";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24761,8 +24981,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.5.0";
-       sha256 = "1pyxz2k7r25wq3pmxgknasxjimszy0f1sf6rwlm7sp412rvfm09c";
+       version = "1.6.0";
+       sha256 = "1533ii94iyi7z0nsnldxmf0hgkpx01xz10mgsd7z9n5cfrak85yx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24780,8 +25000,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.5.0";
-       sha256 = "0kzl1pjzlijvc1m9yv8rf0zj6lwhk7qjgpmdvh8kbzdfpm8ynsrh";
+       version = "1.6.0";
+       sha256 = "19vwiyrcc591cpaflv0ji8fg7xjx1vba1f4kv0gh9mgfk9px7w14";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24799,8 +25019,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.5.0";
-       sha256 = "1m04h5n6hb2vg8hp2ikbdijv3a2mykzpafa1skg4gvy4qrbm5008";
+       version = "1.6.0";
+       sha256 = "090w96krmwd2h4l6s4hz04rfwwi4y6bifzfsw0hn7r62dbwrvnfr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24818,8 +25038,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.5.0";
-       sha256 = "0n3v9li9fafhmwjfdydj8s495ni28qqf4xx13w7hflv10l6g2c25";
+       version = "1.6.0";
+       sha256 = "0lgfvca9gsqd38ly7f6dvvivi34qbpbqqng3hb89cbdjcjri5j15";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24837,8 +25057,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-events";
-       version = "1.5.0";
-       sha256 = "0q40yvj7bz5pkkr2w7g9nxspb2xbjdjr6nwnshpgkdjz61pcqb0p";
+       version = "1.6.0";
+       sha256 = "0kgcsbsxi6z84avfzmx9z1111h49yliyyiqww3b39if4dx1mxyqk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24856,8 +25076,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.5.0";
-       sha256 = "05hh0lbxwj0cfwv38j4bnp5chjdvsgxgsh8whpza90k45v8kvjnr";
+       version = "1.6.0";
+       sha256 = "0zgfhz5646s6hkzw2n686rwhz5g9l1mrakagq3ngaagvy15fgr40";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24875,8 +25095,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codebuild";
-       version = "1.5.0";
-       sha256 = "1k85rrcfic92bpg2x20h4apad9f2pgqq6gggv7xs6dga8j596r21";
+       version = "1.6.0";
+       sha256 = "1ax0am75zy8xddzkn36sc9dpda1j5d28pbrdddhlr98airbl7gzx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24894,8 +25114,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.5.0";
-       sha256 = "0yr4h2ai1v0a2w26ms7v6vpzbn1k4wvchgfip6pqfsfbswq8vpy2";
+       version = "1.6.0";
+       sha256 = "0594d3frpxc2d9sw265dhph8q1gvzsx9n6l1vcgwglxbpwq2cbwa";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24913,8 +25133,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.5.0";
-       sha256 = "08q5jgxs3aff5b8bxv1y01rjwrm7j8s8z05kwj84gzpfjw98i8s8";
+       version = "1.6.0";
+       sha256 = "1py2sfnwgavqhb8z2ngxx6b3gh0f9r3l84r5w5dcn6l5p2dbj59k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24932,8 +25152,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.5.0";
-       sha256 = "0j99cgv1p5p7hxn0zc5s0d51l54bdkq4sd54q9p2a64fj6wa39ap";
+       version = "1.6.0";
+       sha256 = "0hy05s7wl410319z2svppg6aqc00zsix6m4l8gniqq1i34iflvn4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24951,8 +25171,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codestar";
-       version = "1.5.0";
-       sha256 = "085m8bwvhws3svalmrxjk737ml2f5rr4fajzg7c3n3f7n3jz4qjd";
+       version = "1.6.0";
+       sha256 = "1c0w48y9azn8im82lh8j98vh6zbkam7vkplf2wxw8azqc5a6746l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24970,8 +25190,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.5.0";
-       sha256 = "08l3nzggjhjb2gr1ny0i3as5gb1rw6wkggr4i8hjvg2w68qydrm7";
+       version = "1.6.0";
+       sha256 = "1mdnr66nq86ndh80ymgvh12crdqyqv212qkb2r2hzz6k23i31b1s";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24989,8 +25209,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-idp";
-       version = "1.5.0";
-       sha256 = "18slhckyfq0mkwd2mv6g5dpas21q267sbqrlq2hn8cfglxcbjz3w";
+       version = "1.6.0";
+       sha256 = "1zqzx0l3g7kb22synk0hsy48zz320j906y7jnj7r7fqhrb48k2d9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25008,8 +25228,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.5.0";
-       sha256 = "0y3n8k9nfc7pnx5dbxnv9mcwcgmg7lf51sf2629zlbp4gf3pabga";
+       version = "1.6.0";
+       sha256 = "0dgldjisp3sxq3csnn7ffsh0bn1r2w32vlyz6dj6f7pkw7c11pjz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25021,14 +25241,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-comprehend" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-comprehend";
+       version = "1.6.0";
+       sha256 = "0gr4mz6n0cq8xiaq07bk9k8bg6di9kv17fnbgfvlvcrdjvvipw1g";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Comprehend SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-config" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.5.0";
-       sha256 = "1lniwdf3fr33skld9916vqsm03q0lghcna8ywsv76rz68hnb6nb3";
+       version = "1.6.0";
+       sha256 = "1kf98bz7jikj3xh2k49lpf04i0p9y046x4mb93xwrywy0jy3xc2w";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25040,27 +25278,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-connect" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-connect";
+       version = "1.6.0";
+       sha256 = "0jkds33hh039mgqns9zssjk9fzg35fnmkdm32zf180088kxbkdi9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Connect Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite
-     , data-ordlist, deepseq, exceptions, hashable, http-conduit
-     , http-types, lens, memory, mtl, QuickCheck, quickcheck-unicode
-     , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time, transformers
-     , transformers-compat, unordered-containers, xml-conduit, xml-types
+     , data-ordlist, deepseq, exceptions, hashable, http-client
+     , http-conduit, http-types, lens, memory, mtl, QuickCheck
+     , quickcheck-unicode, resourcet, scientific, semigroups, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , time, transformers, transformers-compat, unordered-containers
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.5.0";
-       sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk";
-       revision = "2";
-       editedCabalFile = "1y1ian4wimsbng4c3ix8jd3pn3b0xhydzwv87blck4sgl41w83vl";
+       version = "1.6.0";
+       sha256 = "1j9x17zhyxrg4ds5pdxfjdb4z7hpzn42cydx34j25h5d9avwbqdg";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite deepseq exceptions hashable
-         http-conduit http-types lens memory mtl resourcet scientific
-         semigroups tagged text time transformers transformers-compat
-         unordered-containers xml-conduit xml-types
+         http-client http-conduit http-types lens memory mtl resourcet
+         scientific semigroups tagged text time transformers
+         transformers-compat unordered-containers xml-conduit xml-types
        ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive conduit data-ordlist
@@ -25073,14 +25328,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-cost-explorer" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cost-explorer";
+       version = "1.6.0";
+       sha256 = "0fvdz1x6wizad8xcssh3lyzyp9pk92k5hlajrwfp2gp2lb8a8p32";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cost Explorer Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-cur" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cur";
-       version = "1.5.0";
-       sha256 = "1ndj6iyi6j9f1py791gcp5mi76h80vzvsclrwvyvz52nnfri6cmc";
+       version = "1.6.0";
+       sha256 = "0mzxyacabf6q237jdxlj5nwvbv9k7xn6kyk531p15839250j3m3y";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25098,8 +25371,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.5.0";
-       sha256 = "0fhnff3w8rsng0rzr6l7a3z98spfbn8zq348p23ci0m5v2qi6jk1";
+       version = "1.6.0";
+       sha256 = "1r9sbzc6z5md9z1yzb3sr41ih3kfjg5dx9z38p61rvv413bjs88v";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25117,8 +25390,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.5.0";
-       sha256 = "1c8vh1aalh48fl810ymk80k8g22dhzvcx9a2q360fm3m11wg1qqf";
+       version = "1.6.0";
+       sha256 = "0sf56mzd6kbyhq927wys8ayp9mvr0rpisjs6rs3s8m62n2w786yq";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25136,8 +25409,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.5.0";
-       sha256 = "14kbx10g3izyqaqyrd8gjr6hpljv7v6wafp0dsrgn54275mvjq10";
+       version = "1.6.0";
+       sha256 = "0ciqadw5kam6b51irx45kc3g03qh50pdp8d321v83b2yhv7bk1cd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25155,8 +25428,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-discovery";
-       version = "1.5.0";
-       sha256 = "0m4kry9vx9jl62adaa9pgxcmaw9c2kxs48krdv5n5vx3ynqf4856";
+       version = "1.6.0";
+       sha256 = "04wj34lm7amxjcg9bm77nsfjgx76n9b4scj8pspc44qldgbpmikv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25174,8 +25447,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dms";
-       version = "1.5.0";
-       sha256 = "1d9llyykrd4n6iqhs15f6jvzv8l61w8kalljx7skcxy8q98ydlh2";
+       version = "1.6.0";
+       sha256 = "1ww0l7xi9ia6danlm4mdh5d3y38jv56g4dd1jw588hkn5bf1jpx7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25193,8 +25466,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.5.0";
-       sha256 = "0mr9njmqwrlljwr78i3g4cdrjdyy3a516vvxj7754h5cmg0vbicj";
+       version = "1.6.0";
+       sha256 = "12fkcqhckmrkmh5prfrjdc6dq5cm0g3wsm9pz60jzrmf724k7yh6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25212,8 +25485,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.5.0";
-       sha256 = "1j11qc018z6pgcwm80v0jknfrasp4cx6l0f8kv804crasbf2y0n8";
+       version = "1.6.0";
+       sha256 = "0gwsgyjvqzyhzkfn73854s6hr55va6l6a3m074ajz5wqz3j4xx9k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25231,8 +25504,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-dax";
-       version = "1.5.0";
-       sha256 = "036ipy0n16vxqy8agzvias7v4jq1gkcyqh0ppc5dcznsc4mklr0d";
+       version = "1.6.0";
+       sha256 = "0z9k6vvicmsjbd09sf5jym87zsc8dwbzpkiinwx4gz4zwfwqkrw3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25250,8 +25523,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.5.0";
-       sha256 = "0j80jm7xmfsjxnfa6zj0hfvzjv89clccdqalxn76mzc646qvgki1";
+       version = "1.6.0";
+       sha256 = "0zz590xdpjabic8m7if6a4pcfrdafqr66wcxnwn2758fyzfk5y5k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25269,8 +25542,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.5.0";
-       sha256 = "0h8zw8jrdh6a4jf92pg5j9lcx242y88iz8spfs9djripv13hs3dh";
+       version = "1.6.0";
+       sha256 = "1k2mm5ypkwr07iwc76b15q823sv5rq5jxfz4r7qckal8w72c4892";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25288,8 +25561,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecr";
-       version = "1.5.0";
-       sha256 = "0n6a9zbc8a83l5dnma61gl57zk0sjn1276ds1378ymnj9l5pkgb8";
+       version = "1.6.0";
+       sha256 = "0l44xxify9k87imc09wvn56xnmvgf3n2ydvs4s3iph6lnka8l222";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25307,8 +25580,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.5.0";
-       sha256 = "08m2nds8d7pnvjk5s3f0kmrk0ml2ryzichyc4m0q69pc4yyakvj5";
+       version = "1.6.0";
+       sha256 = "0gyy9iglv8744p3h249j0mdd5n4f756ci2048frpb51mx2mkb59h";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25326,8 +25599,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.5.0";
-       sha256 = "0b9ghl8i02gai4i0dhqv6ys8cblw6nr5338sg1zrkhlsdpkln1j5";
+       version = "1.6.0";
+       sha256 = "1fxg86zzjyv5lvlmn2f2iph5rwcfmwk740i2jjs3xmh68hlmd116";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25345,8 +25618,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.5.0";
-       sha256 = "05h1i0kbni000wwk4d80iajzqsa7s7qwxy4yybqn82r9gqgc9r75";
+       version = "1.6.0";
+       sha256 = "0s9rfrv128dsir497g9r6pp68xgfl34rshlcfgyk95fqw8n4m9z4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25364,8 +25637,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.5.0";
-       sha256 = "1cv0sf7x7a4b6fky28454kszzplcbmm1fk7c9b6pm4sxipv2qrbl";
+       version = "1.6.0";
+       sha256 = "0siqna1fcxwpbdvjicyv09l2wcfddda8c47nmdd70ns7cdbhdp61";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25383,8 +25656,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticsearch";
-       version = "1.5.0";
-       sha256 = "1mylfs06jx6ziajnm55z0851zwmfc7nzwcimp4c62wk95s9ydwhp";
+       version = "1.6.0";
+       sha256 = "10rhbwic050ncinjklllygg3jnv169smkwdcr2xmxv3g3jpgqa9l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25402,8 +25675,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.5.0";
-       sha256 = "12zkvqmygab6c5j4sf52hzn2fkvmsasmbfw0wq6g7laxdhj6c151";
+       version = "1.6.0";
+       sha256 = "02n1yg4vks5sc8mqm5prz2clgf7pyn9yf98mx1h1mk89gv4sf4mb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25421,8 +25694,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.5.0";
-       sha256 = "1zjlvsijp4j7kvbbdwwshr92sh173b8z0k42jwh6zcdk086k8v0c";
+       version = "1.6.0";
+       sha256 = "0kbyz4czsfjfgfw49wqrkkk2ma4k333kd5xfcz9gf9ick8079jar";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25440,8 +25713,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elbv2";
-       version = "1.5.0";
-       sha256 = "0n6q0dzwmdbkhjn8ik2p156w4kj0lwr78xy3f9sh5g9c3v3wfqxh";
+       version = "1.6.0";
+       sha256 = "1j92qr8sfsidax606pyzv1zn08c2rcij0853c5raq4xn55gd6lra";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25459,8 +25732,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.5.0";
-       sha256 = "0q5vc4mk8709sfcqgrwilp0vp3n7awnwcanqk46wbml6a0jr4nsw";
+       version = "1.6.0";
+       sha256 = "0kvpv655dk619lq2ahkljxdhscj22lyci3z9ybpsvzk1xrc79879";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25472,14 +25745,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-fms" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-fms";
+       version = "1.6.0";
+       sha256 = "1cgp5vd1ifrh16pziyi1yv6bwipd5njy9d0mvfq0l53zwv0f4cs0";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Firewall Management Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-gamelift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-gamelift";
-       version = "1.5.0";
-       sha256 = "1nklqnrgkkq7465c3gz0ljb1gyi75d634yb5s39a1nynhpdiqyxq";
+       version = "1.6.0";
+       sha256 = "1z2zfzpag9v8mb6wa479hfkhdqf84x5jyc6pl302vl688d5bvkgb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25497,8 +25788,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.5.0";
-       sha256 = "1yrhjyn0596r3k59a42pma2v2fhdgwibasw10zd6gpfrcp496iq2";
+       version = "1.6.0";
+       sha256 = "04zrw3rqly4qm5hkwddr0p73xyjx5vm5xsvcnmabmpxx3x6l61sk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25516,8 +25807,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glue";
-       version = "1.5.0";
-       sha256 = "0hxs5rnri2f5l8vhkn65in2jmyjdd5ckxywdvzwkdbdh3byp9vyc";
+       version = "1.6.0";
+       sha256 = "1g01ql9kvlwy6qm2gblz7bdf8b76ifpwgk5c9r1xp5jcsi3dmwpj";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25535,8 +25826,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-greengrass";
-       version = "1.5.0";
-       sha256 = "1l6nc2cp2vszb1hd4s2fmz0lbrjln3kscqk2wpfjp774hcjvl2zx";
+       version = "1.6.0";
+       sha256 = "0kzd5s8mz3sfdf20g64nkl7mnpbzr019y61gxr5z2jwc1yh9nj5k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25548,14 +25839,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-guardduty" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-guardduty";
+       version = "1.6.0";
+       sha256 = "058mxwk8gjgnl8yjvxwgy033qknfnw1ib8qkz0649167x8wfibzx";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon GuardDuty SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-health" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-health";
-       version = "1.5.0";
-       sha256 = "07qla81a60k0dgx6iyy617ri6afx0ip68b0b36n7ww3i81jl6qhk";
+       version = "1.6.0";
+       sha256 = "0yx6bdhkgf6fgrc8i6abbpwnxlzqdnmw6pqan02gz679jf7b25n2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25573,8 +25882,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.5.0";
-       sha256 = "1vmwh4k2bhhf5d7lrk095xhc65pclqig3sk8j7vgxl9nil26cpcs";
+       version = "1.6.0";
+       sha256 = "0pchhnrfvry7v6gwn1rxx0hyd8xd2hdlzfcm1d02hgawg4x82dd3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25613,8 +25922,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.5.0";
-       sha256 = "0sfm6k600vakjx0jrvqwm3mx2hc16nn24f1v1k1fixm2h0kb6s9l";
+       version = "1.6.0";
+       sha256 = "016dgp4s2669jd3db1f8ngynhjrkr77l981rmf3wc92fsyyg4l89";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25632,8 +25941,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-inspector";
-       version = "1.5.0";
-       sha256 = "0ips5f6y58dglx4igxak3ixsyny383s8nxw4dcwky12b5qm8pn36";
+       version = "1.6.0";
+       sha256 = "0gp1rkrm2xv13cdn3shr5824g942yn2dwqvw3ln78fz671g01vxw";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25651,8 +25960,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iot";
-       version = "1.5.0";
-       sha256 = "0m6dvvxvffb136znnn32jnzc1jvv57sqwb5br7jx2j0nhjvc2dlx";
+       version = "1.6.0";
+       sha256 = "1l16ib9p6qzs4079a02hg852f0g79yv75k0ky3jj3l3vr5lj22qq";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25664,14 +25973,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-iot-analytics" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-analytics";
+       version = "1.6.0";
+       sha256 = "1n88xzq5m3g3xcxx6s5rkrp8cbxi8sbj2rri3c3ibyv5gcr75lhs";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Analytics SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-iot-dataplane" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-iot-dataplane";
-       version = "1.5.0";
-       sha256 = "0423d6fpkdby9jq6sya5bmq77ws1mrn7pfaajajixi5mqmsihw25";
+       version = "1.6.0";
+       sha256 = "0hl7m3s6ck01k5h00q414sc3yzpr41gamj7pfr7wr97cwv03prmf";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25683,14 +26010,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-iot-jobs-dataplane" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-jobs-dataplane";
+       version = "1.6.0";
+       sha256 = "08glywxj06bzybvdrbgy1laazfsqzxbsa8558ds76jph99nkmvvl";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Jobs Data Plane SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-kinesis" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.5.0";
-       sha256 = "07dxdbhwgr33649b6lgr3zz6q4cdzspapb0bjg1rxqz3vnbxdmbc";
+       version = "1.6.0";
+       sha256 = "0f1gwa92pcdrb1ijxinhq8vjspgigk5kcr37hnj6mzs6kv9437jl";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25708,8 +26053,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis-analytics";
-       version = "1.5.0";
-       sha256 = "06pbzbrmysj9a61d5kc4a8n5wfpd1lhxm04cqpnrf86lqn89grlr";
+       version = "1.6.0";
+       sha256 = "1vl5yski9fqpwv9f4aq3i2zqkjgkmn3lnpm3phg59x3fb4w59yvy";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25727,8 +26072,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis-firehose";
-       version = "1.5.0";
-       sha256 = "1him47imazymn50820qhdis3z2ini55xryga0ywy9j26qnwzx03z";
+       version = "1.6.0";
+       sha256 = "172ljz8ihcb8cx800xy0wpicdsqip52ng2ig1clk3h48r36la18j";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25740,14 +26085,68 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-kinesis-video" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video";
+       version = "1.6.0";
+       sha256 = "0d9nbkm76ccy1bglny6xqa6bd41g7vjl80jnxrv5aqr87h0b814n";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-kinesis-video-archived-media" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video-archived-media";
+       version = "1.6.0";
+       sha256 = "01g269c2gnfkz5rzznl8l5m7fwb9zxxlxrbj2j7084nv1imj30vh";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams Archived Media SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-kinesis-video-media" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video-media";
+       version = "1.6.0";
+       sha256 = "1glmwl51d945ba8dxwyi9nflavx824nl7arm6f3j90z8cii7na41";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams Media SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-kms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.5.0";
-       sha256 = "0ljpq0z5nw30lmyhwlbmzcccm2h6p45k3lr8k07akwa4p9rw8km4";
+       version = "1.6.0";
+       sha256 = "16cfkvl7n7drx0z6fr5j88lyg9rkg3bfly2zb2jx155lhcsk79bs";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25765,8 +26164,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.5.0";
-       sha256 = "04lw538kpkzs9wmil8h6sjqzw55pjywnvrysdlac83nv0jdm3rmx";
+       version = "1.6.0";
+       sha256 = "01lvr775kakpbr2p7126nw3022dyp5p41s98asf9fwkmda4jd5k4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25784,8 +26183,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lex-models";
-       version = "1.5.0";
-       sha256 = "15k6r8vc6ijlnmj7dqlip1nqixmf1ns3pjd99p7x4kqdq8p4qzj9";
+       version = "1.6.0";
+       sha256 = "0hknmvp0cnvg2y8i7fdwmx76pwbw6v6pvmyw7w93qakfq7615l8z";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25803,8 +26202,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lex-runtime";
-       version = "1.5.0";
-       sha256 = "07xx971q204hkk6gd9bgs2025czk6zzk5s702g82pd6j5r5i1slb";
+       version = "1.6.0";
+       sha256 = "0bixnlb1gz2wn0ggcpxfglxj9w38lnm2xfahs07brsy099qivlka";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25822,8 +26221,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lightsail";
-       version = "1.5.0";
-       sha256 = "1ncby9zgmknmpfk1ncsydhb7l4r9kf46r466kg3cwjnb9w9wznkv";
+       version = "1.6.0";
+       sha256 = "1sxcc0hbvngxxjg0mg2rb3wkdax8123qbak8k3z0h3igzxm4q6vl";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25841,8 +26240,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-analytics";
-       version = "1.5.0";
-       sha256 = "0fil2jcs12g0lfkbzw0jjzms6nh90dd91b7s6c6y3ch1yy7a44w0";
+       version = "1.6.0";
+       sha256 = "0sjxrnzcrzgd75kd841r9hadpg9zqmxx4g5hqqqm2yy1x6q0sv2d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25860,8 +26259,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-entitlement";
-       version = "1.5.0";
-       sha256 = "0g8diq63yywxrq7i6j8bcchjczdxxayqymc7lzdrvywrlvy52vyb";
+       version = "1.6.0";
+       sha256 = "0npwzr4yc4ns989mi9jgdhxj7g2brhn9wyislp0r7wx6arsmhk17";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25879,8 +26278,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-metering";
-       version = "1.5.0";
-       sha256 = "1a9prdrmchnwqz7h8rffmg1df944s0y8cggzxjxvpmydsr8pfrnk";
+       version = "1.6.0";
+       sha256 = "0xszzcmaz2d5h8cbdqaar1f3am35h31k5w1wihy6fyf5r95f2bb7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25898,8 +26297,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-mechanicalturk";
-       version = "1.5.0";
-       sha256 = "1qgznzbfxijz8rvara688pa1hvkfjvz14m4x9m639x7aqdrrllh0";
+       version = "1.6.0";
+       sha256 = "07z9w2i8dmq420wgsip0zm1x6asz446284skcywqbfmv7n73gmkv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25911,14 +26310,104 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-mediaconvert" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediaconvert";
+       version = "1.6.0";
+       sha256 = "04zml2hp8plb4ylspqi3y169daqc1fwx4lfb20wkifl54prbr7mk";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaConvert SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-medialive" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-medialive";
+       version = "1.6.0";
+       sha256 = "1plhi1nadmj5kl89z9l5wly524zy013p89xy9cbkda4l0axi1i0l";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaLive SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediapackage" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediapackage";
+       version = "1.6.0";
+       sha256 = "0faji7pk4i26kp2f3xsn3jglgdr1dxjljwzap3ydy0xg30fjk9ai";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaPackage SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediastore" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediastore";
+       version = "1.6.0";
+       sha256 = "19rvrh4l015pv869i8sj4fs9ygcnc0ziyx7vf1mpamkjqkx760xp";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaStore SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediastore-dataplane" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediastore-dataplane";
+       version = "1.6.0";
+       sha256 = "1ldk1j4xs3m5igzzpsyrqqximdqm64wfa5dlhbiljjc4yhwkrh0m";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaStore Data Plane SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-migrationhub" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-migrationhub";
-       version = "1.5.0";
-       sha256 = "1v5sl8xywzr8sf4fbhkgqpq7bm4kcii38ijlfickcds7hv6fa5s1";
+       version = "1.6.0";
+       sha256 = "0iwbk5iwg28a7jlz1bhspdky0ipf5gixp3dwavac0wl9nbffyw8i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25936,8 +26425,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.5.0";
-       sha256 = "0lbp5nji9w2w1dw230z04cyxmqg502jznwy02y8pk1x0i2masjwq";
+       version = "1.6.0";
+       sha256 = "1zkdal599npbylic9sgvzpfss15ri9k61pp9xwhafbm7f5xjvhcx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25955,8 +26444,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-mobile";
-       version = "1.5.0";
-       sha256 = "0x0qxm4aj9c34zv3i5x4yw8ci86sx69ma9kf88ajxqw4nv1azp53";
+       version = "1.6.0";
+       sha256 = "0p9gyrn2hpk128g3nh7dmi2jm01lf6ydv407rwyj4zpkyl1k9vhh";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25968,14 +26457,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-mq" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mq";
+       version = "1.6.0";
+       sha256 = "1m4mybwfhhs4nm6q6h8zkay9ivdifncsa1j6zfqcl54zc763swp9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon MQ SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.5.0";
-       sha256 = "1hcsz6yxav11xq10vrifspfx06v3gd40y8m2lkc8dwwqa6bpzbq6";
+       version = "1.6.0";
+       sha256 = "066rfarz6cbdcal6l5qn11pi3n2byzxbb6013crmdicfkcrp4hws";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25993,8 +26500,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks-cm";
-       version = "1.5.0";
-       sha256 = "1wf98wd1phavm022a0xznn20h9qfy8ld0d621dnm5cdb3l6wi4w5";
+       version = "1.6.0";
+       sha256 = "1x28lxvjz6sdkzlghw94h97yw8ywypz0v3d0rqazvzvhbxsrp7jg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26012,8 +26519,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-organizations";
-       version = "1.5.0";
-       sha256 = "1n04xzs80nkrcx4742pay5pnzg240240ii0z02baqnkyqpxx55hj";
+       version = "1.6.0";
+       sha256 = "1v7sdjd58aka7yp9y7d8ap5izf4hpm4wf7qa10fy4h4ay180y61r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26031,8 +26538,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-pinpoint";
-       version = "1.5.0";
-       sha256 = "0lj556yfwrgkbdspgyvwzf3df4rqz3idwyhzs2nn25f4spba8gwn";
+       version = "1.6.0";
+       sha256 = "01dh2vwigisbx4jrpaq76l1463v7qy1wx6brd1d7sdczpnmcvy5h";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26050,8 +26557,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-polly";
-       version = "1.5.0";
-       sha256 = "11dm2bbr75zl617m9s2zn26zs8d96d4xgl41shdjfhsm6vgc0c7k";
+       version = "1.6.0";
+       sha256 = "1l4ajm7ca0s4xwzs9brdhbjz1mhw8smmy7wzddhrxjr84vxdqgkp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26069,8 +26576,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-pricing";
-       version = "1.5.0";
-       sha256 = "0k4fv6m5m0b6fgs4clry4kg27y7znsvxziphgvpqrjkmjbfsbaxh";
+       version = "1.6.0";
+       sha256 = "10xlxld5b45yvy30midf0i1drr3zimpl0fwvvz4z946mfpbdn7na";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26088,8 +26595,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.5.0";
-       sha256 = "0ir608fdj19wb7g4bam8x1givws4d54pd96mkjj9zm0865z19dxn";
+       version = "1.6.0";
+       sha256 = "0kf23dgv1zirxp35g1czlfnzq9ccwr1a67yvqnl3nfvpacy634y7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26107,8 +26614,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.5.0";
-       sha256 = "1ll4mx404vw403mx8r6k2i9d9yq7nrmj6kqhnf37cnff4k3h0kqy";
+       version = "1.6.0";
+       sha256 = "0adkj055f7kb1klxnvl9n1p8l504jgcpdw1ibgc2xm786rlvjsj2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26126,8 +26633,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rekognition";
-       version = "1.5.0";
-       sha256 = "1sizf0ha3n0712w7g3cmhjy93xscq3kg5mq81shxgdwajab8v49a";
+       version = "1.6.0";
+       sha256 = "1a1jynpr7bkzd5rs5p4781wrvnf1wivlzfjmn53jfdp545q44bj6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26139,14 +26646,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-resourcegroups" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-resourcegroups";
+       version = "1.6.0";
+       sha256 = "0q0j22992r11i47ix7njjkhx5rrd0b1wkc2q4wrhs62dgsb86zzj";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Resource Groups SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-resourcegroupstagging" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-resourcegroupstagging";
-       version = "1.5.0";
-       sha256 = "0jsri9l7q3hlrb924104fhzg87zsmqcw1fg7afpczf6p6r2kfrpf";
+       version = "1.6.0";
+       sha256 = "1306254b8rb8q7631jyccbayj3a7iv2lvg33l23qw184g5k3gs6j";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26164,8 +26689,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.5.0";
-       sha256 = "0saln45sais8cmwpzilwscr88g1mig4whrszwyx805lrhdhb48d4";
+       version = "1.6.0";
+       sha256 = "05v3m8fcpxbhhsh8nm0m35c357cx94z6xn36c75jhjy4v4xpgvv8";
        libraryHaskellDepends = [ amazonka-core base text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26177,14 +26702,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-route53-autonaming" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-route53-autonaming";
+       version = "1.6.0";
+       sha256 = "15j5l2x0x5qb24r7mcj3qdlzfggk542libcq3sw6d5iwr2vm7l5a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Route 53 Auto Naming SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-route53-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.5.0";
-       sha256 = "0fq62hdn1x4p2d0dbkc6m1myjgi9f6z3icd519crdy5sdmczbhl3";
+       version = "1.6.0";
+       sha256 = "1sm5w4r6kb8fl3wikp9n2hda3bxwr83397s729s3dispbwpzwnzp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26202,8 +26745,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.5.0";
-       sha256 = "03v5fdn81g2k1pb1kn9c2r0yf52mnv3a8flxl9cms123n4lzhsrg";
+       version = "1.6.0";
+       sha256 = "0irz8vyklapjy3w3qasidpvq4hk2qwkmhrnrd23sf4yzs2xqx8gc";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26237,14 +26780,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-sagemaker" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sagemaker";
+       version = "1.6.0";
+       sha256 = "1cgfwc7f9krln680zn42nwmhxwfz945dd8mafpwk0qwdqi1i12cx";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SageMaker Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-sagemaker-runtime" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sagemaker-runtime";
+       version = "1.6.0";
+       sha256 = "1l4v7qw378qq8h4h61nag6al3dck2pz398kfahmk41y208fn04mc";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SageMaker Runtime SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.5.0";
-       sha256 = "1rgg9w4ry28bx9xcdldw14hp8738bwvlxjnymknhz63d43chgya3";
+       version = "1.6.0";
+       sha256 = "1zdxbwzkvj1fi9lay3zyqxbb2vzviwc6h2gfmjh7invg68hqphmr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26256,14 +26835,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-secretsmanager" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-secretsmanager";
+       version = "1.6.0";
+       sha256 = "12imwyz239iv6yw658iyvxc7rfkmc1jgyc722ykz6kagkjr03110";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Secrets Manager SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-serverlessrepo" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-serverlessrepo";
+       version = "1.6.0";
+       sha256 = "1vlbn7jislc33wp2kacc54z95xhgk7ap9zapwzjij847hwn4ib88";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon ServerlessApplicationRepository SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-servicecatalog" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-servicecatalog";
-       version = "1.5.0";
-       sha256 = "09kp0af9dh93b7psmyl64l0zhqjna6ksp1d02m05lcv8hf35zy9c";
+       version = "1.6.0";
+       sha256 = "0r7j8v5mn048hqlp2h2mv7lyld457k22i95mdriyqhrb3cxxzy0i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26281,8 +26896,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.5.0";
-       sha256 = "1bb948h51qhz2lsry254bydqzqc0zjfwvm1wzqvv512cl3bx596f";
+       version = "1.6.0";
+       sha256 = "00mxab03vhmmb0d5xfa00x4c0qz0vkfnfap1lz8kzbps73kk53bp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26300,8 +26915,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-shield";
-       version = "1.5.0";
-       sha256 = "1yw51bqxl92rygg412fbxa8clli2vsn8mf3q45x90f14nk0qpknq";
+       version = "1.6.0";
+       sha256 = "1x7b8wvv50iqvdxydpnmvncz3yx3026vq4f9rg1pnqas5ddsi0xr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26319,8 +26934,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sms";
-       version = "1.5.0";
-       sha256 = "0z8bw4dh9wkr1fpp6kb0vif93c39jjajk9yxkdsb11nnwa4gyrh9";
+       version = "1.6.0";
+       sha256 = "0zx4rpq5k18lqv5x55hf30s30g8x6yrsbv55h13n1mw856fkakgw";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26338,8 +26953,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-snowball";
-       version = "1.5.0";
-       sha256 = "13wzq3i9ijj627p1sagqpih4094rj6963a2z6552fn95cdnm6l94";
+       version = "1.6.0";
+       sha256 = "09gf0balrk7hzmg9ynasz4jf3jywj57lyp0wiggixfh5jbz30jsk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26357,8 +26972,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.5.0";
-       sha256 = "0dbka3s5cd1sy7msik0dy9wfp9krl8c60z0dca69pw8r6nncxd41";
+       version = "1.6.0";
+       sha256 = "0wvmwca48rqls0szbvdvfr796iq8i3kp5l8l7dcysn8k0d4ba5hx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26376,8 +26991,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.5.0";
-       sha256 = "1imdr5a71n6pkn2fa8irqgnadxhqfqhlszxs0njqf3kfqkc93z06";
+       version = "1.6.0";
+       sha256 = "0cq4j16f12z4lzsi9clh3pzcad7zfpcg5z8af2ap0w18gmq3hf3l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26395,8 +27010,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.5.0";
-       sha256 = "1x7zdv01jc3x4663vxs7c3al4x4phfrcq71slcfjk56g9qp7wrjq";
+       version = "1.6.0";
+       sha256 = "06kh3id8l24rq5wvjakfz1w62fr3cyzl2axdsp7hcb8afr4q488i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26414,8 +27029,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-stepfunctions";
-       version = "1.5.0";
-       sha256 = "0xviq8ml3sr1r2kwrc42kriizankzagh3wv5x8fij622p70q62z2";
+       version = "1.6.0";
+       sha256 = "1gxci7x94jc7187wv8mrd8g8vy0ns9r6b8l0w5jxgmr8bma8xb4r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26433,8 +27048,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.5.0";
-       sha256 = "0ab4ycaibhm08qbq4adn0mn64dlly1liqx6albdqz3ypd519y9hg";
+       version = "1.6.0";
+       sha256 = "0gdl905h9d5g20npx4ihc0fajgcqn5vjnqiss7mhfcgha1k3f1kg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26452,8 +27067,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.5.0";
-       sha256 = "0c4g0i9088py961f3wxc02ipgl8sh9wm0zl7mfvrb93dps2xmrqy";
+       version = "1.6.0";
+       sha256 = "04lsm5wpzrykkq94fcrkj4cwc5slzcwmzqvsgw9mnyprsrknn19n";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26471,8 +27086,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.5.0";
-       sha256 = "1nd1s76w6j2plrbpgc78f9bcanmpmkajsz6xq7lriznvjwgaip84";
+       version = "1.6.0";
+       sha256 = "1sakd3r8g9r0ms7mrnvzh679i26pamh1ranpp7a1fa2zjzpllhvz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26490,8 +27105,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.5.0";
-       sha256 = "09fiddb9nvl1n5bzh6dzh8fq1lfvw0a5bbnyg51l3z35zyqr64a4";
+       version = "1.6.0";
+       sha256 = "145aali4pqzra7r34g6ykbizwrqnapj6mwadqr31ylf1m5xl63hz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26512,8 +27127,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-test";
-       version = "1.5.0";
-       sha256 = "020qm4za63w69hcbqzbky1r269nv05ajf4zxgvp8jvnz33nj3rs7";
+       version = "1.6.0";
+       sha256 = "0a6xfp97hijhqmhj9nv4aqax08ry8y809jpjhyj2819p01wvga26";
        libraryHaskellDepends = [
          aeson amazonka-core base bifunctors bytestring case-insensitive
          conduit conduit-extra groom http-client http-types process
@@ -26526,14 +27141,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-transcribe" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-transcribe";
+       version = "1.6.0";
+       sha256 = "02z344bwkn3g37fh190qsk6aa3ihrnkkv8zmxlgpw3sjzcxpx8p5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Transcribe Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-translate" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-translate";
+       version = "1.6.0";
+       sha256 = "08k0ilxfrbqbfhlwi1im515bc017njm6faj4wznqbqxdvdw6lv3v";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Translate SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-waf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-waf";
-       version = "1.5.0";
-       sha256 = "0vv2602f3nhnkfwwj5r7qbkcsd1vflvaakyllnp6a29wrswr29ca";
+       version = "1.6.0";
+       sha256 = "105rpfal53qyjavknpkpiglndr8cgcsybl8iaw7zpn725g2rw2w8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26551,8 +27202,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-waf-regional";
-       version = "1.5.0";
-       sha256 = "1rn090nrz2kk50r8fiyhlwyfcz2byzy8i71a5dghx545rsn7jc9x";
+       version = "1.6.0";
+       sha256 = "01aff4b6gp0zbhmjfnmdciw6a20a6jb5bs94i59cppzm216vfmji";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26570,8 +27221,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workdocs";
-       version = "1.5.0";
-       sha256 = "0wypcv4w8m0qylk1ixb3s9zwh9mzz7682xw31w6cq62hxwy3w3gz";
+       version = "1.6.0";
+       sha256 = "0sjb55fj2hq0pndw5b81d3bgw5619px5mv8inni63cbhvlahyf3m";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26583,14 +27234,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-workmail" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-workmail";
+       version = "1.6.0";
+       sha256 = "0ac7awszhihl73zqrpg8srw58dwxjral7rpwamx30m5s65qhnkq5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WorkMail SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-workspaces" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.5.0";
-       sha256 = "1kjyxmbwkj0p50bl0x3snk5680qc00g1486xhl4b600jrc2p2gkk";
+       version = "1.6.0";
+       sha256 = "110wr4ah80lz9yjxsx3yng2mx5r2z361rs4k6sr4v6jiij6k9ksn";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26608,8 +27277,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-xray";
-       version = "1.5.0";
-       sha256 = "1i9s8l0l98lffc7hvhndrjj8rv4r0j958qhfqic503d7pzq9m0gk";
+       version = "1.6.0";
+       sha256 = "1w4ham3rzkyz8ns5xrnclyw0gvaswm6kyxjrfz6h19hs6rsh0lcg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -27060,14 +27729,14 @@ self: {
 
   "animate" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec, text
-     , vector
+     , vector, yaml
      }:
      mkDerivation {
        pname = "animate";
-       version = "0.6.0";
-       sha256 = "14fbxn3v4l5z6krqsycpg9ylx91y1xwzwqcxpqy5ihjba2g2r23a";
+       version = "0.6.1";
+       sha256 = "1mjjng8mr8r6gly822nah3ps4phgydfnyggyz43n5bhdr17f37f9";
        libraryHaskellDepends = [
-         aeson base bytestring containers text vector
+         aeson base bytestring containers text vector yaml
        ];
        testHaskellDepends = [ aeson base containers hspec vector ];
        homepage = "https://github.com/jxv/animate#readme";
@@ -27096,6 +27765,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "animate-preview" = callPackage
+    ({ mkDerivation, aeson, animate, base, bytestring, containers
+     , filepath, fsnotify, key-state, lens, linear, mtl
+     , optparse-applicative, optparse-generic, random, safe
+     , safe-exceptions, sdl2, sdl2-fps, sdl2-gfx, sdl2-image, sdl2-ttf
+     , StateVar, text, text-conversions, vector
+     }:
+     mkDerivation {
+       pname = "animate-preview";
+       version = "0.1.2.3";
+       sha256 = "0y8j3cmm579wkmswhflkgzlqv05dm5vrdiqxnhsvf4kr6hnaj8im";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson animate base bytestring containers filepath fsnotify
+         key-state lens linear mtl optparse-applicative optparse-generic
+         random safe safe-exceptions sdl2 sdl2-fps sdl2-gfx sdl2-image
+         sdl2-ttf StateVar text text-conversions vector
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/jxv/animate-preview#readme";
+       description = "Preview tool for sprite animation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "animate-sdl2" = callPackage
+    ({ mkDerivation, aeson, animate, base, sdl2, sdl2-image }:
+     mkDerivation {
+       pname = "animate-sdl2";
+       version = "0.1.0";
+       sha256 = "1wzwhhv6x098y3pkpssxx7y1cb69z1bb2gsa2r8prg729y664648";
+       libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
+       homepage = "https://github.com/jxv/animate-sdl2#readme";
+       description = "sdl2 + animate auxiliary library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "anki-tools" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , exceptions, filepath, mtl, scientific, sqlite-simple, text, time
@@ -27229,20 +27936,6 @@ self: {
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.8.0.3";
-       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base colour ];
-       homepage = "https://github.com/feuerbach/ansi-terminal";
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ansi-terminal_0_8_0_4" = callPackage
-    ({ mkDerivation, base, colour }:
-     mkDerivation {
-       pname = "ansi-terminal";
        version = "0.8.0.4";
        sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
        isLibrary = true;
@@ -27251,7 +27944,6 @@ self: {
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-terminal-game" = callPackage
@@ -27617,8 +28309,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.14.0.0";
-       sha256 = "12pr670c4zw8dhmj5vgsqr44mw2jz5kqdqn3alfqhmkmb13kzc4v";
+       version = "0.15.0.0";
+       sha256 = "1bjqg484z9si3pyfwpvcakm0y71gca80bh6j1njc0qnjf2ddd3ad";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text tls transformers
@@ -28931,6 +29623,8 @@ self: {
        pname = "arithmoi";
        version = "0.7.0.0";
        sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
+       revision = "1";
+       editedCabalFile = "10z6m57dnzyqbzmdx64ya6gx5485iwwa4j8afyn8bmvxjvn474a6";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers exact-pi ghc-prim integer-gmp
@@ -29468,8 +30162,8 @@ self: {
      }:
      mkDerivation {
        pname = "asn1-codec";
-       version = "0.1.0";
-       sha256 = "1l3ka458aggj04zn2sn3p1mzkrjsgy8p7rg45031cxr401msks5b";
+       version = "0.2.0";
+       sha256 = "03c5dknklv8zj69fyhkdfvb7abcp68byhv2h8mmlnfwd9nz8fsrg";
        libraryHaskellDepends = [
          base bytestring containers contravariant cryptonite hashable
          integer-gmp memory network pretty stm text vector
@@ -31395,8 +32089,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "16";
-       editedCabalFile = "0dv8lrnnb643fh1rsi10rq99nnb5a98akdl26lfxxjmmdmy238vd";
+       revision = "22";
+       editedCabalFile = "040kvq16wknnjq0kr5j6y17xvjfh87y22hska3whs3ci6zw1fr30";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -31547,8 +32241,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.2";
-       sha256 = "0kfw8srq675hinf1gajkngbpx15xc5w74vvf76yarmaal1vaavm4";
+       version = "0.3.0.4";
+       sha256 = "1f7wq5c7x99gbibwx9mdmq6d8gyz9szrj7k747gavvf5is8z9h6f";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -31682,32 +32376,33 @@ self: {
   "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-combinators
-     , conduit-extra, containers, cryptonite, data-default, directory
-     , errors, filepath, http-client, http-client-tls, http-conduit
-     , http-types, lifted-base, memory, monad-control, mtl, network
-     , old-locale, QuickCheck, quickcheck-instances, resourcet, safe
-     , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, transformers, transformers-base, unordered-containers
+     , case-insensitive, cereal, conduit, conduit-extra, containers
+     , cryptonite, data-default, directory, errors, exceptions, filepath
+     , http-client, http-client-tls, http-conduit, http-types
+     , lifted-base, memory, monad-control, mtl, network, old-locale
+     , QuickCheck, quickcheck-instances, resourcet, safe, scientific
+     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, transformers-base, unordered-containers
      , utf8-string, vector, xml-conduit
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.19";
-       sha256 = "0ykpnm2kyhjf1rf5ldhv0c7zy3zq7jgqmb6xwywk8b2s80ai4fxl";
+       version = "0.20";
+       sha256 = "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
-         conduit-extra containers cryptonite data-default directory filepath
-         http-conduit http-types lifted-base memory monad-control mtl
-         network old-locale resourcet safe scientific tagged text time
-         transformers unordered-containers utf8-string vector xml-conduit
+         conduit-extra containers cryptonite data-default directory
+         exceptions filepath http-conduit http-types lifted-base memory
+         monad-control mtl network old-locale resourcet safe scientific
+         tagged text time transformers unordered-containers utf8-string
+         vector xml-conduit
        ];
        testHaskellDepends = [
-         aeson base bytestring conduit-combinators errors http-client
-         http-client-tls http-types lifted-base monad-control mtl QuickCheck
+         aeson base bytestring conduit errors http-client http-client-tls
+         http-types lifted-base monad-control mtl QuickCheck
          quickcheck-instances resourcet tagged tasty tasty-hunit
          tasty-quickcheck text time transformers transformers-base
        ];
@@ -32572,7 +33267,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_1_0" = callPackage
+  "backprop_0_2_2_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, criterion, deepseq
      , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
      , primitive, reflection, time, transformers, type-combinators
@@ -32580,8 +33275,8 @@ self: {
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.1.0";
-       sha256 = "0qm352klwjv1fy2gpsr8xhd9byaydps6fwhwrr9fldmj2bn1220m";
+       version = "0.2.2.0";
+       sha256 = "029lc57dhvq3hy38vdf6bgfbmkh93xc64gzi7k34y4rm6d1m2y89";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection transformers
          type-combinators vector
@@ -33200,6 +33895,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-prelude_1_2_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-prelude";
+       version = "1.2.1";
+       sha256 = "1f4s2f454zpcfrb5qi7pdlmljsfyw8zpk0kzs3dngki0ysh0rwq7";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/base-prelude";
+       description = "The most complete prelude formed solely from the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-unicode-symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33628,8 +34336,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.4";
-       sha256 = "0n3fw4z48hz188i4f02ya2wcaicl0l5nhb2w1r8hsvvgf0cixsxl";
+       version = "0.1.0.5";
+       sha256 = "0n0ry8gssd6rnhgsj0q24bbf8ad8wqjqmkxdrn0lxmd6bgj52bv9";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -33773,25 +34481,24 @@ self: {
      }) {};
 
   "bdcs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
-     , codec-rpm, cond, conduit, conduit-combinators, conduit-extra
-     , containers, content-store, cpio-conduit, cryptonite, directory
-     , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree
-     , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory
-     , monad-control, monad-logger, monad-loops, mtl, network-uri
-     , ostree, parsec, parsec-numbers, persistent, persistent-sqlite
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, codec-rpm
+     , cond, conduit, conduit-combinators, conduit-extra, containers
+     , content-store, cpio-conduit, cryptonite, directory, esqueleto
+     , exceptions, filepath, gi-gio, gi-glib, gi-ostree, gitrev, hspec
+     , http-conduit, HUnit, lifted-base, listsafe, memory, monad-control
+     , monad-logger, monad-loops, mtl, network-uri, ostree, parsec
+     , parsec-numbers, persistent, persistent-sqlite
      , persistent-template, regex-pcre, resourcet, split
      , string-conversions, tar, tar-conduit, temporary, text, time
      , typed-process, unix, unordered-containers, xml-conduit
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.6.0";
-       sha256 = "0irxrabxrdf20mc7b0kknnch0fhxgafh2mdrrksj78jx2dbmn85h";
+       version = "0.6.1";
+       sha256 = "1q81ic3jpcjjnbvbww7qabfy6byvlhwsvs0pf7y8a0sm4i0sqj8g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          aeson base bytestring codec-rpm cond conduit conduit-combinators
          conduit-extra containers content-store cpio-conduit cryptonite
@@ -37000,9 +37707,9 @@ self: {
      }:
      mkDerivation {
        pname = "bits-extra";
-       version = "0.0.0.2";
-       sha256 = "067k2kczi56454mgv86x9r0fpzdc0v3m8z4rc0jb93bqd33knq7r";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "0.0.1.0";
+       sha256 = "0slxzlc81nbzzd7513i9crwqlpxxvpfz9haq5hr9qp533pr4cyz4";
+       libraryHaskellDepends = [ base ghc-prim vector ];
        testHaskellDepends = [
          base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
        ];
@@ -39502,6 +40209,8 @@ self: {
        pname = "brittany";
        version = "0.11.0.0";
        sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
+       revision = "1";
+       editedCabalFile = "1v5k1gsy9d1xrw1qw1mdhm00ryalnd3dp531sc44lx8brgxypywf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39668,6 +40377,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "bson_0_3_2_6" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.3.2.6";
+       sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         QuickCheck test-framework test-framework-quickcheck2 text time
+       ];
+       homepage = "http://github.com/mongodb-haskell/bson";
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bson-generic" = callPackage
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
@@ -39751,26 +40483,22 @@ self: {
      }) {};
 
   "btree" = callPackage
-    ({ mkDerivation, base, clock, compact-mutable, containers, ghc-prim
-     , hashable, prim-array, primitive, smallcheck, tasty, tasty-hunit
+    ({ mkDerivation, base, clock, containers, ghc-prim, hashable
+     , MonadRandom, primitive, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
      }:
      mkDerivation {
        pname = "btree";
-       version = "0.2";
-       sha256 = "02qypsanm4pnc7jiwjwak9xi7mfz4dlmfirdwvbxnjz48nqch7x2";
-       libraryHaskellDepends = [
-         base compact-mutable ghc-prim prim-array primitive
-       ];
+       version = "0.3";
+       sha256 = "058pry7g9sbmd0crd1gdpsj9ynvyfcyyvlna1wb49my9m5qmxp79";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
        testHaskellDepends = [
-         base compact-mutable containers hashable prim-array primitive
-         smallcheck tasty tasty-hunit tasty-smallcheck transformers
+         base containers hashable MonadRandom primitive smallcheck tasty
+         tasty-hunit tasty-smallcheck transformers
        ];
-       benchmarkHaskellDepends = [
-         base clock compact-mutable ghc-prim hashable
-       ];
-       homepage = "https://github.com/andrewthad/b-plus-tree#readme";
-       description = "B-Tree on the compact heap";
+       benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
+       homepage = "https://github.com/andrewthad/btree";
+       description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -41885,6 +42613,26 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cabal-rpm_0_12_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , http-client, http-client-tls, http-conduit, process, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.12.3";
+       sha256 = "0nid91q38k4b3hgjrhv6sy68y5h74f85j08991hmfbwzd727dzfg";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath http-client
+         http-client-tls http-conduit process time unix
+       ];
+       homepage = "https://github.com/juhp/cabal-rpm";
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -41937,8 +42685,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-sort";
-       version = "0.0.5.3";
-       sha256 = "1312kj7jhb5z3hidlgqvj6rlgiiribwfj3458i4axv8r345xcyqc";
+       version = "0.0.5.4";
+       sha256 = "1pssbb9i5h3q97i3qrybz9iyd1nsh9y27ykxvda6vk820jxjvb9b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42791,34 +43539,39 @@ self: {
 
   "camfort" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, lattices, matrix, mtl
-     , optparse-applicative, partial-order, QuickCheck, sbv, syb, syz
-     , text, transformers, uniplate, vector
+     , directory, fgl, filepath, flint, fortran-src, GenericPretty
+     , ghc-prim, happy, hmatrix, hspec, lattices, lens, matrix, mmorph
+     , mtl, optparse-applicative, partial-order, QuickCheck, sbv
+     , silently, singletons, syb, syz, template-haskell, temporary, text
+     , time, transformers, uniplate, vector, verifiable-expressions
+     , vinyl
      }:
      mkDerivation {
        pname = "camfort";
-       version = "0.904";
-       sha256 = "0j1m9vc4fs7151s2bm1nl480c87mqfann6xv7bzcx6p76iqxvii8";
+       version = "0.905";
+       sha256 = "14wp9xkssingashbys07i536xnmrgh891260drc0f88d0mwjc935";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
-         fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl
-         partial-order sbv syb syz text transformers uniplate vector
+         fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix
+         mmorph mtl partial-order sbv singletons syb syz template-haskell
+         text transformers uniplate vector verifiable-expressions vinyl
        ];
+       librarySystemDepends = [ flint ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base optparse-applicative ];
+       executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [
-         array base binary bytestring containers directory filepath
-         fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv
-         text uniplate
+         array base binary bytestring containers directory fgl filepath
+         fortran-src hmatrix hspec lattices lens mtl partial-order
+         QuickCheck sbv silently temporary text time uniplate
+         verifiable-expressions
        ];
        homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) flint;};
 
   "camh" = callPackage
     ({ mkDerivation, base, bytestring, Imlib, terminfo }:
@@ -44177,6 +44930,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.4.6";
+       sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -44326,8 +45100,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.1.0";
-       sha256 = "1pgarp84p757jyx71qma64g84fcyg6rrhrmrh4c1sszykqjnw7g0";
+       version = "0.1.1.2";
+       sha256 = "0fvl3pzz73mjc0y8pqkfbqkipma9km26qp0n1jfrnh0nqh9104l1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45255,8 +46029,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.3.2";
-       sha256 = "17wvmn2immigdbc5kbckwbl8hsali8w0mdii9mib9lfxykawyh54";
+       version = "0.1.3.3";
+       sha256 = "15al7z2b73bb0ibd1pf3jljay6jc55sxpkr41hm6r97qri7fkd1m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46226,6 +47000,8 @@ self: {
        pname = "circle-packing";
        version = "0.1.0.6";
        sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4";
+       revision = "1";
+       editedCabalFile = "10dh8jgjah1h54f83s9289abfqzc4ifykb01p5jljfac63yn42zs";
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
@@ -46628,8 +47404,10 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.99";
-       sha256 = "19s6h0ly0pz1wi1zs5ln9wai6kp9f49xdcjyc3z6mskcabv5b8q2";
+       version = "0.99.1";
+       sha256 = "0ybkjqza4wl6v4wghrbm87j7ns3qgsg4lb8g6i8rj9nb8yn43jsm";
+       revision = "1";
+       editedCabalFile = "1j11iplvng6m882c013fr0jzni1sqmvcw28k5p9icl3dgad990kf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46657,8 +47435,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.99";
-       sha256 = "1dl9pwv9fc5byimdxsl4xa4401nz74bgzrxmgk6hcbyvh7i4b17i";
+       version = "0.99.1";
+       sha256 = "1jrfvi3jxwmzc32nnf2kjyciws649ldixc38g7acsbapkpjhcfy5";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base bytestring clash-prelude
@@ -46698,8 +47476,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.99";
-       sha256 = "13qclvisklwy4syc5hgr5dvcz7wm4nwasgky3xvjhnhjg05wjd6l";
+       version = "0.99.1";
+       sha256 = "03yys72aq9zhl6g9lw1mvx7ds90ch6jx90n7pv9995lg1nhc83fd";
        libraryHaskellDepends = [
          array base bifunctors constraints data-binary-ieee754 data-default
          deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat
@@ -46932,6 +47710,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "classyplate_0_3_1_0" = callPackage
+    ({ mkDerivation, base, criterion, parallel, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "classyplate";
+       version = "0.3.1.0";
+       sha256 = "0ayiyxslvnhzngf8afqb82jz20i83par8piqf81s0yldk4lg4j4m";
+       libraryHaskellDepends = [ base template-haskell ];
+       benchmarkHaskellDepends = [ base criterion parallel uniplate ];
+       description = "Fuseable type-class based generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clay" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
      mkDerivation {
@@ -50078,6 +50871,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "componentm" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions
+     , prettyprinter, rio, tasty, tasty-hunit, teardown
+     }:
+     mkDerivation {
+       pname = "componentm";
+       version = "0.0.0.1";
+       sha256 = "1r2z9jbb0ka2i0lxbrb30p1x0zbwdcxid5k53mkzg82d5v2f08k9";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions prettyprinter rio teardown
+       ];
+       testHaskellDepends = [
+         base containers prettyprinter rio tasty tasty-hunit teardown
+       ];
+       homepage = "https://github.com/roman/Haskell-componentm#readme";
+       description = "Monad for allocation and cleanup of application resources";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "composable-associations" = callPackage
     ({ mkDerivation, base, lens, tasty, tasty-hunit }:
      mkDerivation {
@@ -52530,8 +53342,8 @@ self: {
     ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
      mkDerivation {
        pname = "continued-fraction";
-       version = "0.1.0.9";
-       sha256 = "1831a093wnbf7kvplsp59xkdhj0g8wva08ixf9w12x6vl0yyj6sb";
+       version = "0.1.0.10";
+       sha256 = "1c9lp30q94ddgrmvy93psas5lbyczkhwhr5nijg02sxjkmvrj47v";
        libraryHaskellDepends = [ base recursion-schemes ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -53908,15 +54720,15 @@ self: {
        license = "unknown";
      }) {};
 
-  "cql_4_0_0" = callPackage
+  "cql_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, Decimal
      , iproute, network, QuickCheck, tasty, tasty-quickcheck
      , template-haskell, text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "cql";
-       version = "4.0.0";
-       sha256 = "09sm9wxjfmiv62brrj6hcfsjz3s8xwc4ihrwxdq8fqsv9cf82fj7";
+       version = "4.0.1";
+       sha256 = "021qaz6qvbdp76gdyfcs07wnnq6k6r1cmqky0g3giinjdrm4qac9";
        libraryHaskellDepends = [
          base bytestring cereal containers Decimal iproute network
          template-haskell text time transformers uuid vector
@@ -54901,6 +55713,8 @@ self: {
        pname = "crypt-sha512";
        version = "0";
        sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
+       revision = "1";
+       editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9";
        libraryHaskellDepends = [
          attoparsec base bytestring cryptohash-sha512
        ];
@@ -55687,14 +56501,14 @@ self: {
 
   "csg" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , criterion, doctest, doctest-discover, gloss, gloss-raster
+     , criterion, doctest, doctest-driver-gen, gloss, gloss-raster
      , QuickCheck, simple-vec3, strict, system-filepath, tasty
      , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
      }:
      mkDerivation {
        pname = "csg";
-       version = "0.1";
-       sha256 = "06fc7j1izwwalngjvgvkg90xvp3cjr53c4laqp5giwl2vdqrj2zs";
+       version = "0.1.0.2";
+       sha256 = "19lqlc8li2cx2kc2y3p4n6s2jz94h490zqnm0fywj7vgp4f11rcm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55706,7 +56520,7 @@ self: {
          system-filepath turtle
        ];
        testHaskellDepends = [
-         base bytestring doctest doctest-discover simple-vec3 tasty
+         base bytestring doctest doctest-driver-gen simple-vec3 tasty
          tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [
@@ -55898,8 +56712,8 @@ self: {
        pname = "css-syntax";
        version = "0.0.5";
        sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r";
-       revision = "1";
-       editedCabalFile = "15s7q21kahh1gmm7i3jd937d5pq5khn9a6sq8kdhs6bx11cfa5ap";
+       revision = "3";
+       editedCabalFile = "0p32287dxngmz6bk2xpvj8vh0kawjcrdxxdnczmay6pa1bzyhrik";
        libraryHaskellDepends = [
          attoparsec base bytestring scientific text
        ];
@@ -55910,6 +56724,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "css-syntax_0_0_7" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
+     , scientific, text
+     }:
+     mkDerivation {
+       pname = "css-syntax";
+       version = "0.0.7";
+       sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scientific text
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring directory hspec scientific text
+       ];
+       description = "This package implments a parser for the CSS syntax";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "css-text" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
      mkDerivation {
@@ -58148,6 +58981,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-filter" = callPackage
+    ({ mkDerivation, base, data-default }:
+     mkDerivation {
+       pname = "data-filter";
+       version = "0.1.0.0";
+       sha256 = "1yz22b42rqsf4i9p4lnl06l8id3f1a84dng96q2nk1mmih9v3pbm";
+       libraryHaskellDepends = [ base data-default ];
+       homepage = "https://github.com/LadyBoonami/data-filter";
+       description = "Utilities for filtering";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "data-fin" = callPackage
     ({ mkDerivation, base, lazysmallcheck, prelude-safeenum, QuickCheck
      , reflection, smallcheck, tagged
@@ -58317,6 +59162,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-index" = callPackage
+    ({ mkDerivation, base, containers, doctest }:
+     mkDerivation {
+       pname = "data-index";
+       version = "0.1.0.0";
+       sha256 = "0rfb688h0q6prsiyf1rfax1xv20m2r69m2389qar1z85izk2hfjf";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/Toucandy/data-index#readme";
+       description = "Extending the concept of indices for lists and other containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-interval" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , extended-reals, hashable, HUnit, lattices, QuickCheck, syb, tasty
@@ -59200,8 +60058,8 @@ self: {
      }:
      mkDerivation {
        pname = "datafix";
-       version = "0.0.0.1";
-       sha256 = "0pdpqwdbc8hmwwq460yisbj4072x3jyh7gcrf1flm2545acgahvq";
+       version = "0.0.0.2";
+       sha256 = "0z13m81cl3dnkzrl9fym9mf269lhyw4039fkqpijs024pwbvp0ni";
        setupHaskellDepends = [ base Cabal cabal-toolkit ];
        libraryHaskellDepends = [
          base containers lattices pomaps primitive transformers vector
@@ -60884,14 +61742,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_5_1_0" = callPackage
+  "dejafu_1_6_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.5.1.0";
-       sha256 = "0whxbn6h5k7n38w0wzm5iwqc20yyvzri88zsp3hhp8pdfj34df7d";
+       version = "1.6.0.0";
+       sha256 = "101lbnan5cgyl6v6j4hbys8j8br814m14clxgc366yyd2rkf8saf";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -61480,6 +62338,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deriving-compat_0_4_2" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
+     , template-haskell, th-abstraction, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.4.2";
+       sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz";
+       libraryHaskellDepends = [
+         base containers ghc-boot-th ghc-prim template-haskell
+         th-abstraction transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans hspec QuickCheck tagged
+         template-haskell transformers transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/haskell-compat/deriving-compat";
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -62217,10 +63100,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.4";
-       sha256 = "10gabibjg1hb83pm7qbqxmskrvrb52m5wdb8fcqwy9d3vfzwhkm9";
-       revision = "2";
-       editedCabalFile = "1h21l3wa4vbl7p6n7sk949jpxvxikkhf81y2qjqgn904564w73r6";
+       version = "1.4.1";
+       sha256 = "0n368gv7jjnynp7gfbnaywnd4x65956qqifcxpi3gsy8yi0zsr6z";
        libraryHaskellDepends = [
          array base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -62240,10 +63121,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.4";
-       sha256 = "1sbnnmj85vm6kjgzvrd3jyg40crz0i16ik6q3prwm4c38zr2yqih";
-       revision = "1";
-       editedCabalFile = "174nkb6ki100zh0hbrj8p4n52031jny6683n80i602544iikvbn9";
+       version = "1.4.1";
+       sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
@@ -62265,8 +63144,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.4.2.1";
-       sha256 = "1l7xz360chrqj9by6l5v0vwpvy81lniif600r3b6vf9ckyj747yz";
+       version = "1.4.3";
+       sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -62292,6 +63171,8 @@ self: {
        pname = "diagrams-core";
        version = "1.4.1";
        sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl";
+       revision = "1";
+       editedCabalFile = "0qv5jq4l0adks83zj2n4cgfazmg39flfb4k2i39l1w0bcmrzqjsc";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -62422,6 +63303,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.2.2";
        sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7";
+       revision = "2";
+       editedCabalFile = "1iwcrwfsga9kxp1h9cf3358dn64fzw3rbzrx1z24nd3ayy937vjk";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -62553,16 +63436,15 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.4";
-       sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns";
-       revision = "1";
-       editedCabalFile = "0y4hf13l9y4179vhdsak8zq69wyn3rgmwnz9wp0x4rj32gdjjp3j";
+       version = "1.4.1";
+       sha256 = "0zlpmmgn79jgckzzib758c82brci391r181hg43267s1lx463iih";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
          lens mtl optparse-applicative Rasterific
        ];
+       testHaskellDepends = [ base diagrams-core diagrams-lib ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -62632,8 +63514,10 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.4.1.1";
-       sha256 = "1ans2lliaxqbx2q2459kiv59ff307vz6plqnh082pxhvmk36h1n8";
+       version = "1.4.2";
+       sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal";
+       revision = "1";
+       editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -62851,6 +63735,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diff" = callPackage
+    ({ mkDerivation, base, Enum, util }:
+     mkDerivation {
+       pname = "diff";
+       version = "0.1.0.0";
+       sha256 = "19sn53b4sb0sa7ibcz9wvpn3vhja0yx62p8f9ibawrycm4cpbpzl";
+       libraryHaskellDepends = [ base Enum util ];
+       description = "Diff and patch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diff-gestalt" = callPackage
     ({ mkDerivation, base, Diff, KMP, QuickCheck, string-similarity }:
      mkDerivation {
@@ -63317,12 +64212,12 @@ self: {
      }) {};
 
   "dimensions" = callPackage
-    ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }:
+    ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
        pname = "dimensions";
-       version = "0.3.2.0";
-       sha256 = "1ps9yy363xfpvq6dl5mjp02h0cj1vdib2vggvsykvgqwwrnra83p";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "1.0.0.0";
+       sha256 = "13y87wakhkw7fzfhqjif96y8z57h6pa0c7wirb0rvhfzdknyc1x0";
+       libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Safe type-level dimensionality for multidimensional data";
@@ -64803,6 +65698,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "djinn-lib_0_0_1_3" = callPackage
+    ({ mkDerivation, base, containers, mtl, pretty }:
+     mkDerivation {
+       pname = "djinn-lib";
+       version = "0.0.1.3";
+       sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v";
+       libraryHaskellDepends = [ base containers mtl pretty ];
+       homepage = "http://www.augustsson.net/Darcs/Djinn/";
+       description = "Generate Haskell code from a type. Library extracted from djinn package.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "djinn-th" = callPackage
     ({ mkDerivation, base, containers, logict, template-haskell }:
      mkDerivation {
@@ -64883,6 +65791,35 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "dmcc" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+     , classy-prelude, configurator, containers, HsOpenSSL, http-client
+     , io-streams, lens, monad-control, monad-logger, network
+     , openssl-streams, random, safe-exceptions, stm, text, time
+     , transformers-base, unix, unliftio, websockets, xml-conduit
+     , xml-hamlet
+     }:
+     mkDerivation {
+       pname = "dmcc";
+       version = "1.0.0.1";
+       sha256 = "1qlw3jx9nn2by757kqask1ib2wi32zgdj53kinj2lnjn5f9qs466";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring case-insensitive classy-prelude
+         containers HsOpenSSL http-client io-streams lens monad-control
+         monad-logger network openssl-streams safe-exceptions stm text time
+         transformers-base unliftio xml-conduit xml-hamlet
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring classy-prelude configurator containers
+         monad-control monad-logger random stm text unix unliftio websockets
+       ];
+       homepage = "https://github.com/f-me/dmcc#readme";
+       description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dmenu" = callPackage
     ({ mkDerivation, base, containers, directory, lens, mtl, process
      , transformers
@@ -64980,6 +65917,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_3_0_3" = callPackage
+    ({ mkDerivation, async, attoparsec, auto-update, base
+     , base64-bytestring, binary, bytestring, containers, cryptonite
+     , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe
+     , time, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "3.0.3";
+       sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv";
+       libraryHaskellDepends = [
+         async attoparsec auto-update base base64-bytestring binary
+         bytestring containers cryptonite iproute mtl network psqueues safe
+         time
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hspec iproute network QuickCheck word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -65703,8 +66664,8 @@ self: {
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.5.2.4";
-       sha256 = "13c6b01gkkykg1sl1dk1374nbayg523w4fiy2bg494bj5ia516di";
+       version = "0.5.2.5";
+       sha256 = "1qglnss7jpns585l1k2m3pwqv7mq3jvh66ypmjjxxi1zcihbz5x1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -66624,8 +67585,8 @@ self: {
      }:
      mkDerivation {
        pname = "dual-tree";
-       version = "0.2.1.1";
-       sha256 = "1wzv6rrhz2kz0v1wirgs28fdlr0r4nwxlix9xda4fphzpp922gzr";
+       version = "0.2.2";
+       sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl";
        libraryHaskellDepends = [
          base monoid-extras newtype-generics semigroups
        ];
@@ -66670,8 +67631,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.4.0";
-       sha256 = "0m5f71z9rqfvvqxpsvbpr258rgirphgdyfvzb1wv20zdhfi67lzh";
+       version = "0.1.6.0";
+       sha256 = "0hk7nnqq20wl6sc3jlaykgsn9b4crgw6hl91xml2dh5d83sknvvq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66680,9 +67641,9 @@ self: {
          time timezone-series unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring dependent-sum directory extra filepath
-         haskell-src-exts snap-core snap-server text text-show time
-         timezone-olson timezone-series unordered-containers
+         aeson base bytestring deepseq dependent-sum directory extra
+         filepath hashable haskell-src-exts snap-core snap-server text
+         text-show time timezone-olson timezone-series unordered-containers
        ];
        testHaskellDepends = [
          aeson base tasty tasty-hunit text time unordered-containers
@@ -67404,6 +68365,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "easy-file_0_2_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, time, unix }:
+     mkDerivation {
+       pname = "easy-file";
+       version = "0.2.2";
+       sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
+       libraryHaskellDepends = [ base directory filepath time unix ];
+       homepage = "http://github.com/kazu-yamamoto/easy-file";
+       description = "Cross-platform File handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "easyjson" = callPackage
     ({ mkDerivation, base, mtl, parsec, text, unordered-containers
      , vector
@@ -67451,14 +68425,12 @@ self: {
      }) {};
 
   "easytensor" = callPackage
-    ({ mkDerivation, base, Cabal, dimensions, ghc-prim, QuickCheck
-     , time
-     }:
+    ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
      mkDerivation {
        pname = "easytensor";
-       version = "0.4.0.0";
-       sha256 = "13wgg67gjg07r1n91kqikbhz8nnzfbgmi0v8a1596a6z7al4kvpr";
-       libraryHaskellDepends = [ base dimensions ghc-prim ];
+       version = "1.0.0.0";
+       sha256 = "0qi7p82s5av0x9xqll4sjwh82x4r6bijypqh29f7xmk4y6dzs19c";
+       libraryHaskellDepends = [ base dimensions ];
        testHaskellDepends = [ base Cabal dimensions QuickCheck ];
        benchmarkHaskellDepends = [ base dimensions time ];
        homepage = "https://github.com/achirkin/easytensor#readme";
@@ -67466,6 +68438,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "easytensor-vulkan" = callPackage
+    ({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
+     mkDerivation {
+       pname = "easytensor-vulkan";
+       version = "1.0.0.0";
+       sha256 = "1d3jxqhv0c6pd08av31mdxshban2g0msdpljhl3wi5flrj93s8m3";
+       libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
+       homepage = "https://github.com/achirkin/easytensor#readme";
+       description = "Use easytensor with vulkan-api";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "easytest" = callPackage
     ({ mkDerivation, async, base, call-stack, containers, mtl, random
      , stm, text, transformers
@@ -67625,12 +68609,16 @@ self: {
      }) {};
 
   "ecstasy" = callPackage
-    ({ mkDerivation, base, containers, mtl, transformers }:
+    ({ mkDerivation, base, containers, kan-extensions, mtl
+     , transformers
+     }:
      mkDerivation {
        pname = "ecstasy";
-       version = "0.1.1.0";
-       sha256 = "06j5fpgrcf8nwwvs52gwdd55g7pxxv3ygsz5g08g8ap7wl2i9mby";
-       libraryHaskellDepends = [ base containers mtl transformers ];
+       version = "0.2.1.0";
+       sha256 = "1hyb1xnc45mmghvjvnxc2wnkrks8glw2bs5jwnc1pmn3p39l4nci";
+       libraryHaskellDepends = [
+         base containers kan-extensions mtl transformers
+       ];
        homepage = "http://github.com/isovector/ecstasy/";
        description = "A GHC.Generics based entity component system.";
        license = stdenv.lib.licenses.bsd3;
@@ -67715,8 +68703,8 @@ self: {
      }:
      mkDerivation {
        pname = "ede";
-       version = "0.2.8.7";
-       sha256 = "02jy6v9w7vpzs3fikfvgd09p0dvfq9isxcag281naazgn1my8swb";
+       version = "0.2.9";
+       sha256 = "0gvs9kyq4xyz11x5cqmr7vnh4d1vany36rfpmm4dg23w3yj36fab";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
@@ -68223,6 +69211,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "either-both" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "either-both";
+       version = "0.1.0.0";
+       sha256 = "1lbvahbbmhz6cazl5s4wkf66h1l20cg7380g027h53v5pjpvpdpl";
+       libraryHaskellDepends = [ base ];
+       description = "Either or both";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "either-list-functions" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -68529,6 +69528,8 @@ self: {
        pname = "ekg-wai";
        version = "0.1.0.3";
        sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz";
+       revision = "1";
+       editedCabalFile = "0crcpwrnh1pi5n4dlp9cwminj1gls9ywm4fgvisafh480097b100";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath http-types network
@@ -70440,6 +71441,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_3_0" = callPackage
+    ({ mkDerivation, base, exceptions, safe, text, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.3.0";
+       sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7";
+       libraryHaskellDepends = [
+         base exceptions safe text transformers transformers-compat
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "errors-ext" = callPackage
     ({ mkDerivation, base, errors, exceptions, HUnit, monad-control
      , mtl, transformers
@@ -70720,8 +71737,8 @@ self: {
      }:
      mkDerivation {
        pname = "etc";
-       version = "0.3.2.0";
-       sha256 = "1j4qjw1hqw5q9i47ixiwcr3zpcs1x39l46mh5yii5xkqmwlw9gk0";
+       version = "0.4.0.0";
+       sha256 = "0zyyayk9b6jzksxd14k08594ms5szgcpa63nlw3vnni1q1c2x1v4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base hashable rio text typed-process unliftio
@@ -71565,6 +72582,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventstore_1_1_3" = callPackage
+    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+     , cereal, clock, connection, containers, dns, dotnet-timespan
+     , ekg-core, exceptions, fast-logger, hashable, http-client
+     , interpolate, lifted-async, lifted-base, machines, monad-control
+     , monad-logger, mono-traversable, mtl, protobuf, random
+     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
+     , tasty-hunit, text, time, transformers-base, unordered-containers
+     , uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "1.1.3";
+       sha256 = "076pxyaslvw4kiqqbhapvqi0nr501l2z8nvajkqw1d9iasgwcfxz";
+       libraryHaskellDepends = [
+         aeson array base bifunctors bytestring cereal clock connection
+         containers dns dotnet-timespan ekg-core exceptions fast-logger
+         hashable http-client interpolate lifted-async lifted-base machines
+         monad-control monad-logger mono-traversable mtl protobuf random
+         safe-exceptions semigroups stm stm-chans text time
+         transformers-base unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring cereal connection containers
+         dotnet-timespan exceptions fast-logger hashable lifted-async
+         lifted-base monad-control mono-traversable protobuf safe-exceptions
+         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
+         transformers-base unordered-containers uuid
+       ];
+       homepage = "https://github.com/YoEight/eventstore#readme";
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "every" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
@@ -72447,15 +73500,16 @@ self: {
      }) {};
 
   "expressions" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, lattices, singletons
-     , text, transformers
+    ({ mkDerivation, attoparsec, base, containers, free, lattices
+     , singletons, text, transformers
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.5";
-       sha256 = "1iw6i922wjvs844gqqvmvhvfaq8c06lxlca806s6rbk0sxq40nmz";
+       version = "0.1.6";
+       sha256 = "081yglpbk0297s7qyq845x9pfkl0dcbz4i2dv1rppslvkhpwa270";
        libraryHaskellDepends = [
-         attoparsec base containers lattices singletons text transformers
+         attoparsec base containers free lattices singletons text
+         transformers
        ];
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
@@ -72463,15 +73517,15 @@ self: {
      }) {};
 
   "expressions-z3" = callPackage
-    ({ mkDerivation, base, containers, expressions, singletons
+    ({ mkDerivation, base, containers, expressions, list-t, singletons
      , transformers, z3
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.3";
-       sha256 = "1hb44k4558lwsx3z02lgmf1i24ajjlbyqbc88lzgjh3vswfahsj8";
+       version = "0.1.5";
+       sha256 = "07ah8bb7pv1jzj4aa783s8axh909hnysfy21x9slwgc8nwlx6rcr";
        libraryHaskellDepends = [
-         base containers expressions singletons transformers z3
+         base containers expressions list-t singletons transformers z3
        ];
        testHaskellDepends = [
          base containers expressions singletons transformers z3
@@ -72577,6 +73631,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4_9" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
+     , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
+     , mtl, prettyprinter, primitive, profunctors, QuickCheck
+     , semigroups, StateVar, tagged, template-haskell, text, th-lift
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4.9";
+       sha256 = "11iyz4lgs2bf6wg1iiancwj58ywpj8f93bqj9scy4mzz8mpyllmp";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava comonad constraints deepseq ghc-prim
+         hashable monad-skeleton mtl prettyprinter primitive profunctors
+         QuickCheck semigroups StateVar tagged template-haskell text th-lift
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [ base lens QuickCheck template-haskell ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -72641,6 +73719,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "extensible-effects-concurrent" = callPackage
+    ({ mkDerivation, base, containers, directory, extensible-effects
+     , filepath, lens, mtl, parallel, process, QuickCheck, random, stm
+     , tagged, time, transformers
+     }:
+     mkDerivation {
+       pname = "extensible-effects-concurrent";
+       version = "0.1.1.0";
+       sha256 = "1zf67f7400n4nvwvvb0znr3aigkhawqnlz911rl79bybcibx85nc";
+       libraryHaskellDepends = [
+         base containers directory extensible-effects filepath lens mtl
+         parallel process QuickCheck random stm tagged time transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/sheyll/extensible-effects-concurrent#readme";
+       description = "Message passing concurrency as extensible-effect";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "extensible-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -72804,6 +73901,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ez3" = callPackage
+    ({ mkDerivation, base, transformers, z3 }:
+     mkDerivation {
+       pname = "ez3";
+       version = "0.1.0.0";
+       sha256 = "0p2i8ingh27qn61rizh79ink63ydf3wcm86q57f4kd4arbnp7gs4";
+       revision = "1";
+       editedCabalFile = "13pr43yrrkxp0fmdw1s4wavz8zak5pw1aq2wf1zc8fskysyfx67w";
+       libraryHaskellDepends = [ base transformers z3 ];
+       description = "Z3 bonds with pure interface";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "faceted" = callPackage
     ({ mkDerivation, base, free }:
      mkDerivation {
@@ -73131,8 +74241,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.3";
-       sha256 = "1q9fdx61wpznpw551id09xg1yw8vyh77cvcwswmi0grld4hqn17g";
+       version = "0.6.0.5";
+       sha256 = "138qdgwqc3qnafi0kf5nkva3nvcfn71b1ch2xrwgxkna5kniqjrh";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
        benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
@@ -74977,8 +76087,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.3.2";
-       sha256 = "0nx16b6nvzvzwrwrbyzjm7dh2ilk3vbrwr6r9m2c62ll1k99100v";
+       version = "0.6.3.3";
+       sha256 = "04qvp5hmnnassw13lw7g1l785lgdlfzl9msy4k1ja8p6gksy7r1c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
@@ -75094,10 +76204,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "filtrable";
-       version = "0.1.0.5";
-       sha256 = "0znfhi3sxfnrhqnmll7dx9pyw5wcyvlj62b8ir9hz3cznvb7aakd";
-       revision = "1";
-       editedCabalFile = "0wa848jypc7vvr4y6h7rvfd6m8n1747889rqzybrl3cvm138572v";
+       version = "0.1.1.0";
+       sha256 = "0g1ngsbxrydbwa637sk8zvpvygppr6abj9hh87maf56ily4ki9fn";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
@@ -77014,8 +78122,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.5.2.0";
-       sha256 = "1dx9b7ivypa1avwb8ip7lqixm0lba15piiq3mh6wclxb93nf1n63";
+       version = "0.6.0.0";
+       sha256 = "177ar0c66lzp5rnnpbia0v3ri9aspc97qnj9yjwh3bz2drn01q0y";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses profunctors semigroupoids semigroups split text
@@ -77659,13 +78767,13 @@ self: {
 
   "fortran-src" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
-     , pretty, text, uniplate
+     , deepseq, directory, fgl, filepath, GenericPretty, happy, hspec
+     , mtl, pretty, text, uniplate
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.2.0.0";
-       sha256 = "0mmzr58rbanmml2mfawgg58s7v9v7gkw9maxpy96vyfkk4wjvnwc";
+       version = "0.2.1.1";
+       sha256 = "000i0395k6wpmzymiqc4x4xi06y6a8q4yianqplfl7zn2ghyxcsz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77678,10 +78786,10 @@ self: {
          GenericPretty mtl pretty text uniplate
        ];
        testHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         GenericPretty hspec mtl pretty text uniplate
+         array base binary bytestring containers deepseq directory fgl
+         filepath GenericPretty hspec mtl pretty text uniplate
        ];
-       description = "Parser and anlyses for Fortran standards 66, 77, 90";
+       description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -79000,6 +80108,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fsnotify-conduit_0_1_1_0" = callPackage
+    ({ mkDerivation, base, conduit, directory, filepath, fsnotify
+     , hspec, resourcet, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "fsnotify-conduit";
+       version = "0.1.1.0";
+       sha256 = "03mlb8yhdajf00dzddvbmb7jm3p05zw1y33f2acaa52pk45zh063";
+       libraryHaskellDepends = [
+         base conduit directory filepath fsnotify resourcet transformers
+       ];
+       testHaskellDepends = [
+         base conduit directory filepath fsnotify hspec resourcet temporary
+         transformers
+       ];
+       homepage = "https://github.com/fpco/fsnotify-conduit#readme";
+       description = "Get filesystem notifications as a stream of events";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fst" = callPackage
     ({ mkDerivation, array, base, haskeline, mtl, QuickCheck
      , transformers
@@ -81151,8 +82280,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.5";
        sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym";
-       revision = "7";
-       editedCabalFile = "0v4sqm0m8vr2i6hinx0mpax3mz73mvf21bdbga0vdgx7dac2nvkb";
+       revision = "8";
+       editedCabalFile = "1hpcglml4b5yv192syxazminr5v7qjrgqwb2wk0cf7f0sjpm5d0q";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -81480,12 +82609,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity_0_5_0_2" = callPackage
+  "genvalidity_0_5_0_3" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.5.0.2";
-       sha256 = "1l1lv8k8gl7i5zd54636ihbwddgq49088lgb2gragm05cki823c1";
+       version = "0.5.0.3";
+       sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -81518,7 +82647,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-aeson_0_2_0_0" = callPackage
+  "genvalidity-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
      , genvalidity-unordered-containers, genvalidity-vector, hspec
@@ -81526,8 +82655,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-aeson";
-       version = "0.2.0.0";
-       sha256 = "0lwy2r7gb5s26hilgxs2hf8zcn4dhdwqhr8r05zrvjcry4inn5mm";
+       version = "0.2.0.1";
+       sha256 = "0cfp5smj5ap5ppsk95yf0qmpbysqypsiccbcdckqkiky73nnvax8";
        libraryHaskellDepends = [
          aeson base genvalidity genvalidity-scientific genvalidity-text
          genvalidity-unordered-containers genvalidity-vector QuickCheck
@@ -81562,14 +82691,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-bytestring_0_2_0_0" = callPackage
+  "genvalidity-bytestring_0_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-bytestring
      }:
      mkDerivation {
        pname = "genvalidity-bytestring";
-       version = "0.2.0.0";
-       sha256 = "0ai3pmybs2xky8b596s0xs6511ab1h28ywbaishn5s0217q225zf";
+       version = "0.2.0.1";
+       sha256 = "0lyxaisy2wjsqh0igx74wkjginnza3mmjasi8gdvkzk8kd85jvcl";
        libraryHaskellDepends = [
          base bytestring genvalidity QuickCheck validity validity-bytestring
        ];
@@ -81602,14 +82731,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-containers_0_4_0_0" = callPackage
+  "genvalidity-containers_0_4_0_1" = callPackage
     ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-containers
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.4.0.0";
-       sha256 = "0q7dzmp8ik3v8ckv8i9cnc687306i4i80mx7sbh956hw5kr6bqnb";
+       version = "0.4.0.1";
+       sha256 = "1b8q17s22wimh4dgm2igaw6icdc2bqfr7ih28ba6chmnhsjiw9wf";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -81643,14 +82772,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec_0_6_0_2" = callPackage
+  "genvalidity-hspec_0_6_0_3" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.6.0.2";
-       sha256 = "0l14vn5hddkvyzhch8l9abwh3naya27p9f6lz918zd8i5l5pd32n";
+       version = "0.6.0.3";
+       sha256 = "195r2yw1ivss2w7criarmw5bpwjfpa19myvxfpkwk769wz9vih63";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          validity
@@ -81687,15 +82816,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-aeson_0_2_0_0" = callPackage
+  "genvalidity-hspec-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
      , genvalidity-text, hspec, QuickCheck, text
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.2.0.0";
-       sha256 = "0xkignwkq1hdyvachslwf5clzvnw0bmyi00mv3nkigxn8q1vbf7h";
+       version = "0.2.0.1";
+       sha256 = "0q681wj05vpxrplklvdxcr8l67gm71hvs7b991m7rfslpkx24smh";
        libraryHaskellDepends = [
          aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
          QuickCheck
@@ -81728,14 +82857,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-binary_0_2_0_0" = callPackage
+  "genvalidity-hspec-binary_0_2_0_1" = callPackage
     ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "genvalidity-hspec-binary";
-       version = "0.2.0.0";
-       sha256 = "0qmmhbka2ba9x9ypafij5q9gmmm7x4v1frf9mrfi4ffw91fnfnpv";
+       version = "0.2.0.1";
+       sha256 = "1ch48h0z7njxkv8ig8hk3d2s5a1w0ssxy2br05qn43snbdh33vx0";
        libraryHaskellDepends = [
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -81764,14 +82893,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-cereal_0_2_0_0" = callPackage
+  "genvalidity-hspec-cereal_0_2_0_1" = callPackage
     ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "genvalidity-hspec-cereal";
-       version = "0.2.0.0";
-       sha256 = "18fz57lwn6ljrm9fszb1n2jzn93kqvqi7x9fyp6a0kh733lyzrnn";
+       version = "0.2.0.1";
+       sha256 = "18md81dfwgf6cq6aq4yz0qm0j5myfq8md9zpbb87yrdmrqsvyapn";
        libraryHaskellDepends = [
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -81805,15 +82934,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-hashable_0_2_0_0" = callPackage
+  "genvalidity-hspec-hashable_0_2_0_1" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
      , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
      , validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-hashable";
-       version = "0.2.0.0";
-       sha256 = "1mw3lg792hssbfasb0av9x9n7ksqcjwxpgab0n9ia1jspxacrxr4";
+       version = "0.2.0.1";
+       sha256 = "1llgq9181n24cjd7blan1fc2lgv9039nfwl3sj95z2z9wvy63cgm";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec genvalidity-property hashable
          hspec QuickCheck validity
@@ -81844,14 +82973,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-path_0_3_0_0" = callPackage
+  "genvalidity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec
      , hspec, path, QuickCheck, validity-path
      }:
      mkDerivation {
        pname = "genvalidity-path";
-       version = "0.3.0.0";
-       sha256 = "00rbizzxy9ccd85gr0bf4kw6b5bz15pzhg05qzsifpjj6vfy4izf";
+       version = "0.3.0.1";
+       sha256 = "13avz2nlksvp6yam0mjny4fcj77i40vp8an5585n1mzrikadhr8x";
        libraryHaskellDepends = [
          base genvalidity path QuickCheck validity-path
        ];
@@ -81882,14 +83011,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity-property_0_2_0_1" = callPackage
+  "genvalidity-property_0_2_0_2" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.2.0.1";
-       sha256 = "02ypm53llfdrqasji79bng3ybkjs8ak7klcrhkg15k6jgk0ca877";
+       version = "0.2.0.2";
+       sha256 = "1rsxi6d5a4bz2dcxcrsa3xpav2nkxss8hindyncfqgn2af0vk5rp";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -81920,14 +83049,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-scientific_0_2_0_0" = callPackage
+  "genvalidity-scientific_0_2_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, scientific, validity, validity-scientific
      }:
      mkDerivation {
        pname = "genvalidity-scientific";
-       version = "0.2.0.0";
-       sha256 = "0zf0akzbggyy79h48m78cfsp82nmdgk0py8crfp81sh0pd3cydpi";
+       version = "0.2.0.1";
+       sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn";
        libraryHaskellDepends = [
          base genvalidity QuickCheck scientific validity validity-scientific
        ];
@@ -81960,14 +83089,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-text_0_5_0_0" = callPackage
+  "genvalidity-text_0_5_0_1" = callPackage
     ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, text, validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.5.0.0";
-       sha256 = "0vyw27l0b9snndl1nixidg8ghk6i95qv2xk59fbj1r1ybg27b837";
+       version = "0.5.0.1";
+       sha256 = "05dgf67zm9gbk985mz89jm4vdwd1s9rnazmjzwxn9gqkd6niqxyw";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -81998,14 +83127,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-time_0_2_0_1" = callPackage
+  "genvalidity-time_0_2_0_2" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, time, validity-time
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.2.0.1";
-       sha256 = "0kd2rxmz197yzfhxya4pbvl77iv7knl0zc1v56089ls4vk4by2gg";
+       version = "0.2.0.2";
+       sha256 = "0b0cyssqirpafla3dxkg6klq0nv6xnbaj10szb714lwiyvcx8dj1";
        libraryHaskellDepends = [
          base genvalidity QuickCheck time validity-time
        ];
@@ -82038,15 +83167,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-unordered-containers_0_2_0_2" = callPackage
+  "genvalidity-unordered-containers_0_2_0_3" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
      , validity-unordered-containers
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.2.0.2";
-       sha256 = "0sjs06qf0pk6xvgc38qayzfqk6wm1qgpx3yzglpkhdy809gl5pfa";
+       version = "0.2.0.3";
+       sha256 = "0r89pisv6a7m0vf6dif7lx7w7gc4jsx33d4hzskwz3x6si07xadd";
        libraryHaskellDepends = [
          base genvalidity hashable QuickCheck unordered-containers validity
          validity-unordered-containers
@@ -83177,6 +84306,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_2" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.2";
+       sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
      mkDerivation {
@@ -83323,6 +84475,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-syntax-highlighter" = callPackage
+    ({ mkDerivation, base, ghc, hspec, hspec-discover, text }:
+     mkDerivation {
+       pname = "ghc-syntax-highlighter";
+       version = "0.0.2.0";
+       sha256 = "1gcdhsbjpj1mwwgc4l2ibdcvicw9xx6bmva8r7ddd7bqbhnmqcyg";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ghc text ];
+       testHaskellDepends = [ base hspec text ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/mrkkrp/ghc-syntax-highlighter";
+       description = "Syntax highlighter for Haskell using lexer of GHC itself";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -83390,6 +84557,8 @@ self: {
        pname = "ghc-typelits-extra";
        version = "0.2.4";
        sha256 = "0inj776401846brd945p00qkjylniwlvycn1c300p90kyighkpdg";
+       revision = "1";
+       editedCabalFile = "1ysf5mr85877a995951wjdg633ylrbpqhpqnn27yb6ayimky5z7a";
        libraryHaskellDepends = [
          base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
          ghc-typelits-natnormalise integer-gmp transformers
@@ -83435,6 +84604,8 @@ self: {
        pname = "ghc-typelits-knownnat";
        version = "0.4.2";
        sha256 = "1h0l5hks2pdaibq4w46b9064idshan615iiyjjbzkc2zg04xsbbr";
+       revision = "1";
+       editedCabalFile = "16x3i6js5z0qr1yw9pfpc7hwhb28djijas2pkx4idwp997mryjaj";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -83477,6 +84648,8 @@ self: {
        pname = "ghc-typelits-natnormalise";
        version = "0.5.10";
        sha256 = "15xn69jdv77pgyd4mgm35zbrc1h0phyvw733j6s5iy01fhrhrdny";
+       revision = "1";
+       editedCabalFile = "1d4j47glcw0xvdr6sgr221rfpjs48bijx5c5hyqqz6jfp0164grr";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp
        ];
@@ -84080,6 +85253,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
+  "gi-cairo_1_0_17" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-cairo";
+       version = "1.0.17";
+       sha256 = "1ax7aly9ahvb18m3zjmy0dk47qfdx5yl15q52c3wp4wa0c5aggax";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ cairo ];
+       doHaddock = false;
+       preCompileBuildDriver = ''
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+       '';
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Cairo bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo;};
+
   "gi-dbusmenu" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
@@ -84134,8 +85333,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.15";
-       sha256 = "17cjg6m69xlmlnwlwa6s23f1j28bfrwkg08v3n5xmz56zvzsgykg";
+       version = "3.0.16";
+       sha256 = "0jp3d3zfm20b4ax1g5k1wzh8fxxzsw4ssw7zqx0d13167m4smc3y";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
@@ -84446,8 +85645,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.22";
-       sha256 = "017nnypxsrxsqar7pmbf0kwvbkpdnp3y7dvn8s82b09qiymxa0rz";
+       version = "3.0.23";
+       sha256 = "0lii8k87adhrdhpwqcfdcnclh7wf9hi6rkn819c2xmpbchaj3s4k";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -84627,8 +85826,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.16";
-       sha256 = "0hp90rx33xbi3w2y3iacf19p9mhkz6s4q8q6hcsrh5jnbavbpjwy";
+       version = "1.0.17";
+       sha256 = "1ysf9an7cmacyz7hzw0p7zshrn466v51d0dpqbkn2j1p2akr2v1a";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -85074,8 +86273,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180427";
-       sha256 = "0pjdb0mk5hmjl0sra37ap3cr5xp9pa7fyikqmz4156hzk925rrds";
+       version = "6.20180509";
+       sha256 = "09rl41c7fsz9jzf9234qcqfix61afxyc2vjx6sld2zyqiky7rhvh";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -85399,28 +86598,25 @@ self: {
      }) {};
 
   "git-vogue" = callPackage
-    ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff
-     , directory, extra, filepath, formatting, ghc-mod, git
-     , haskell-src-exts, hlint, hscolour, hspec, optparse-applicative
-     , process, split, strict, stylish-haskell, temporary, text
-     , transformers, unix
+    ({ mkDerivation, base, bifunctors, containers, cpphs, Diff
+     , directory, filepath, formatting, git, haskell-src-exts, hlint
+     , hscolour, hspec, optparse-applicative, process, split, strict
+     , stylish-haskell, temporary, text, transformers, unix
      }:
      mkDerivation {
        pname = "git-vogue";
-       version = "0.2.2.2";
-       sha256 = "13i5kb3bqkjhgla98ywl5rhjyi8dnxzi4srsjw3x3hwy0srmh7l8";
+       version = "0.3.0.2";
+       sha256 = "0p3h4107pfcxap83xbqffb30zymi2ipzjqgcdg2qzpbnczw6j5ml";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         base containers directory extra filepath formatting
-         optparse-applicative process split text transformers unix
+         base containers directory filepath formatting optparse-applicative
+         process split temporary text transformers unix
        ];
        executableHaskellDepends = [
-         base bifunctors Cabal cpphs Diff directory ghc-mod haskell-src-exts
-         hlint hscolour optparse-applicative process strict stylish-haskell
-         text
+         base bifunctors cpphs Diff directory haskell-src-exts hlint
+         hscolour optparse-applicative process strict stylish-haskell text
        ];
        testHaskellDepends = [
          base containers directory filepath hspec process temporary
@@ -87084,8 +88280,8 @@ self: {
     ({ mkDerivation, base, gmp, recursion-schemes }:
      mkDerivation {
        pname = "gmpint";
-       version = "0.1.0.12";
-       sha256 = "0l3qd8hps55am4ddj4x83f0vyi1rwhh7gj36k465n4m1pz7ndxrx";
+       version = "0.1.0.13";
+       sha256 = "0n4syarw91367kkvsbn9ag3caiksbplx4grm8q4z96wh39dvb24y";
        libraryHaskellDepends = [ base recursion-schemes ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
@@ -91319,8 +92515,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.14.9";
-       sha256 = "1khz6ymwga07h7s1k9gadf212m242l9qq09qn2fvx8v67p4wvxxz";
+       version = "0.14.10";
+       sha256 = "0cq6cpr42mjansnbk3p38xkqslqcb8lbl4smc73kaqr1xcg6gq98";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
@@ -91426,28 +92622,28 @@ self: {
      }) {};
 
   "gtk-sni-tray" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dbus, directory
-     , enclosed-exceptions, filepath, gi-dbusmenugtk3, gi-gdk
-     , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi
-     , haskell-gi-base, hslogger, optparse-applicative
-     , status-notifier-item, text, transformers, unix
+    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+     , dbus-hslogger, directory, enclosed-exceptions, filepath, gi-cairo
+     , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut
+     , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative
+     , status-notifier-item, text, transformers, transformers-base, unix
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.2.0";
-       sha256 = "1imgna34fdsg2fwlxk5xb0dvw8sbqjk7qgvh1p3wc8q9yx8zl0qm";
+       version = "0.1.3.0";
+       sha256 = "197a0wfbg6xzyka2ydbmbs6g6mghlp1ncchbmrb6gzn3b85iggq6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dbus directory enclosed-exceptions
-         filepath gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk
-         gtk-strut haskell-gi haskell-gi-base hslogger status-notifier-item
-         text transformers unix
+         base bytestring cairo containers dbus directory enclosed-exceptions
+         filepath gi-cairo gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib
+         gi-gtk gtk-strut haskell-gi haskell-gi-base hslogger
+         status-notifier-item text transformers transformers-base unix
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [
-         base dbus gi-gdk gi-gtk gtk-strut hslogger optparse-applicative
-         status-notifier-item text unix
+         base dbus dbus-hslogger gi-gdk gi-gtk gtk-strut hslogger
+         optparse-applicative status-notifier-item text unix
        ];
        homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme";
        description = "A standalone StatusNotifierItem/AppIndicator tray";
@@ -92215,35 +93411,33 @@ self: {
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite
-     , data-default-class, errors, hashable, incremental-parser
-     , ixset-typed, lens, memory, monad-loops, nettle, network
-     , network-uri, newtype, openpgp-asciiarmor, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
-     , transformers, unliftio-core, unordered-containers
-     , wl-pprint-extras, zlib
+     , containers, criterion, crypto-cipher-types, cryptonite, errors
+     , hashable, incremental-parser, ixset-typed, lens, memory
+     , monad-loops, nettle, network, network-uri, newtype
+     , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unliftio-core
+     , unordered-containers, wl-pprint-extras, zlib
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.6.1";
-       sha256 = "1al531lrsgfsqjc21117l420pcd7ymv4vdzywka189lkd8p5yzj7";
+       version = "2.6.2";
+       sha256 = "1jlhhil5ilsw4nzjwsmfppcsfg59w5hw7nxjba92dgm3bsicf1ln";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring
          base64-bytestring bifunctors binary binary-conduit bytestring bzlib
          conduit conduit-extra containers crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network-uri newtype
-         openpgp-asciiarmor resourcet semigroups split text time
-         time-locale-compat transformers unliftio-core unordered-containers
-         wl-pprint-extras zlib
+         errors hashable incremental-parser ixset-typed lens memory
+         monad-loops nettle network-uri newtype openpgp-asciiarmor resourcet
+         semigroups split text time time-locale-compat transformers
+         unliftio-core unordered-containers wl-pprint-extras zlib
        ];
        testHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
          binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype QuickCheck quickcheck-instances
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
          resourcet semigroups split tasty tasty-hunit tasty-quickcheck text
          time time-locale-compat transformers unliftio-core
          unordered-containers wl-pprint-extras zlib
@@ -92251,11 +93445,62 @@ self: {
        benchmarkHaskellDepends = [
          aeson base base16-bytestring base64-bytestring bifunctors binary
          binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype openpgp-asciiarmor resourcet
-         semigroups split text time time-locale-compat transformers
-         unliftio-core unordered-containers wl-pprint-extras zlib
+         criterion crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype openpgp-asciiarmor resourcet semigroups
+         split text time time-locale-compat transformers unliftio-core
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "https://salsa.debian.org/clint/hOpenPGP";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hOpenPGP_2_7" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+     , base16-bytestring, base64-bytestring, bifunctors, binary
+     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
+     , containers, criterion, crypto-cipher-types, cryptonite, errors
+     , hashable, incremental-parser, ixset-typed, lens, memory
+     , monad-loops, nettle, network, network-uri, newtype
+     , openpgp-asciiarmor, prettyprinter, QuickCheck
+     , quickcheck-instances, resourcet, semigroups, split, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , transformers, unliftio-core, unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.7";
+       sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg";
+       libraryHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring
+         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
+         conduit conduit-extra containers crypto-cipher-types cryptonite
+         errors hashable incremental-parser ixset-typed lens memory
+         monad-loops nettle network-uri newtype openpgp-asciiarmor
+         prettyprinter resourcet semigroups split text time
+         time-locale-compat transformers unliftio-core unordered-containers
+         zlib
+       ];
+       testHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+         binary binary-conduit bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype prettyprinter QuickCheck
+         quickcheck-instances resourcet semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unliftio-core unordered-containers zlib
+       ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bifunctors binary
+         binary-conduit bytestring bzlib conduit conduit-extra containers
+         criterion crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype openpgp-asciiarmor prettyprinter
+         resourcet semigroups split text time time-locale-compat
+         transformers unliftio-core unordered-containers zlib
        ];
        homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
@@ -93587,6 +94832,8 @@ self: {
        pname = "haddock-api";
        version = "2.19.0.1";
        sha256 = "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3";
+       revision = "1";
+       editedCabalFile = "0lfvhpiy8zr117wn9s9nc5va83rb0jz1h14ggm88565xr6qbwmjx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
@@ -94002,6 +95249,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.8";
+       sha256 = "1hyww94b0ndfypk47iffvfxm96m24ygrbm26a820arpcmxkp7k4x";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -96324,16 +97591,16 @@ self: {
      }) {};
 
   "hasbolt-extras" = callPackage
-    ({ mkDerivation, base, containers, hasbolt, lens
+    ({ mkDerivation, base, containers, free, hasbolt, lens, mtl
      , neat-interpolation, template-haskell, text, th-lift-instances
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.7";
-       sha256 = "0bbyrbs1rm83sd5nsd65yxxfyz4day20hs3vz7rlkh2hjxhpvxjv";
+       version = "0.0.0.9";
+       sha256 = "08crjy05k2jryfl3cqz4xdmmrj546pyjd4474di67rya8bn3zjwl";
        libraryHaskellDepends = [
-         base containers hasbolt lens neat-interpolation template-haskell
-         text th-lift-instances
+         base containers free hasbolt lens mtl neat-interpolation
+         template-haskell text th-lift-instances
        ];
        homepage = "https://github.com/biocad/hasbolt-extras#readme";
        description = "Extras for hasbolt library";
@@ -97598,17 +98865,17 @@ self: {
 
   "haskell-igraph" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, cereal
-     , cereal-conduit, colour, conduit, data-default-class, data-ordlist
-     , hashable, hxt, igraph, matrices, primitive, random, split, tasty
-     , tasty-golden, tasty-hunit, unordered-containers
+     , colour, conduit, data-ordlist, hashable, hxt, igraph, matrices
+     , primitive, random, singletons, split, tasty, tasty-golden
+     , tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.5.0";
-       sha256 = "1hil0zl4pnvkh0ingp0bgi0m7mhmvf1pqr7qskjxm6pa9kqybrw9";
+       version = "0.6.0";
+       sha256 = "15mq27zxgnnd0z0xcv8ncg7spw3hwmr7w65cr4y1wqixgxjzqsm0";
        libraryHaskellDepends = [
-         base bytestring bytestring-lexing cereal cereal-conduit colour
-         conduit data-default-class hashable hxt primitive split
+         base bytestring bytestring-lexing cereal colour conduit
+         data-ordlist hashable hxt primitive singletons split
          unordered-containers
        ];
        librarySystemDepends = [ igraph ];
@@ -99364,8 +100631,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskey";
-       version = "0.3.0.1";
-       sha256 = "1v5af0pd015d7ccdi0f2wc3gb60xy4j59kzngx6wh6dljkxrcga7";
+       version = "0.3.0.2";
+       sha256 = "1s24k6mwb1231j3ryd4iizday4l966vs9rcghr53k3jx2nl0h74h";
        libraryHaskellDepends = [
          base binary bytestring containers directory exceptions filepath
          focus haskey-btree list-t lz4 mtl semigroups stm stm-containers
@@ -99413,8 +100680,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskey-mtl";
-       version = "0.3.0.0";
-       sha256 = "0jc2wa41gmx01ccb7svv91llncm47adb2g6winm513k23bvk8028";
+       version = "0.3.0.1";
+       sha256 = "0n0wrk9sh62x87ms3fxnaj68jm91qdjd4265wk8x3lm66xw6vigw";
        libraryHaskellDepends = [
          base exceptions haskey haskey-btree mtl transformers
        ];
@@ -99899,20 +101166,22 @@ self: {
 
   "hasktags" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json
-     , utf8-string
+     , microlens-platform, utf8-string
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.5";
-       sha256 = "0jln0r3dzd7g17avxqgnyxzv4nmqlmqaw41vrysb838yql6g6ns8";
+       version = "0.70.1";
+       sha256 = "01ngdfaiwlzwai34wmhi7wysk6raxb465v0imyn7j3ibk374af5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath json utf8-string
+         base bytestring directory filepath json microlens-platform
+         utf8-string
        ];
        executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         base bytestring directory filepath HUnit json utf8-string
+         base bytestring directory filepath HUnit json microlens-platform
+         utf8-string
        ];
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
@@ -100279,6 +101548,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql-optparse-applicative_0_3_0_1" = callPackage
+    ({ mkDerivation, base-prelude, hasql, hasql-pool
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "hasql-optparse-applicative";
+       version = "0.3.0.1";
+       sha256 = "19a31qg4fj74qcjrf6ng11za7zbywg08hnls4pri816fwkjdjs9k";
+       libraryHaskellDepends = [
+         base-prelude hasql hasql-pool optparse-applicative
+       ];
+       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
+       description = "\"optparse-applicative\" parsers for \"hasql\"";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-pool" = callPackage
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
@@ -100871,6 +102157,34 @@ self: {
        license = "unknown";
      }) {};
 
+  "haxl_2_0_0_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+     , stm, test-framework, test-framework-hunit, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haxl";
+       version = "2.0.0.0";
+       sha256 = "12ba1hylv181101s6lyjkf6kn8r42qkh60xd9xinzsm2mcfbbbmy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq exceptions filepath
+         ghc-prim hashable pretty stm text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers deepseq filepath hashable
+         HUnit test-framework test-framework-hunit text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/facebook/Haxl";
+       description = "A Haskell library for efficient, concurrent, and concise data access";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haxl-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, async, base, conduit
      , hashable, haxl, transformers
@@ -102166,6 +103480,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog_0_6" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, semigroups, stm, template-haskell, text
+     , th-lift, time, transformers, transformers-base, unix
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.6";
+       sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet semigroups stm
+         template-haskell text th-lift time transformers transformers-base
+         unix wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers pretty-show semigroups text transformers
+       ];
+       homepage = "https://hedgehog.qa";
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -102240,6 +103582,8 @@ self: {
        pname = "hedgehog-quickcheck";
        version = "0.1";
        sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1";
+       revision = "1";
+       editedCabalFile = "1l6gpzhi56mj4a4nqmqhndhly3pdffkpbxinypk5ra77nxqns6n5";
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        homepage = "https://hedgehog.qa";
        description = "Use QuickCheck generators in Hedgehog and vice versa";
@@ -103089,19 +104433,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "herms_1_8_2_2" = callPackage
+  "herms_1_9_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, brick, directory, microlens
-     , microlens-th, optparse-applicative, semigroups, split, vty
+     , microlens-th, mtl, optparse-applicative, semigroups, split, vty
      }:
      mkDerivation {
        pname = "herms";
-       version = "1.8.2.2";
-       sha256 = "0x6h1l9kikjqzyyxa23y9df6bdw529cr07g74qc2qbdbg39713zq";
+       version = "1.9.0.0";
+       sha256 = "0k3fn5rq294qly8zzfbjdp3sc2zvxslkhyfhh8na9azrkgz2szia";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         ansi-terminal base brick directory microlens microlens-th
+         ansi-terminal base brick directory microlens microlens-th mtl
          optparse-applicative semigroups split vty
        ];
        homepage = "https://github.com/JackKiefer/herms";
@@ -103469,6 +104813,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hexmino" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, gloss
+     , optparse-applicative, random
+     }:
+     mkDerivation {
+       pname = "hexmino";
+       version = "0.1.0.0";
+       sha256 = "0s8sqpqirnnm9jp1lmifywy7ad6vxpj8k85nfyh4zjqybrs2m2p9";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory filepath gloss optparse-applicative
+         random
+       ];
+       homepage = "https://github.com/pasqu4le/hexmino";
+       description = "A small game based on domino-like hexagonal tiles";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hexml" = callPackage
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
@@ -103854,6 +105217,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hformat_0_3_2_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "hformat";
+       version = "0.3.2.0";
+       sha256 = "1761gw0g7ar4ls4pzm8vq3k48nckd4lliq7f9s7br961215sjgx9";
+       libraryHaskellDepends = [
+         ansi-terminal base base-unicode-symbols text
+       ];
+       testHaskellDepends = [ base base-unicode-symbols hspec text ];
+       homepage = "http://github.com/mvoidex/hformat";
+       description = "Simple Haskell formatting";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hfov" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -104481,8 +105862,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchy";
-       version = "1.0.1";
-       sha256 = "11xnqf5s0vda2wjgdazkgkmjp46jyl9zcaia5r01szfwjihj5ldg";
+       version = "1.0.2";
+       sha256 = "060kgg8gfp2155fibksi65xy5psbwabh4wymg7i6cqh3k3zhxy95";
        libraryHaskellDepends = [
          base exceptions free mmorph monad-control mtl transformers
          transformers-base transformers-compat
@@ -105814,6 +107195,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hkt" = callPackage
+    ({ mkDerivation, base, hspec, inspection-testing, protolude, text
+     }:
+     mkDerivation {
+       pname = "hkt";
+       version = "0.0.1";
+       sha256 = "14w3r5i0gqsh1c6xjrr4xz3ym94gp206sji9gkyy4ahdp2ymyvj6";
+       libraryHaskellDepends = [ base protolude ];
+       testHaskellDepends = [
+         base hspec inspection-testing protolude text
+       ];
+       homepage = "https://github.com/eliaslfox/hkt#readme";
+       description = "A library for higher kinded types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
      , directory, filepath, mtl, process, template-haskell, transformers
@@ -105999,8 +107396,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.13";
-       sha256 = "0kngmnpn5qk76hbf1ynfz9zfzwvsslq7klih78k103zl76ggdvsv";
+       version = "0.2.0.14";
+       sha256 = "16njnl51kxmk2ika1ily5snl761559k0pbiql42pbn7zry93l1zn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -106401,8 +107798,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.1.0";
-       sha256 = "0jxpzbwlcf8ix08sbxppcbvlvq2hhs8ya0mkk9b262zb2bfv3m4i";
+       version = "0.1.1.1";
+       sha256 = "1c74v3fq1cw6fq33rmmmm6hb595a8f6iyv934w8kww74g79qli7d";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -107213,6 +108610,8 @@ self: {
        pname = "hnix";
        version = "0.5.1";
        sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al";
+       revision = "1";
+       editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107249,7 +108648,7 @@ self: {
          optparse-applicative serialise template-haskell text time
          transformers unordered-containers
        ];
-       homepage = "https://github.com/jwiegley/hnix#readme";
+       homepage = "https://github.com/haskell-nix/hnix#readme";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108270,8 +109669,8 @@ self: {
        pname = "hookup";
        version = "0.2";
        sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2";
-       revision = "1";
-       editedCabalFile = "1g4zijk8f4rff0g2y0m0308zmnwsbx0a3swbx8i8gvfd6v1g4cf6";
+       revision = "2";
+       editedCabalFile = "06iw66x7hjjf5fl5d4glz8lnpagjkbdl3hf44vh6ycgflyh1p434";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system network socks
        ];
@@ -108372,14 +109771,14 @@ self: {
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
      , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
      , http-client-tls, http-types, ixset-typed, lens, monad-loops
-     , openpgp-asciiarmor, optparse-applicative, resourcet, text, time
-     , time-locale-compat, transformers, unordered-containers
-     , wl-pprint-extras, wl-pprint-terminfo, yaml
+     , openpgp-asciiarmor, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, resourcet, text, time
+     , time-locale-compat, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.20.1";
-       sha256 = "1nidlipz0isj65vg6zhi79ln14i9kxvnn164s0haf086vm81kw32";
+       version = "0.21";
+       sha256 = "0ks84gnr3wgca7h0nh8igiigp2y2vv9vrjng49fyrak8k8fw2ln3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108387,14 +109786,14 @@ self: {
          binary-conduit bytestring conduit conduit-extra containers
          crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
          http-client http-client-tls http-types ixset-typed lens monad-loops
-         openpgp-asciiarmor optparse-applicative resourcet text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras wl-pprint-terminfo yaml
+         openpgp-asciiarmor optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal resourcet text time time-locale-compat
+         transformers unordered-containers yaml
        ];
        executableToolDepends = [ alex happy ];
        homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "hOpenPGP-based command-line tools";
-       license = "unknown";
+       license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110579,17 +111978,17 @@ self: {
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
      , cpphs, criterion, deepseq, haskell-src-exts, hspec
-     , hspec-dirstream, language-ats, lens, system-filepath
+     , hspec-dirstream, language-ats, microlens, system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.3.0.1";
-       sha256 = "1z8afx8bc9igd0iv6anw635zfj6vwqq10kp4j95p3fs58wyjg21v";
+       version = "0.3.0.2";
+       sha256 = "0yimapbxy0il6yv12r1xx03vjjgc8hl3iyyi21y41bqdzzl4f37p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base casing composition-prelude cpphs deepseq
-         haskell-src-exts language-ats lens
+         haskell-src-exts language-ats microlens
        ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
@@ -112079,8 +113478,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.9.5.1";
-       sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8";
+       version = "0.9.5.2";
+       sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f";
        configureFlags = [ "-fsystem-lua" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
@@ -112515,15 +113914,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_0" = callPackage
+  "hspec_2_5_1" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.0";
-       sha256 = "16vp3k8bdqvsdhv12srahda3anf1pia7blczh201snib52is9vdb";
+       version = "2.5.1";
+       sha256 = "1hip8937prrvkdp63jwicg80b9fpj1yb4rfwl68jd76x2j15hyyl";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -112626,7 +114025,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_0" = callPackage
+  "hspec-core_2_5_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -112634,8 +114033,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.0";
-       sha256 = "1p88sxarrpfzic4h37n9crpvmklisv514cm0v6fxmk1f2jvf3rgj";
+       version = "2.5.1";
+       sha256 = "0yfw5rxyh830sb4l0zmsvjyanlg4q20y9hd90d3np5qwhpz4b3p8";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -112692,13 +114091,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_0" = callPackage
+  "hspec-discover_2_5_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.0";
-       sha256 = "1r91g9hqdn815i86hsrv5bagv76rhq4n0avkmhkh670kkryc0iry";
+       version = "2.5.1";
+       sha256 = "0a3j58jxfv9i15shifhmm7i6i0xd9p4pd3grm4my5c80nhsps61w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -114609,8 +116008,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "1.1.0.4";
-       sha256 = "03ffmff09k6aqpd9rv41bfi566pr6hk4vdjm0my2wfypbn2mrgb0";
+       version = "1.2.0.2";
+       sha256 = "0kqy3vfiira8bm0ipynwk2dny99llsw2gnvyh0rsdc0bphiwjh62";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -114807,6 +116206,8 @@ self: {
        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
@@ -116105,12 +117506,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_2_0_0" = callPackage
+  "hunit-dejafu_1_2_0_1" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.2.0.0";
-       sha256 = "0djn982mlz4m58hxsghxxj34vsw78i57scxx9a1i3zk7qznmingv";
+       version = "1.2.0.1";
+       sha256 = "1shkfbn14qfk9bjnrmdn3zz88718jb1m942idg2vl53yfj16ahy9";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -116892,6 +118293,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.6.0.0";
+       sha256 = "1x1ypc098zkgc0gcsyszfqgf2jw7b239d0qrwqzg5iwvzwlwapwk";
+       libraryHaskellDepends = [ base bytestring mmap vector ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-prim#readme";
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -116946,7 +118369,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_12_0_1" = callPackage
+  "hw-rankselect_0_12_0_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
@@ -116954,8 +118377,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.12.0.1";
-       sha256 = "0jg27cpdw341gr1mjnqm5rq66q84q1rzwa5bp8czzws71m5kpfpy";
+       version = "0.12.0.2";
+       sha256 = "02fr2p1sl7ynpc1280l1nakf24ifp4fkpjpy2lac8rk4iab48syk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117002,15 +118425,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect-base_0_3_0_0" = callPackage
+  "hw-rankselect-base_0_3_2_0" = callPackage
     ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec
      , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-rankselect-base";
-       version = "0.3.0.0";
-       sha256 = "19gclmljps2nplfqch26grzagvsraafr4540s6x19x2m58aa3m7g";
+       version = "0.3.2.0";
+       sha256 = "0kb5iqv56fg482w59nlwhfz7fi8vkdg840dsa4lb3bqgy5w0mn3s";
        libraryHaskellDepends = [
          base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -120232,14 +121655,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "incremental-parser_0_3_1" = callPackage
+  "incremental-parser_0_3_1_1" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "incremental-parser";
-       version = "0.3.1";
-       sha256 = "1nygr5hs547innw9f5wx8ifpkiq01ckbhx34266ds6rmnjsqxzby";
+       version = "0.3.1.1";
+       sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -120450,14 +121873,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "indexed-list-literals_0_2_0_0" = callPackage
-    ({ mkDerivation, base, Only }:
+  "indexed-list-literals_0_2_1_1" = callPackage
+    ({ mkDerivation, base, hspec, Only }:
      mkDerivation {
        pname = "indexed-list-literals";
-       version = "0.2.0.0";
-       sha256 = "0n0j5x4v099000fm2ar0lmn06f21gnq39srmimy9bm3zisx8zmzd";
+       version = "0.2.1.1";
+       sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg";
        libraryHaskellDepends = [ base Only ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/davidm-d/indexed-list-literals";
        description = "Type safe indexed list literals";
        license = stdenv.lib.licenses.bsd3;
@@ -120633,8 +122056,8 @@ self: {
      }:
      mkDerivation {
        pname = "inflections";
-       version = "0.4.0.1";
-       sha256 = "1vc04afp5lvh5drs4pf6djmkn80513h4phkw5gs4g4d37h3d3jg2";
+       version = "0.4.0.3";
+       sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx";
        libraryHaskellDepends = [
          base exceptions megaparsec text unordered-containers
        ];
@@ -120934,14 +122357,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c-cpp_0_2_2_0" = callPackage
+  "inline-c-cpp_0_2_2_1" = callPackage
     ({ mkDerivation, base, hspec, inline-c, safe-exceptions
      , template-haskell
      }:
      mkDerivation {
        pname = "inline-c-cpp";
-       version = "0.2.2.0";
-       sha256 = "1sglwjg8agzi3gspv97g999vb0zzsf5c41znqnnnvqx605jpsd5g";
+       version = "0.2.2.1";
+       sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci";
        libraryHaskellDepends = [
          base inline-c safe-exceptions template-haskell
        ];
@@ -121323,8 +122746,8 @@ self: {
      }:
      mkDerivation {
        pname = "int-multimap";
-       version = "0.2.1";
-       sha256 = "080ypcd99pvw0wsrydz6hzd9hrr18v4kcb3wihz6v8ylfn08d6ci";
+       version = "0.3";
+       sha256 = "1hsd55hg52mb6vimk5813l0s72spvy9njrhzz6dc6jddh65v58lv";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -121404,6 +122827,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "integreat" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, cassava
+     , containers, fgl, foldl, hmatrix, lens, mtl, mwc-random
+     , optparse-generic, parallel, random-fu, rank-product, sequence
+     , statistics, stringsearch, text, text-show, vector
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "integreat";
+       version = "0.2.2.1";
+       sha256 = "1kyahjbvl6y53ymlnzmjgpi32wdnnq0pwamb7fbzcf3mh94l57lz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring cassava containers fgl foldl hmatrix
+         lens mtl mwc-random parallel random-fu rank-product sequence
+         statistics stringsearch text text-show vector vector-th-unbox
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers lens mtl optparse-generic text
+         vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/integreat#readme";
+       description = "Integrate different assays";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "intel-aes" = callPackage
     ({ mkDerivation, base, bytestring, cereal, crypto-api, DRBG
      , intel_aes, largeword, process, random, rdtsc, split, tagged, time
@@ -121493,8 +122943,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.3.0.0";
-       sha256 = "0aa26cgap70ji6qjy555039i8zrynibmfsxpdpkww6pqj3hwrc93";
+       version = "0.4.0.0";
+       sha256 = "0dh3n0kx1i46k7v7y7i4i39raacjc6kf5yb8p410hlsk4wwijw1n";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -122284,7 +123734,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ip_1_2_0" = callPackage
+  "ip_1_2_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , doctest, hashable, hspec, HUnit, primitive, QuickCheck
      , quickcheck-classes, semigroups, test-framework
@@ -122292,10 +123742,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "1.2.0";
-       sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f";
-       revision = "1";
-       editedCabalFile = "09g6nhh6r52dnk6adnxv6qiin6fxif567dl1nca49z5njphcvyl3";
+       version = "1.2.1";
+       sha256 = "024cl4dx0580wch2z9m45siak2n9dpbj3853gc4p9r257zp5xalr";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive semigroups text
          vector
@@ -122393,13 +123841,16 @@ self: {
      }) {};
 
   "ipcvar" = callPackage
-    ({ mkDerivation, base, binary, bytestring, directory, hspec, unix
+    ({ mkDerivation, base, binary, bytestring, directory, hspec, text
+     , unix, uuid
      }:
      mkDerivation {
        pname = "ipcvar";
-       version = "0.0.1";
-       sha256 = "085p03xk29wk03yfshpjvzkf2z79byhp9yy81vra1aci9nkgjr3n";
-       libraryHaskellDepends = [ base binary bytestring directory unix ];
+       version = "0.1.1";
+       sha256 = "169gbfd6pgj6v87rvn8pmr1sx3aj58c4fvn1gdxdgzm70910hkmk";
+       libraryHaskellDepends = [
+         base binary bytestring directory text unix uuid
+       ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
        license = stdenv.lib.licenses.mit;
@@ -122458,6 +123909,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_5" = callPackage
+    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
+     , network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.5";
+       sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder containers doctest hspec network QuickCheck
+         safe
+       ];
+       homepage = "http://www.mew.org/~kazu/proj/iproute/";
+       description = "IP Routing Table";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iptables-helpers" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
      , syb, utf8-string
@@ -122562,8 +124034,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.1.0.2";
-       sha256 = "1y9camx7vwpgr2qvqnkzk7rz9k0wkxrb35wflar4g9k0q6xqp2mi";
+       version = "1.1.0.3";
+       sha256 = "1lw271lkl7ps0lxd2as95hi7hbkhmmy21i178h4hrp8v28lsmqxy";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -124324,8 +125796,8 @@ self: {
      }:
      mkDerivation {
        pname = "jmacro";
-       version = "0.6.14";
-       sha256 = "084rvwav0j33nffiklsrgafg3kmsmd2wnrydw152l6cznwd43fdc";
+       version = "0.6.15";
+       sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124361,6 +125833,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jmacro-rpc_0_3_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+     , containers, contravariant, jmacro, mtl, scientific, split, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jmacro-rpc";
+       version = "0.3.3";
+       sha256 = "0gqyv8y4hjk2fwvzar173hvhgw860as0wijfhxqnxbkhd7f2r4gf";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-html bytestring containers
+         contravariant jmacro mtl scientific split text unordered-containers
+         vector
+       ];
+       homepage = "http://hub.darcs.net/gershomb/jmacro";
+       description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jmacro-rpc-happstack" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , happstack-server, jmacro, jmacro-rpc, mtl
@@ -125400,6 +126892,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-rpc-generic_0_2_1_4" = callPackage
+    ({ mkDerivation, aeson, aeson-generic-compat, base, containers
+     , dlist, QuickCheck, quickcheck-simple, scientific, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-rpc-generic";
+       version = "0.2.1.4";
+       sha256 = "0zibbxc5fqm9mazfdjbi6angyh5rlcccfd260k667w8lcxc6h7kl";
+       libraryHaskellDepends = [
+         aeson aeson-generic-compat base containers dlist scientific text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base QuickCheck quickcheck-simple text
+       ];
+       homepage = "http://github.com/khibino/haskell-json-rpc-generic";
+       description = "Generic encoder and decode for JSON-RPC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-rpc-server" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl
      , test-framework, test-framework-hunit, text, unordered-containers
@@ -125435,8 +126949,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an";
-       revision = "13";
-       editedCabalFile = "07r9sdkhhp7wp7zyrw8mnr9dk1z83drm3jfcayv9gz28jnr3gpv1";
+       revision = "14";
+       editedCabalFile = "0pf2j8v62mfh6dk0v4a93l75by6i6jsfangbsabksdbzhh64hyrr";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -125550,8 +127064,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-tracer";
-       version = "0.0.2.0";
-       sha256 = "0fgyx2m0xnkwkqlvmbqmwjklfdif8gprz1bcwbcmmvyznsc6wngq";
+       version = "0.0.3.0";
+       sha256 = "164plgxsaz2nyjl59zip8zj6rxn6gzq91vfqp11fdmafxn3cjv61";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable microlens microlens-ghc mtl
          template-haskell text transformers unordered-containers
@@ -125926,8 +127440,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.3.5";
-       sha256 = "1ibx0pr0ddnzx5jbgkjzidkmja65gan7ji7s42v2iwn05fm125ki";
+       version = "0.3.7";
+       sha256 = "1m9za59bgvgzjd7fn11l322aq8j0xb6zsn94ycm0j5z3dwxv0l46";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126450,15 +127964,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "kanji_3_3_0" = callPackage
+  "kanji_3_4_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
      , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
      , optparse-applicative, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "kanji";
-       version = "3.3.0";
-       sha256 = "0wapqdrh18344j0dz3y3g08vcfharc43xlcgkk8ksj5r30zq1vff";
+       version = "3.4.0";
+       sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126651,8 +128165,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.4.0";
-       sha256 = "1144krzz4wvwhdh1b2673302xn7svz2b6kjfvq9728f1bzkkspad";
+       version = "0.5.5.0";
+       sha256 = "10s2bv79shvnpkz1zbcn220mxv05xxq5gny332vhrhflnlcsq9jr";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -126822,21 +128336,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katydid_0_3_0_1" = callPackage
+  "katydid_0_3_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
      , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
-     , transformers-either
+     , transformers
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.3.0.1";
-       sha256 = "08q8qmvxc47y8rxs8vam31xwjgwyjga4bdd65m1n4plpndi0zhyg";
+       version = "0.3.1.0";
+       sha256 = "0h7w54z9318m85qdd9whlmg3vnkv69gbl8nxc8iz35pw2cbw51r2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq either extra hxt ilist json mtl
-         parsec regex-tdfa text transformers-either
+         parsec regex-tdfa text transformers
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
@@ -127037,6 +128551,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "keccak" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "keccak";
+       version = "0.1.0";
+       sha256 = "1z3daxxpqj0pwv6ln7kils7aqqmcp8m438x9z3xay5szr8l1i8sz";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/aupiff/keccak#readme";
+       description = "haskell keccak functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "keenser" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , fast-logger, hedis, hostname, lifted-base, monad-control
@@ -128037,6 +129570,8 @@ self: {
        pname = "kraken";
        version = "0.1.0";
        sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k";
+       revision = "1";
+       editedCabalFile = "0ycdikk0mwy1ys9v29ybiws4fr59arwkpibdx62p9vpdv9f0p9k6";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
@@ -129213,17 +130748,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, lens, recursion-schemes, system-filepath
-     , transformers
+     , hspec, hspec-dirstream, micro-recursion-schemes, microlens
+     , microlens-th, system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.9";
-       sha256 = "0narp1zhvyannd627bafh6yhk8y5lfw6f5nqr9wi1qvbynmlmhmg";
+       version = "1.2.0.10";
+       sha256 = "1998i63gn8f5pn4jlkv30869679jab0vz0gvjzr4yqlyq4npsvpy";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         lens recursion-schemes transformers
+         micro-recursion-schemes microlens microlens-th transformers
        ];
        libraryToolDepends = [ alex cpphs happy ];
        testHaskellDepends = [
@@ -130718,8 +132253,8 @@ self: {
      }:
      mkDerivation {
        pname = "layered-state";
-       version = "1.1.2";
-       sha256 = "1z9xz9nvzlqvzrp4dva9skci70g70lzzf5d5d38ilxvfk7kh56h6";
+       version = "1.1.3";
+       sha256 = "01pi8bslw7pmd3cm7jxxs500i35ny2lbaqi0hnl2a7kzjjxfrs6s";
        libraryHaskellDepends = [
          base constraints data-default exceptions lens lens-utils
          monad-branch monoid mtl primitive profunctors prologue transformers
@@ -133075,21 +134610,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lifted-async_0_10_0_1" = callPackage
+  "lifted-async_0_10_0_2" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
-     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
-     , tasty-th, transformers-base
+     , HUnit, lifted-base, monad-control, mtl, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.10.0.1";
-       sha256 = "1cf44j2jr2svp8g03hzf3xfmjlh7xcd40ra1k7dv6vzyzwb5p4hd";
+       version = "0.10.0.2";
+       sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
        testHaskellDepends = [
-         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
-         tasty-th
+         async base HUnit lifted-base monad-control mtl tasty
+         tasty-expected-failure tasty-hunit tasty-th
        ];
        benchmarkHaskellDepends = [ async base criterion deepseq ];
        homepage = "https://github.com/maoe/lifted-async";
@@ -133139,6 +134674,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lifted-stm" = callPackage
+    ({ mkDerivation, array, base, monad-finally, stm, transformers
+     , transformers-abort, transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-stm";
+       version = "0.1";
+       sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0";
+       libraryHaskellDepends = [
+         array base monad-finally stm transformers transformers-abort
+         transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/mvv/lifted-stm";
+       description = "STM operations lifted through monad transformer stacks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lifted-threads" = callPackage
     ({ mkDerivation, base, monad-control, threads, transformers-base }:
      mkDerivation {
@@ -135048,8 +136600,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs-pretty";
-       version = "0.2.1.0";
-       sha256 = "1v8nz7c7wvvh29c48li10m12lj8y3yn5b8rs1b86y351s11vsag6";
+       version = "0.3.0.0";
+       sha256 = "1q67rsjnw8wsfvmz4a54nr7b9il59fdjbbra2wwnnyjldi29ykdq";
        libraryHaskellDepends = [
          array base bytestring llvm-hs-pure text wl-pprint-text
        ];
@@ -135698,8 +137250,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-effect";
-       version = "1.0.0";
-       sha256 = "0xj0g5g054ayycdajryischj2yy9rb75cm782sgsj67p04943c5y";
+       version = "1.0.1";
+       sha256 = "0679irh73lqd8jl3mzndijrdjq8z02lqbi4pbmj8qs6m4q9a6akn";
        libraryHaskellDepends = [
          base bytestring extensible-effects monad-control text
          transformers-base
@@ -135710,6 +137262,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log-effect-syslog" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-effects, hsyslog
+     , log-effect, monad-control, transformers-base
+     }:
+     mkDerivation {
+       pname = "log-effect-syslog";
+       version = "0.1.0";
+       sha256 = "0db4pgl0np1yyl9arq5cvdp3njdlw62dnbldggjc9p0q6dh3hspc";
+       libraryHaskellDepends = [
+         base bytestring extensible-effects hsyslog log-effect monad-control
+         transformers-base
+       ];
+       homepage = "https://github.com/greydot/log-effect-syslog";
+       description = "Syslog functions for log-effect";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "log-elasticsearch" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
@@ -135963,6 +137532,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_3_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , prettyprinter, semigroups, stm, stm-delay, text, time
+     , transformers, transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.3.0";
+       sha256 = "02acs3f4zx0xwivzfpw5i4mnig63m330n1a2ni0brck3kbj9qsrn";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl prettyprinter
+         semigroups stm stm-delay text time transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-effect-extra" = callPackage
     ({ mkDerivation, base, logging-effect, logging-effect-extra-file
      , logging-effect-extra-handler, wl-pprint-text
@@ -138973,8 +140566,8 @@ self: {
      }:
      mkDerivation {
        pname = "mapalgebra";
-       version = "0.1.0";
-       sha256 = "1d4cdwkrbvkh53h3vkzghikmbnba3x1j84r0wgsc90cnr2im5san";
+       version = "0.1.1";
+       sha256 = "1zcba17nj804lbhnlr02bcg8qfaxv3nq8ddiqxpq2qp4mv8n8g4f";
        libraryHaskellDepends = [
          base bytestring containers data-default deepseq hmatrix massiv
          massiv-io vector
@@ -141553,8 +143146,8 @@ self: {
      }:
      mkDerivation {
        pname = "micro-recursion-schemes";
-       version = "5.0.2.1";
-       sha256 = "1n1sza3a87vh74hx1da4mcfwarbjkz2cfvnkldnqwfnqvngq1gaq";
+       version = "5.0.2.2";
+       sha256 = "17jybjra4s1hapjz6i8bwlv8y6rm70g72vl7cd2y7xrq4vrd3p9v";
        libraryHaskellDepends = [ base template-haskell th-abstraction ];
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base HUnit template-haskell ];
@@ -142756,25 +144349,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "mintty";
-       version = "0.1.1";
-       sha256 = "10wz5q85h366g22jijai5g6hpxa22zy2hr33bzidxs4r36gk8zy8";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/mintty";
-       description = "A reliable way to detect the presence of a MinTTY console on Windows";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mintty_0_1_2" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "mintty";
        version = "0.1.2";
        sha256 = "1njhz7wjmsk5pbr7gfkl95k50npkmm0iyxp3j93bbsg4rmxzg2kw";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/RyanGlScott/mintty";
        description = "A reliable way to detect the presence of a MinTTY console on Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mios" = callPackage
@@ -143151,6 +144731,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmark-ext_0_2_1_0" = callPackage
+    ({ mkDerivation, base, foldl, hspec, hspec-discover, lucid
+     , microlens, mmark, modern-uri, skylighting, text
+     }:
+     mkDerivation {
+       pname = "mmark-ext";
+       version = "0.2.1.0";
+       sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base foldl lucid microlens mmark modern-uri skylighting text
+       ];
+       testHaskellDepends = [ base hspec lucid mmark text ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/mmark-md/mmark-ext";
+       description = "Commonly useful extensions for the MMark markdown processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmorph" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
@@ -144088,8 +145688,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger-prefix";
-       version = "0.1.9";
-       sha256 = "1xvw1nd9arn2v2x4a8r0nljfv0a4z9kqa5pbrhmskgr70l9py4jm";
+       version = "0.1.10";
+       sha256 = "0xfrl084b45nq7598239ax3v0qck56d75p4jcqlykn8k7822vb53";
        libraryHaskellDepends = [
          base exceptions monad-control monad-logger mtl resourcet text
          transformers transformers-base
@@ -145315,6 +146915,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-extras_0_5" = callPackage
+    ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
+     }:
+     mkDerivation {
+       pname = "monoid-extras";
+       version = "0.5";
+       sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       benchmarkHaskellDepends = [ base criterion semigroups ];
+       description = "Various extra monoid-related definitions and utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-owns" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -145703,6 +147317,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_19" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, formatting, http-client
+     , http-client-tls, microlens, microlens-mtl, mtl
+     , optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.19";
+       sha256 = "1mqkjdn3hr3ihjai9qpcfrbn318pkddnlkck96v8byfmil6d4dph";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley formatting http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page formatting optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -146861,6 +148509,8 @@ self: {
        pname = "multiplate";
        version = "0.0.3";
        sha256 = "1gsfmw7dzsxycixqqrh5wr1g3izn7rm2a4a20nh8pp6fgn21c01c";
+       revision = "1";
+       editedCabalFile = "0cka6nwvbiddlv2j4f7jqq4cxz5mfw7vga5p020h0m9ws98gqbsx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Multiplate";
@@ -147702,8 +149352,8 @@ self: {
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
-       version = "2.0.2";
-       sha256 = "1v2k0vpz33xmf58dhidwnjjvhkczfqizlcgwalf1vk19sw1ls3x5";
+       version = "2.0.3";
+       sha256 = "18gnr5bjmz2bl717dhvg6hwj6z06y5sw2nmsw7d3vl37qd9rp6by";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
@@ -148356,39 +150006,40 @@ self: {
      }) {};
 
   "nakadi-client" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
-     , classy-prelude, conduit, conduit-combinators, conduit-extra
-     , containers, exceptions, fast-logger, hashable, http-client
-     , http-client-tls, http-conduit, http-types, iso8601-time, lens
-     , lens-aeson, lifted-async, monad-control, monad-logger, mtl
-     , random, resourcet, retry, safe-exceptions, say, scientific, split
-     , stm, stm-chans, stm-conduit, tasty, tasty-hunit, template-haskell
-     , text, time, transformers, transformers-base, unliftio
-     , unliftio-core, unordered-containers, uuid, vector, wai, warp
+    ({ mkDerivation, aeson, aeson-casing, async, async-timer, base
+     , bytestring, classy-prelude, conduit, conduit-extra, containers
+     , exceptions, fast-logger, hashable, http-client, http-client-tls
+     , http-conduit, http-types, iso8601-time, lens, lens-aeson
+     , lifted-async, monad-control, monad-logger, mtl, random, resourcet
+     , retry, safe-exceptions, say, scientific, split, stm, stm-chans
+     , stm-conduit, tasty, tasty-hunit, template-haskell, text, time
+     , transformers, transformers-base, unliftio, unliftio-core
+     , unordered-containers, uuid, vector, wai, warp
      }:
      mkDerivation {
        pname = "nakadi-client";
-       version = "0.5.0.3";
-       sha256 = "0c0jrvvlk3mxwka6b1996gylgkhqqh023wc4vxg98qaaxpy851x4";
+       version = "0.5.1.0";
+       sha256 = "1g8jddskklbcirgb35b71lbgkm492rfhbx50kipi5wrnh0r4zh67";
        libraryHaskellDepends = [
-         aeson aeson-casing base bytestring conduit conduit-combinators
+         aeson aeson-casing async-timer base bytestring conduit
          conduit-extra containers exceptions hashable http-client
          http-client-tls http-conduit http-types iso8601-time lens
          monad-control monad-logger mtl resourcet retry safe-exceptions
-         scientific split template-haskell text time transformers
-         transformers-base unliftio-core unordered-containers uuid vector
+         scientific split stm template-haskell text time transformers
+         transformers-base unliftio unliftio-core unordered-containers uuid
+         vector
        ];
        testHaskellDepends = [
-         aeson aeson-casing async base bytestring classy-prelude conduit
-         conduit-combinators conduit-extra containers exceptions fast-logger
-         hashable http-client http-client-tls http-conduit http-types
-         iso8601-time lens lens-aeson lifted-async monad-control
-         monad-logger mtl random resourcet retry safe-exceptions say
-         scientific split stm stm-chans stm-conduit tasty tasty-hunit
-         template-haskell text time transformers transformers-base unliftio
-         unliftio-core unordered-containers uuid vector wai warp
+         aeson aeson-casing async async-timer base bytestring classy-prelude
+         conduit conduit-extra containers exceptions fast-logger hashable
+         http-client http-client-tls http-conduit http-types iso8601-time
+         lens lens-aeson lifted-async monad-control monad-logger mtl random
+         resourcet retry safe-exceptions say scientific split stm stm-chans
+         stm-conduit tasty tasty-hunit template-haskell text time
+         transformers transformers-base unliftio unliftio-core
+         unordered-containers uuid vector wai warp
        ];
-       homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
+       homepage = "http://nakadi-client.haskell.silverratio.net";
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148932,8 +150583,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "4";
-       editedCabalFile = "1zppa1fcc7pl7ak0hs3w3pkx34398nrfiiwa3w689ib08kqkdpby";
+       revision = "5";
+       editedCabalFile = "1wlmkq9k9aym4wig9rn5w6sygq2fg9kd02d18pfzgxw70icqjlq3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -150533,6 +152184,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-simple_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "network-simple";
+       version = "0.4.1";
+       sha256 = "07cvvgbp8cbwh1x7ii326d97hfmqwiyiqhkg8dqypzwzfwb3mgkj";
+       libraryHaskellDepends = [
+         base bytestring exceptions network transformers
+       ];
+       homepage = "https://github.com/k0001/network-simple";
+       description = "Simple network sockets usage patterns";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-simple-sockaddr" = callPackage
     ({ mkDerivation, base, bytestring, directory, exceptions, network
      , transformers
@@ -150551,16 +152219,17 @@ self: {
      }) {};
 
   "network-simple-tls" = callPackage
-    ({ mkDerivation, base, bytestring, certificate, cprng-aes
-     , exceptions, network, network-simple, tls, tls-extra, transformers
+    ({ mkDerivation, base, bytestring, data-default, exceptions
+     , network, network-simple, tls, transformers, x509, x509-store
+     , x509-system, x509-validation
      }:
      mkDerivation {
        pname = "network-simple-tls";
-       version = "0.2.1";
-       sha256 = "0hbpxbs357bxifksbqrlrdkwkkfaydxcf9wdla6kafaymhrxhc0k";
+       version = "0.3";
+       sha256 = "11s5r7vibba7pmmbnglx1w2v5wxykxrzwkrwy4hifxzpbb2gybdw";
        libraryHaskellDepends = [
-         base bytestring certificate cprng-aes exceptions network
-         network-simple tls tls-extra transformers
+         base bytestring data-default exceptions network network-simple tls
+         transformers x509 x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/k0001/network-simple-tls";
        description = "Simple interface to TLS secured network sockets";
@@ -152154,6 +153823,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "normalize" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers, lens
+     , optparse-generic, statistics, text, vector
+     }:
+     mkDerivation {
+       pname = "normalize";
+       version = "0.3.0.1";
+       sha256 = "1wx7jfbc5s1zpksyq1vhb3460gll1fl6lkdbp3349rxifz0l27dq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cassava containers lens statistics text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers optparse-generic text vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/normalize#readme";
+       description = "Normalize data using a variety of methods";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "normalize-imports" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
@@ -152620,6 +154310,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numbers_3000_2_0_2" = callPackage
+    ({ mkDerivation, base, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "numbers";
+       version = "3000.2.0.2";
+       sha256 = "0xssrf7lbyplkgnbfw1jqkib3w9wgn1d6n85pk86nx63j05y9kph";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/jwiegley/numbers#readme";
+       description = "Various number types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numerals" = callPackage
     ({ mkDerivation, base, containers, criterion, fingertree, HUnit
      , integer-gmp, QuickCheck, test-framework, test-framework-hunit
@@ -152872,8 +154580,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-histogram";
-       version = "0.1.1.0";
-       sha256 = "18xnkwmf7bwnj2ldj20afg38ykpzdnpg773pgj9af9yzk40vpd28";
+       version = "0.1.2.0";
+       sha256 = "03zq5qg9m5yndllc1gs5f7848j37dysb94zkh6pc465ascskl7d9";
        libraryHaskellDepends = [
          base containers foldl numhask-prelude numhask-range tdigest
        ];
@@ -152921,14 +154629,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_2_1_0" = callPackage
+  "numhask-range_0_2_2_0" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
      , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.2.1.0";
-       sha256 = "1i6kpx0jdr0q2lp19m0aqfd73wsi1dm6qhl1w9x8wp4px12j4caz";
+       version = "0.2.2.0";
+       sha256 = "1wrh8s6nknw6jkbl91iym7cvy1g1qmccikfbr1qhc4gzylkf5m4v";
        libraryHaskellDepends = [
          adjunctions base distributive numhask-prelude protolude QuickCheck
          semigroupoids
@@ -153014,8 +154722,8 @@ self: {
      }:
      mkDerivation {
        pname = "nuxeo";
-       version = "0.2.0.1";
-       sha256 = "046vwj0p53pzrdmni08gqyzrr0mhz8qrf5zn09plgzjadq3yp2p2";
+       version = "0.2.0.3";
+       sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd";
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra text time
        ];
@@ -154296,6 +156004,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_6_7000_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, contravariant, dotenv, hspec
+     , hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, scientific
+     , semigroups, text, time, time-locale-compat, transformers, uuid
+     , void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.6.7000.0";
+       sha256 = "11wj57k7fswln9is47r09yj7h60hbqa6x0lnh6cg2bmg9ynnvmxk";
+       revision = "1";
+       editedCabalFile = "1g2asrmd4aaw61dcprs9mih1j065q9xipnrhkxablqwcpr8pzz21";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors scientific semigroups text time time-locale-compat
+         transformers uuid void
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant dotenv hspec hspec-discover
+         multiset postgresql-simple product-profunctors profunctors
+         QuickCheck semigroups text time transformers
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -156099,8 +157838,8 @@ self: {
        pname = "ottparse-pretty";
        version = "0.1.2.6";
        sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5";
-       revision = "1";
-       editedCabalFile = "0c6m005ddrdmh8yrnhar5ams2clcbgdmhfrnlvvyppgqprvb3z9z";
+       revision = "2";
+       editedCabalFile = "05fxdr12vwf486609f8ld6d3cgpr632402n404gi8hgxj5ijc6yx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -156763,7 +158502,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_2" = callPackage
+  "pandoc_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , Cabal, case-insensitive, cmark-gfm, containers, criterion
@@ -156778,8 +158517,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.2";
-       sha256 = "0sc51sw7g9jni9jamj7rcdn9fqf5476gzp7cahhkjj29xak88a8g";
+       version = "2.2.1";
+       sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -160315,6 +162054,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "permutations" = callPackage
+    ({ mkDerivation, alg, base, base-unicode-symbols, Fin
+     , natural-induction, peano, smallcheck, tasty, tasty-smallcheck
+     , universe-base, util
+     }:
+     mkDerivation {
+       pname = "permutations";
+       version = "0.1.0.0";
+       sha256 = "0dx4xx4g35r2qq4al431l5s1664psf95pf0nf6y59c1i1km5qpq4";
+       libraryHaskellDepends = [
+         alg base base-unicode-symbols Fin natural-induction peano
+         universe-base util
+       ];
+       testHaskellDepends = [
+         alg base Fin natural-induction peano smallcheck tasty
+         tasty-smallcheck universe-base
+       ];
+       description = "Permutations of finite sets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "permute" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -161973,6 +163733,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pinboard_0_9_12_10" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , http-client, http-client-tls, http-types, monad-logger, mtl
+     , network, profunctors, QuickCheck, random, safe-exceptions
+     , semigroups, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "pinboard";
+       version = "0.9.12.10";
+       sha256 = "0jdhckdlpmgqrp8xy7m285w7kclg8dpl02szl6fd6iwzs8l8vjds";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-client http-client-tls
+         http-types monad-logger mtl network profunctors random
+         safe-exceptions text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec mtl QuickCheck
+         safe-exceptions semigroups text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/jonschoning/pinboard";
+       description = "Access to the Pinboard API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
@@ -162605,6 +164392,8 @@ self: {
        pname = "pipes-files";
        version = "0.1.2";
        sha256 = "0ca53bgb15i6bjyp2dxnb1lbkzcbjdkrznnh2bwj0l4jk04pcxkw";
+       revision = "1";
+       editedCabalFile = "0bg0ji5w17kx8qnba0aisvyf6md5qf5846gy9kdh8k3vh410sc2r";
        libraryHaskellDepends = [
          attoparsec base bytestring directory exceptions filepath free
          hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
@@ -162857,6 +164646,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-network_0_6_5" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, network
+     , network-simple, pipes, pipes-safe, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-network";
+       version = "0.6.5";
+       sha256 = "15f7kn9vpzsm8s108cly80pi6yqpv6v04w032ng0wr9g78an393l";
+       libraryHaskellDepends = [
+         base bytestring exceptions network network-simple pipes pipes-safe
+         transformers
+       ];
+       homepage = "https://github.com/k0001/pipes-network";
+       description = "Use network sockets together with the pipes library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-network-tls" = callPackage
     ({ mkDerivation, base, bytestring, network, network-simple
      , network-simple-tls, pipes, pipes-network, pipes-safe, tls
@@ -162864,8 +164671,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-network-tls";
-       version = "0.2.1";
-       sha256 = "0k3w13s3vasd85mapa594xhi31mhdwqycxqnadidqy24q5s6zdhc";
+       version = "0.3";
+       sha256 = "1cmsnvgr3ffjxqn7bwj0ghqsxqd4hnhfdn4di6p8q6np2mmllsd2";
        libraryHaskellDepends = [
          base bytestring network network-simple network-simple-tls pipes
          pipes-network pipes-safe tls transformers
@@ -163102,8 +164909,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.4.3.2";
-       sha256 = "0q4xc2r0yzyj6gpg16z9scdxm0a3fjzsm1r6qihkr2zks9sac36x";
+       version = "0.4.4.0";
+       sha256 = "181zzyyzy7p13zgiprfacvzn8b00xw36bv3l4ishwbac8yxg15cl";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free microlens pipes
          pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -163275,22 +165082,24 @@ self: {
      }) {};
 
   "pivotal-tracker" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, either, servant
-     , servant-client, text, time, transformers
+    ({ mkDerivation, aeson, aeson-casing, base, either, hspec
+     , http-client, http-client-tls, mtl, servant, servant-client, text
+     , time, transformers
      }:
      mkDerivation {
        pname = "pivotal-tracker";
-       version = "0.1.0.1";
-       sha256 = "0ipzlzrzvwgzg1k3wkgy0bgf0k1kalf4swln24zfbjrp6lnnss79";
+       version = "0.2.0.0";
+       sha256 = "1sc95mbf3cxjy9kxaqr3xgrgvmr6wghh69i4qqkil2grghvw90am";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-casing base servant servant-client text time
-         transformers
+         aeson aeson-casing base http-client http-client-tls mtl servant
+         servant-client text time transformers
        ];
        executableHaskellDepends = [
          base either servant text transformers
        ];
+       testHaskellDepends = [ base hspec ];
        description = "A library and a CLI tool for accessing Pivotal Tracker API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163484,8 +165293,8 @@ self: {
      }:
      mkDerivation {
        pname = "planb-token-introspection";
-       version = "0.1.2.0";
-       sha256 = "09b54m2m90g8ci6sxsgayvfxd9gmkwp2xw16gk1afxnha39lzwlq";
+       version = "0.1.3.0";
+       sha256 = "1n7ck623ik3rss5vhby9wz8q5r1kfww678d3yiqkx7pg5fn4rwmk";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers http-client
          http-client-tls http-types mtl safe-exceptions text transformers
@@ -163789,18 +165598,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_3_3_2" = callPackage
-    ({ mkDerivation, base, blaze-svg, colour, containers
-     , data-default-class, hspec, mtl, QuickCheck, scientific, text
-     , time
+  "plot-light_0_4_3" = callPackage
+    ({ mkDerivation, base, blaze-markup, blaze-svg, colour, containers
+     , exceptions, histogram-fill, hspec, mtl, QuickCheck, scientific
+     , text, time, vector
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.3.3.2";
-       sha256 = "0im5rw52aim1zspisdar87gyn1ar4dkk52ipcq0s41pcycbwib12";
+       version = "0.4.3";
+       sha256 = "1fwz74a2fh7rgxv7i9kz6izxl1zrpa8bml2dxph7w7hdz1pi3g5b";
        libraryHaskellDepends = [
-         base blaze-svg colour containers data-default-class mtl scientific
-         text time
+         base blaze-markup blaze-svg colour containers exceptions
+         histogram-fill mtl scientific text time vector
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/ocramz/plot-light";
@@ -163815,8 +165624,8 @@ self: {
      }:
      mkDerivation {
        pname = "plot-light-examples";
-       version = "0.2.0.0";
-       sha256 = "0sw7hxp96s8sbaghs3lzl856q72y0gxn58px0wd4568fdbvgd6vl";
+       version = "0.3.0.0";
+       sha256 = "0jw4ysfkshvw8r2xfy76997rz5072b5bhm9rca8pcc77fqifhavv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -165402,6 +167211,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-binary_0_12_1_1" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, bytestring-strict-builder, containers, conversion
+     , conversion-bytestring, conversion-text, criterion, json-ast
+     , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
+     , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.12.1.1";
+       sha256 = "181npyfnz9xbmwjfzcrmbwlzw2xchy2fsibiw6d3c01y45xv607v";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring
+         bytestring-strict-builder containers loch-th network-ip
+         placeholders scientific text time transformers unordered-containers
+         uuid vector
+       ];
+       testHaskellDepends = [
+         aeson conversion conversion-bytestring conversion-text json-ast
+         loch-th network-ip placeholders postgresql-libpq QuickCheck
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -168671,6 +170511,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pronounce" = callPackage
+    ({ mkDerivation, base, binary, containers, filepath, mtl, text }:
+     mkDerivation {
+       pname = "pronounce";
+       version = "1.1.0.2";
+       sha256 = "0nhns8pnp9n88w5514dgb9kwfkd1fqx042z4p8ai1yf5q1igygw5";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary containers filepath mtl text
+       ];
+       homepage = "https://github.com/buonuomo/Text.Pronounce";
+       description = "A library for interfacing with the CMU Pronouncing Dictionary";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proof-combinators" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -168707,8 +170562,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.3.5";
-       sha256 = "0x6whnn53grfkjqybn91kfsr69w3r9mk9r39yzwx35skwkqj3vb9";
+       version = "5.4.0";
+       sha256 = "1ykzagmw2an1aglkglkpkqv65mxaqqfj7zia27f6npnihb6hwi5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169257,6 +171112,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proxy" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "proxy";
+       version = "0.1.0.0";
+       sha256 = "1465mvkdq9cv202sj2hiwa8a2a07906dww2msan235fvkrnhj9jz";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/chessai/proxy.git";
+       description = "proxy helpers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "proxy-kindness" = callPackage
     ({ mkDerivation, base, tagged }:
      mkDerivation {
@@ -169497,14 +171364,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20180426" = callPackage
+  "publicsuffix_0_20180513" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20180426";
-       sha256 = "0pfxsh2ds3dwm6mq6g85vhq8rdgc93bn84pq1b4lk3sf71sqs2ii";
+       version = "0.20180513";
+       sha256 = "0wq9hz1z924a5pk17zyaf9nyz5z5fyrlf806rypdxnpvi4q1j7xm";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
@@ -169901,8 +171768,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.6.2";
-       sha256 = "022ciqcsw39wi4r577q92s9awjwkc2da61ljqi8n5qsal83vhayh";
+       version = "0.6.3";
+       sha256 = "1bsbpzywbh33kp2l7p80g8pnh66fd76sii4900f80x1yjig03gb8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -170741,8 +172608,8 @@ self: {
      }:
      mkDerivation {
        pname = "qnap-decrypt";
-       version = "0.3.1";
-       sha256 = "1ns5wz427ilw7xn886sw7ip9d1nbfqbs1qcgjm9cvdi5v5v89pi6";
+       version = "0.3.2";
+       sha256 = "1qq1cpnn7bg3nb3ig86wcc6xvjyljckjd1bgivh1sfhxh8p0p4ys";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -171818,18 +173685,17 @@ self: {
 
   "quickspec" = callPackage
     ({ mkDerivation, base, constraints, containers, data-lens-light
-     , dlist, QuickCheck, random, reflection, template-haskell
-     , transformers, twee-lib, uglymemo
+     , dlist, QuickCheck, quickcheck-instances, random, spoon
+     , template-haskell, transformers, twee-lib, uglymemo
      }:
      mkDerivation {
        pname = "quickspec";
-       version = "2";
-       sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r";
-       revision = "1";
-       editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb";
+       version = "2.1";
+       sha256 = "0xzb442pjm26khdp46vjkzza1gyb01jzhghv3hxff2pwjs3jjsyy";
        libraryHaskellDepends = [
-         base constraints containers data-lens-light dlist QuickCheck random
-         reflection template-haskell transformers twee-lib uglymemo
+         base constraints containers data-lens-light dlist QuickCheck
+         quickcheck-instances random spoon template-haskell transformers
+         twee-lib uglymemo
        ];
        homepage = "https://github.com/nick8325/quickspec";
        description = "Equational laws for free!";
@@ -172537,8 +174403,8 @@ self: {
      }:
      mkDerivation {
        pname = "rakuten";
-       version = "0.1.1.1";
-       sha256 = "01p6f8vapygcw6viwq7kkg6b5fifqzbkski0763x9by49h5gpbsi";
+       version = "0.1.1.2";
+       sha256 = "153801dij5i5byf151xf39anz005i3w7xmmkk434xr6zxc8jm604";
        libraryHaskellDepends = [
          aeson base bytestring connection constraints data-default-class
          extensible http-api-data http-client http-client-tls http-types
@@ -172554,6 +174420,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rakuten_0_1_1_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, constraints
+     , data-default-class, extensible, hspec, http-api-data, http-client
+     , http-client-tls, http-types, lens, req, servant-server, text
+     , warp
+     }:
+     mkDerivation {
+       pname = "rakuten";
+       version = "0.1.1.3";
+       sha256 = "1c578rmjrb8x26c9b0fraz2l6a7d01wky8arzwa1kigfgw9ihqxh";
+       libraryHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible http-api-data http-client http-client-tls http-types
+         lens req text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible hspec http-api-data http-client http-client-tls
+         http-types lens req servant-server text warp
+       ];
+       homepage = "https://github.com/matsubara0507/rakuten#readme";
+       description = "The Rakuten API in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ralist" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hspec }:
      mkDerivation {
@@ -173026,6 +174918,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "range-set-list_0_1_2_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "range-set-list";
+       version = "0.1.2.1";
+       sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw";
+       libraryHaskellDepends = [ base containers deepseq hashable ];
+       testHaskellDepends = [
+         base containers deepseq hashable tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/phadej/range-set-list#readme";
+       description = "Memory efficient sets with ranges of elements";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "range-space" = callPackage
     ({ mkDerivation, base, QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2, time, vector-space
@@ -174581,8 +176491,8 @@ self: {
     ({ mkDerivation, base, HTTP, network, network-uri, xhtml }:
      mkDerivation {
        pname = "recaptcha";
-       version = "0.1.0.3";
-       sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
+       version = "0.1.0.4";
+       sha256 = "03a3f34lcd387112pfa931wwna58av5yv4jvx4nl0zkryp1p4qd2";
        libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        homepage = "http://github.com/jgm/recaptcha/tree/master";
        description = "Functions for using the reCAPTCHA service in web applications";
@@ -174628,8 +176538,8 @@ self: {
     ({ mkDerivation, base, extra, filepath }:
      mkDerivation {
        pname = "record-dot-preprocessor";
-       version = "0.1";
-       sha256 = "1py5bkwxwwq1jjsa16rmjm92hxnil0clim5579h5mizzq47fczrd";
+       version = "0.1.1";
+       sha256 = "1lb60mggn6f350l3v54cavvwnyx5hrm6hlyrfhsjb5gq5qmids9m";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base extra filepath ];
@@ -174865,12 +176775,12 @@ self: {
     ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
      , data-default-class, free, hspec, http-client, http-client-tls
      , http-types, network, text, time, transformers
-     , unordered-containers, vector
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "reddit";
-       version = "0.2.2.2";
-       sha256 = "0k94rsnrnanjc7bwqfjzlk8l005gc3141mm8iqq680d8pdcgf8m8";
+       version = "0.2.3.0";
+       sha256 = "1hm1ax5h3p0avk4v3w08gac8mfiav8k9vd1vbkn77xlhxamp8jfi";
        libraryHaskellDepends = [
          aeson api-builder base bytestring data-default-class free
          http-client http-client-tls http-types network text time
@@ -174878,9 +176788,9 @@ self: {
        ];
        testHaskellDepends = [
          aeson api-builder base bytestring Cabal data-default-class hspec
-         http-client http-client-tls text time transformers
+         http-client http-client-tls text time transformers yaml
        ];
-       homepage = "https://github.com/intolerable/reddit";
+       homepage = "https://github.com/intolerable/reddit#readme";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178394,6 +180304,8 @@ self: {
        pname = "rethinkdb-client-driver";
        version = "0.0.25";
        sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
+       revision = "1";
+       editedCabalFile = "1hblwarlxjxq2lp52bjlqwdjsqlwm8ffqi2pj1n8zpidjv6m8330";
        libraryHaskellDepends = [
          aeson base binary bytestring containers hashable mtl network
          old-locale scientific stm template-haskell text time
@@ -181986,7 +183898,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_7_7" = callPackage
+  "sbv_7_8" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
@@ -181995,8 +183907,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.7";
-       sha256 = "0yf68qyp29kxgpdx5xdyx64vkn0dvfrizn5hq2xgrik0v9vb1ja0";
+       version = "7.8";
+       sha256 = "12k47j4xv08dl61qfz2g3dla8rwsx6s7yy5mfnv21c5d2x2bxk6i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -182616,30 +184528,6 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.6.0";
-       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq hashable integer-gmp
-         integer-logarithms primitive text
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_6_2" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "scientific";
        version = "0.3.6.2";
        sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397";
        libraryHaskellDepends = [
@@ -182654,7 +184542,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -183357,6 +185244,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sdl2-fps" = callPackage
+    ({ mkDerivation, base, sdl2 }:
+     mkDerivation {
+       pname = "sdl2-fps";
+       version = "0.0.1";
+       sha256 = "0ci8p6qgs9nmpbypvk75ybz5kh36iiqaz4xl4lr2dbaq0y2d6iri";
+       libraryHaskellDepends = [ base sdl2 ];
+       homepage = "https://github.com/jxv/sdl2-fps#readme";
+       description = "Run of the mill, frames per second timer implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sdl2-gfx" = callPackage
     ({ mkDerivation, base, bytestring, lifted-base, linear
      , monad-control, SDL2, sdl2, SDL2_gfx, template-haskell, text
@@ -183419,6 +185318,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2_mixer;};
 
+  "sdl2-sprite" = callPackage
+    ({ mkDerivation, base, optparse-simple, sdl2, sdl2-image, split
+     , text
+     }:
+     mkDerivation {
+       pname = "sdl2-sprite";
+       version = "0.0.1";
+       sha256 = "12xlq32sjvz064fll14ymbxbk52akcp24dm5vfa1x0s41z0x6fnq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base sdl2 sdl2-image ];
+       executableHaskellDepends = [
+         base optparse-simple sdl2 sdl2-image split text
+       ];
+       homepage = "https://github.com/chrisdone/sdl2-sprite#readme";
+       description = "Sprite previewer/animator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
      , template-haskell, text, transformers
@@ -183983,6 +185901,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "self-extract" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
+     , path, path-io, process, unix-compat
+     }:
+     mkDerivation {
+       pname = "self-extract";
+       version = "0.2.0.0";
+       sha256 = "1p1z4zy7s7j4sxx45lcspxvxf10v6vx80vgrw52acgbqnfairg7c";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal extra file-embed path path-io process
+         unix-compat
+       ];
+       description = "A Haskell library to make self-extracting executables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "selfrestart" = callPackage
     ({ mkDerivation, base, directory, executable-path, unix }:
      mkDerivation {
@@ -184961,8 +186895,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-aeson-specs";
-       version = "0.6.1.0";
-       sha256 = "0246bdrcy0rq0jyba2c945hlz8csaff9zakv0g5qpzylsc5dnwmd";
+       version = "0.6.2.0";
+       sha256 = "0q8xihvhzjycvwm8da69zg20fa6jynid0milgdbbsnicwh59cn86";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath hspec
          hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random
@@ -185791,8 +187725,8 @@ self: {
        pname = "servant-iCalendar";
        version = "0.1.0.1";
        sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
-       revision = "1";
-       editedCabalFile = "07jib9s2kg6srr1dj3l1bz0sp3fyikkvv7z0v2a62zl1c9z9xapx";
+       revision = "2";
+       editedCabalFile = "0c4d69rm08hpzlagl22qnnq9y85bp3zwix5h2hazr1m4na09hj1l";
        libraryHaskellDepends = [
          base data-default http-media iCalendar servant
        ];
@@ -185855,8 +187789,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.0";
-       sha256 = "14z1vf4mj041ydps7nyfs0bmdpq0vb18xfscsq3i1f5hfr9swj50";
+       version = "0.1.1.1";
+       sha256 = "1spd6phk4n5llgbmydbdqyhlyx6bxr5rhx0rp2z4pnn1kn2qa3ry";
        libraryHaskellDepends = [
          base containers directory formatting lens servant servant-foreign
          text time wl-pprint-text
@@ -186180,27 +188114,27 @@ self: {
      }) {};
 
   "servant-quickcheck" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
-     , case-insensitive, clock, data-default-class, hspec, hspec-core
-     , hspec-discover, http-client, http-media, http-types, mtl, pretty
-     , process, QuickCheck, quickcheck-io, servant, servant-blaze
-     , servant-client, servant-server, split, string-conversions
-     , temporary, text, time, transformers, warp
+    ({ mkDerivation, aeson, base, base-compat-batteries, blaze-html
+     , bytestring, case-insensitive, clock, data-default-class, hspec
+     , hspec-core, hspec-discover, http-client, http-media, http-types
+     , mtl, pretty, process, QuickCheck, quickcheck-io, servant
+     , servant-blaze, servant-client, servant-server, split
+     , string-conversions, temporary, text, time, transformers, warp
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.7.0";
-       sha256 = "1a0ipg1zds393ywjb1f5yphb23ccb39gv8rc6qv5b7y523cgwri2";
+       version = "0.0.7.2";
+       sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
        libraryHaskellDepends = [
-         aeson base base-compat bytestring case-insensitive clock
+         aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
          pretty process QuickCheck servant servant-client servant-server
          split string-conversions temporary text time warp
        ];
        testHaskellDepends = [
-         aeson base base-compat blaze-html bytestring hspec hspec-core
-         http-client QuickCheck quickcheck-io servant servant-blaze
-         servant-client servant-server text transformers warp
+         aeson base base-compat-batteries blaze-html bytestring hspec
+         hspec-core http-client QuickCheck quickcheck-io servant
+         servant-blaze servant-client servant-server text transformers warp
        ];
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
@@ -186546,6 +188480,8 @@ self: {
        pname = "servant-swagger-ui-core";
        version = "0.3";
        sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd";
+       revision = "1";
+       editedCabalFile = "1dh2ra39x2syzg4lw1cklr7hgr52gp72f4iy5zw4zwgy27hbq48v";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -186669,8 +188605,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "18";
-       editedCabalFile = "038paj9z77rx6jc06vg5f4f9gvwaq73ggw7ppgrw6vwhsl4nd84q";
+       revision = "19";
+       editedCabalFile = "1hlfly2j0c3c4sbzbkbzvwgvfnngkmx0r67ddv4ccg2if6pc5nqv";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -187702,15 +189638,16 @@ self: {
 
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, lens, shake, shake-ext, text
+     , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext
+     , text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.4";
-       sha256 = "036clj4q6rwgzjc3abirir5yqrn78vnj7c5w8p9b82jkrlka8w6g";
+       version = "1.8.0.5";
+       sha256 = "0hznrllvlw3ypd3ljlx6wlr3d7hkm8g2mrwpfscgvf4hk0lyj1hd";
        libraryHaskellDepends = [
-         base binary dependency directory hashable hs2ats language-ats lens
-         shake shake-ext text
+         base binary dependency directory hashable hs2ats language-ats
+         microlens microlens-th shake shake-ext text
        ];
        homepage = "https://github.com/vmchale/shake-ats#readme";
        description = "Utilities for building ATS projects with shake";
@@ -188074,6 +190011,78 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shapes" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , either, ghc-prim, hspec, lens, linear, mtl, QuickCheck
+     , shapes-math, transformers, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "shapes";
+       version = "0.1.0.0";
+       sha256 = "0kfhw97y5a0vs75w0as6jwm0zxlkwkxar2a0afqrxlcplgwxvnpi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers deepseq either ghc-prim lens linear mtl
+         shapes-math transformers vector vector-th-unbox
+       ];
+       executableHaskellDepends = [
+         array base containers criterion deepseq either ghc-prim lens linear
+         mtl shapes-math transformers vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         array base containers deepseq either ghc-prim hspec lens linear mtl
+         QuickCheck shapes-math transformers vector vector-th-unbox
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "physics engine and other tools for 2D shapes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shapes-demo" = callPackage
+    ({ mkDerivation, array, base, containers, either, ghc-prim, lens
+     , linear, monad-extras, mtl, sdl2, shapes, StateVar, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "shapes-demo";
+       version = "0.1.0.0";
+       sha256 = "0ks0wnp2g1fdqwka03rw71dkpxvb89fvilx2avrxsh2cg1g1lari";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base containers either ghc-prim lens linear monad-extras mtl
+         sdl2 shapes StateVar text transformers vector
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "demos for the 'shapes' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shapes-math" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, hspec, linear
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "shapes-math";
+       version = "0.1.0.0";
+       sha256 = "13i5njr93kcwgra8wcj0hvj50ksqrcs2d4y7xb2hhj06c7r3w0xz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc-prim QuickCheck template-haskell
+       ];
+       executableHaskellDepends = [
+         base criterion ghc-prim linear QuickCheck template-haskell
+       ];
+       testHaskellDepends = [
+         base ghc-prim hspec linear QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "faster vector/matrix math using unboxed numbers and Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sharc-timbre" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -188394,6 +190403,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_8_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+     , system-fileio, system-filepath, text, time, transformers
+     , transformers-base, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.8.0";
+       sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath hspec hspec-contrib HUnit lifted-async
+         lifted-base monad-control mtl process system-fileio system-filepath
+         text time transformers transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -189409,6 +191449,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-log_0_9_4" = callPackage
+    ({ mkDerivation, async, base, base-unicode-symbols, containers
+     , data-default, deepseq, directory, exceptions, filepath, hformat
+     , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "simple-log";
+       version = "0.9.4";
+       sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi";
+       libraryHaskellDepends = [
+         async base base-unicode-symbols containers data-default deepseq
+         directory exceptions filepath hformat microlens microlens-platform
+         mmorph mtl SafeSemaphore text time transformers
+       ];
+       testHaskellDepends = [ base hspec microlens-platform text ];
+       homepage = "http://github.com/mvoidex/simple-log";
+       description = "Simple log for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-log-syslog" = callPackage
     ({ mkDerivation, base, hsyslog, simple-log, text }:
      mkDerivation {
@@ -189819,8 +191881,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4.0.2";
-       sha256 = "0zqy3ffndyvz97wfs0ha0d5j6045gfdh0p6rmz6dv87j9mqmfpl0";
+       version = "0.4.0.6";
+       sha256 = "1ijwh5xsqiaykm8y39jz4vnzvcbdq2za77ahkb6l7nqfc5ryv5z1";
        libraryHaskellDepends = [ base QuickCheck vector ];
        testHaskellDepends = [
          base doctest doctest-driver-gen tasty tasty-quickcheck
@@ -190368,10 +192430,8 @@ self: {
      }:
      mkDerivation {
        pname = "size-based";
-       version = "0.1.0.0";
-       sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx";
-       revision = "2";
-       editedCabalFile = "1p4iglrrl5s47cxn520saiszw5wwr4x1kn9xbgn7awz29mv7pmd2";
+       version = "0.1.1.0";
+       sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki";
        libraryHaskellDepends = [
          base dictionary-sharing template-haskell testing-type-modifiers
        ];
@@ -190406,8 +192466,8 @@ self: {
      }:
      mkDerivation {
        pname = "sized-grid";
-       version = "0.1.0.0";
-       sha256 = "1dj5sgmr8114i5ldpdmybwbwg5gkbm30kbk2196pq65jjcvjinxx";
+       version = "0.1.1.0";
+       sha256 = "0qbn160pq5yz1916iir1s9hy1h4pkar8z50gh7i8v7j4nwhgiisk";
        libraryHaskellDepends = [
          adjunctions aeson base comonad constraints distributive
          generics-sop lens mtl random vector vector-space
@@ -190889,8 +192949,8 @@ self: {
      }:
      mkDerivation {
        pname = "slate";
-       version = "0.10.0.0";
-       sha256 = "0f21bmv0dckdim27mm5m7vphci45h6fjbxyzpahai2nlydilhnc6";
+       version = "0.11.0.0";
+       sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191140,6 +193200,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck_1_1_4" = callPackage
+    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
+     mkDerivation {
+       pname = "smallcheck";
+       version = "1.1.4";
+       sha256 = "0x2p9rfsx0hvcmsq7v1m5qdgs9mvf4zrcpz4wywn4q8mr8hb416y";
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
+       homepage = "https://github.com/feuerbach/smallcheck";
+       description = "A property-based testing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallcheck-laws" = callPackage
     ({ mkDerivation, base, smallcheck, smallcheck-series }:
      mkDerivation {
@@ -194102,8 +196175,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.1.6";
-       sha256 = "10kj0ir2i72q20jbp39n5v700pivbapkyvarql9hg5sci9s73g4s";
+       version = "0.0.2.0";
+       sha256 = "061bjgrvvvv2n6bhn0lz6sd5c7mc63nb2b83rbpgdx3am68mk9gf";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
@@ -194822,6 +196895,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "splitmix_0_0_1" = callPackage
+    ({ mkDerivation, async, base, base-compat-batteries, bytestring
+     , containers, criterion, deepseq, process, random, tf-random, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "splitmix";
+       version = "0.0.1";
+       sha256 = "0bvpx3hnyhz449s2c2mi5h78024yysnqldfwp7m0qr21m41q0v1a";
+       libraryHaskellDepends = [ base deepseq random time ];
+       testHaskellDepends = [
+         async base base-compat-batteries bytestring deepseq process random
+         tf-random vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion random tf-random
+       ];
+       description = "Fast Splittable PRNG";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "splitter" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, range }:
      mkDerivation {
@@ -195871,8 +197966,8 @@ self: {
        pname = "stack";
        version = "1.7.1";
        sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
-       revision = "1";
-       editedCabalFile = "12ym80mwlvg3zwbjhmby4k467hxa0yip0314w658ivn0sq6vgycw";
+       revision = "3";
+       editedCabalFile = "0ni953da0qiscnvbx70pd89myy2qq3chgkghmw6wg9xhzcz7nwgp";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -197135,14 +199230,14 @@ self: {
      }) {};
 
   "status-notifier-item" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dbus, filepath
-     , hslogger, lens, mtl, network, optparse-applicative, spool
-     , template-haskell, transformers, vector
+    ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
+     , filepath, hslogger, lens, mtl, network, optparse-applicative
+     , spool, template-haskell, transformers, vector
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.2.1.0";
-       sha256 = "1w81n87x70bqpskcp0nai9l8ry6hk518myn1cymi695x94vv9m6d";
+       version = "0.2.2.0";
+       sha256 = "19v7n1hv9ldrcv8h5wcv7lvshwzry0zm9qhvzspb5zvdawgy32zh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197150,7 +199245,7 @@ self: {
          spool template-haskell transformers vector
        ];
        executableHaskellDepends = [
-         base dbus hslogger optparse-applicative
+         base dbus dbus-hslogger hslogger optparse-applicative
        ];
        homepage = "https://github.com/IvanMalison/status-notifier-item#readme";
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
@@ -198095,15 +200190,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_21_0" = callPackage
+  "stratosphere_0_22_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.21.0";
-       sha256 = "14bahvq1yz51dwa6ljyj4l3aw3sv2njin00k01bvbizsqnbl8j8k";
+       version = "0.22.3";
+       sha256 = "1s6zc9d1kmgqicjk2d0mqqysg3jcva0d2fcygb2zxpdbiifrfz26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198333,6 +200428,8 @@ self: {
        pname = "streaming-attoparsec";
        version = "1.0.0";
        sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
+       revision = "1";
+       editedCabalFile = "0ssikp3ckvlgh9px4v6ppjlyi7ch319j0l3s9a5z07j6fg3j4wkp";
        libraryHaskellDepends = [
          attoparsec base bytestring streaming streaming-bytestring
        ];
@@ -198549,10 +200646,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-eversion";
-       version = "0.3.1.1";
-       sha256 = "13fsl7mckinymkvysmzcnc4vpyapdiwb2k57yhq15x5y6b6scxs2";
-       revision = "1";
-       editedCabalFile = "0abjya3b9fgnk9njyrf4hpar0ldji43m1d3mdh2ax5v54k81ishs";
+       version = "0.4.0.0";
+       sha256 = "19zaf8z13sdp0ri9y3p7izd29lik2x279kgj9v4sfzsslwr2wllc";
        libraryHaskellDepends = [
          base foldl pipes streaming transformers
        ];
@@ -198768,6 +200863,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly_0_2_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, deepseq
+     , exceptions, gauge, hspec, lifted-base, lockfree-queue
+     , monad-control, mtl, QuickCheck, random, stm, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.2.0";
+       sha256 = "1vbzyvmdzhjxpjd4pq4lkn6y0s2yxiziypp4vf9pvwmy1bq5dk0f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers exceptions lifted-base
+         lockfree-queue monad-control mtl stm transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck random transformers
+       ];
+       benchmarkHaskellDepends = [ base deepseq gauge random ];
+       homepage = "https://github.com/composewell/streamly";
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -199919,6 +202040,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "subsample" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers
+     , optparse-generic, random-fu, text, vector
+     }:
+     mkDerivation {
+       pname = "subsample";
+       version = "0.1.0.0";
+       sha256 = "1ahl7vjsg0by3q9zfkfqslvpq3p9v5754iippi2f5z8rax1s7di0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers random-fu text vector ];
+       executableHaskellDepends = [
+         base bytestring cassava containers optparse-generic text vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/subsample#readme";
+       description = "Subsample data";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "substring-parser" = callPackage
     ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace
      , QuickCheck, text
@@ -200560,14 +202700,12 @@ self: {
      }:
      mkDerivation {
        pname = "svg-builder";
-       version = "0.1.0.2";
-       sha256 = "0m7fpxh2viafcfm04xzy64jakx5c0p5wcam3bdwxgmj3r3q0qjc1";
-       revision = "1";
-       editedCabalFile = "1h3bzkimiydj5j2rh7cyp5bhphvy6hglpkidhlfwy520sqsw3zvx";
+       version = "0.1.1";
+       sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";
        libraryHaskellDepends = [
          base blaze-builder bytestring hashable text unordered-containers
        ];
-       homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
+       homepage = "https://github.com/diagrams/svg-builder.git";
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200748,8 +202886,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger-petstore";
-       version = "0.0.1.8";
-       sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7";
+       version = "0.0.2.0";
+       sha256 = "10sd2agpmj4iiza850w6klqh5jv873kfmvp5qimsqcfaxdwszc5i";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          deepseq exceptions http-api-data http-client http-client-tls
@@ -200761,8 +202899,8 @@ self: {
          aeson base bytestring containers hspec iso8601-time mtl QuickCheck
          semigroups text time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/swagger-api/swagger-codegen#readme";
-       description = "Auto-generated swagger-petstore API Client";
+       homepage = "https://openapi-generator.tech";
+       description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -203426,6 +205564,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_1_1_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+     , optparse-applicative, stm, tagged, unbounded-delays, unix
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "1.1.0.1";
+       sha256 = "09mbqjak66wynacddn399hh9dqcmgxg4gdn2492g538dj55lmjdw";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers mtl optparse-applicative
+         stm tagged unbounded-delays unix
+       ];
+       homepage = "https://github.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -203444,6 +205600,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-ant-xml_1_1_4" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+     , xml
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.1.4";
+       sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving ghc-prim mtl
+         stm tagged tasty transformers xml
+       ];
+       homepage = "http://github.com/ocharles/tasty-ant-xml";
+       description = "Render tasty output to XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-auto" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -203478,12 +205653,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_2_0_0" = callPackage
+  "tasty-dejafu_1_2_0_2" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.2.0.0";
-       sha256 = "0dhrcra1vzrw7xxnph28iz3c9pkmkhza0m9xjb9qxc75p2f684p3";
+       version = "1.2.0.2";
+       sha256 = "145w018mv8928g9bbp5pjwzciyfspxxqdg5grzq0mlpydkpmmgr5";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -203615,8 +205790,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
-       revision = "3";
-       editedCabalFile = "1r1sbcz12j9kmbdfr7mjc6z22c3737jc7mf0kdk1v6a3zr6n1js9";
+       revision = "4";
+       editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -203859,6 +206034,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-rerun_1_1_12" = callPackage
+    ({ mkDerivation, base, containers, mtl, optparse-applicative
+     , reducers, split, stm, tagged, tasty, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-rerun";
+       version = "1.1.12";
+       sha256 = "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8";
+       libraryHaskellDepends = [
+         base containers mtl optparse-applicative reducers split stm tagged
+         tasty transformers
+       ];
+       homepage = "http://github.com/ocharles/tasty-rerun";
+       description = "Run tests by filtering the test tree depending on the result of previous test runs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
@@ -203913,6 +206106,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-stats_0_2_0_4" = callPackage
+    ({ mkDerivation, base, containers, directory, process, stm, tagged
+     , tasty, time
+     }:
+     mkDerivation {
+       pname = "tasty-stats";
+       version = "0.2.0.4";
+       sha256 = "0z244l1yl1m77i4nvs9db2v6a2ydgcpgyc78hzgfyin7as002kd6";
+       libraryHaskellDepends = [
+         base containers directory process stm tagged tasty time
+       ];
+       homepage = "https://github.com/minad/tasty-stats#readme";
+       description = "Collect statistics of your Tasty testsuite";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -205770,6 +207980,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "testing-feat_1_0_1_0" = callPackage
+    ({ mkDerivation, base, QuickCheck, size-based
+     , testing-type-modifiers
+     }:
+     mkDerivation {
+       pname = "testing-feat";
+       version = "1.0.1.0";
+       sha256 = "0f3b4q97nwgk6gdcg0475r7g15hbghdp8vh7iiw6lrp87v7w00b3";
+       libraryHaskellDepends = [
+         base QuickCheck size-based testing-type-modifiers
+       ];
+       homepage = "https://github.com/JonasDuregard/testing-feat";
+       description = "Functional Enumeration of Algebraic Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "testing-type-modifiers" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -205926,6 +208153,30 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "texmath_0_11" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.11";
+       sha256 = "1sssa9ld13bhs4b6cpv5mwf18bjajr8fgw32g4wp2smgv9p2jv9f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -206776,6 +209027,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-utf8" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
+     , quickcheck-unicode, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "text-utf8";
+       version = "1.2.3.0";
+       sha256 = "17xgi57wnjq06k0zllyj0k7jqfxridhczc1dzrg65vdrmzf8x31a";
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq ghc-prim integer-gmp
+       ];
+       testHaskellDepends = [
+         array base binary bytestring deepseq directory ghc-prim HUnit
+         integer-gmp QuickCheck quickcheck-unicode random test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/text-utf8";
+       description = "An efficient packed UTF-8 backed Unicode text type";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "text-utils" = callPackage
     ({ mkDerivation, base, HTF, text }:
      mkDerivation {
@@ -207358,6 +209632,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-lift_0_7_10" = callPackage
+    ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
+     }:
+     mkDerivation {
+       pname = "th-lift";
+       version = "0.7.10";
+       sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
+       libraryHaskellDepends = [
+         base ghc-prim template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base ghc-prim template-haskell ];
+       homepage = "http://github.com/mboes/th-lift";
+       description = "Derive Template Haskell's Lift class for datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-lift-instances" = callPackage
     ({ mkDerivation, base, bytestring, containers, QuickCheck
      , template-haskell, text, th-lift, vector
@@ -210129,14 +212420,39 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "tomland" = callPackage
+    ({ mkDerivation, base, hashable, hedgehog, megaparsec, mtl
+     , parser-combinators, tasty, tasty-hedgehog, tasty-hspec, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "tomland";
+       version = "0.0.0";
+       sha256 = "1z6xlaw7fvl95h5nhd1r87bn8y3xv5gmfwfvryaj7hn06ghw13z2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base hashable megaparsec mtl parser-combinators text time
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base text time unordered-containers ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog tasty-hspec text
+         unordered-containers
+       ];
+       homepage = "https://github.com/kowainik/tomland";
+       description = "TOML parser";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "tomlcheck" = callPackage
     ({ mkDerivation, base, htoml-megaparsec, megaparsec
      , optparse-generic, text
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.23";
-       sha256 = "0m58rrjrrd2n1w313806s9gyj840nzsm7vwdz40639mr3a6vaifg";
+       version = "0.1.0.29";
+       sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -210901,12 +213217,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-compat_0_6_1_6" = callPackage
+  "transformers-compat_0_6_2" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "transformers-compat";
-       version = "0.6.1.6";
-       sha256 = "0db1l90pp4f1b829b3gv6xxklc8cnhkqq383rzd7r9b4hyjdvpmx";
+       version = "0.6.2";
+       sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim for the transformers library";
@@ -210993,14 +213309,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-either_0_1_0" = callPackage
+  "transformers-either_0_1_1" = callPackage
     ({ mkDerivation, base, exceptions, text, transformers }:
      mkDerivation {
        pname = "transformers-either";
-       version = "0.1.0";
-       sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm";
-       revision = "1";
-       editedCabalFile = "1bhkkh73irjql1jhxdcrv1igmf0hqpnw2p0w1s6fwhiidx64kvy9";
+       version = "0.1.1";
+       sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7";
        libraryHaskellDepends = [ base exceptions text transformers ];
        homepage = "http://github.com/tmcgilchrist/transformers-either/";
        description = "An Either monad transformer";
@@ -212871,8 +215185,8 @@ self: {
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.2.0.0";
-       sha256 = "0shjhdb3iabbs7hy89hv3fawzxilc7djgpacgydnzl2290dm17yl";
+       version = "0.2.0.1";
+       sha256 = "0qj2v4m30ik0qk2m9wghkgbhklql4jnyb0cnyfpip4yn1lczp34s";
        libraryHaskellDepends = [
          aeson base binary bytestring containers deepseq errors exceptions
          free hashable http-client http-client-tls http-types mtl
@@ -214850,8 +217164,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.3.2";
-       sha256 = "1g691ijcn7yxmn7w0zmd4h9w8nr578jifg3yhlyckka2jm97f20g";
+       version = "0.3.3";
+       sha256 = "06md35jmm8xas8dywxxc62nq4d6gi66m7bm4h3920jpvknqwbvbz";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers contravariant deepseq exceptions mtl
          profunctors template-haskell transformers transformers-compat
@@ -217280,8 +219594,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.10.0";
-       sha256 = "1cp7vxhg6m02j7zj7z6zss38rsykrk596qakzczsxjx7yraxwdxb";
+       version = "0.1.10.1";
+       sha256 = "1z3k6x6ap1hjp53w9dnqx8d7pwpbgsabj3dlxcdg5pvr6m3ns184";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -217528,8 +219842,8 @@ self: {
        pname = "uuid";
        version = "1.3.13";
        sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z";
-       revision = "1";
-       editedCabalFile = "0yp01hzsw07d9ismqqkkzwqllfnyyhzhjmwhbhgmkb6v7y7iqrbm";
+       revision = "2";
+       editedCabalFile = "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9";
        libraryHaskellDepends = [
          base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
          network-info random text time uuid-types
@@ -218037,12 +220351,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-bytestring_0_3_0_0" = callPackage
+  "validity-bytestring_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
-       version = "0.3.0.0";
-       sha256 = "1yxrpwxqn0262262j27sf1nb6iw6fnirypivnmpw0ghml28w7aym";
+       version = "0.3.0.1";
+       sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9";
        libraryHaskellDepends = [ base bytestring validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for bytestring";
@@ -218062,12 +220376,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-containers_0_3_0_0" = callPackage
+  "validity-containers_0_3_0_1" = callPackage
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.3.0.0";
-       sha256 = "1jh2f46x5gwhb5i5bmqn1vdn27way0nk7q2gphyjb62zrg3d3zq5";
+       version = "0.3.0.1";
+       sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf";
        libraryHaskellDepends = [ base containers validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
@@ -218087,14 +220401,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-path_0_3_0_0" = callPackage
+  "validity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
      , validity
      }:
      mkDerivation {
        pname = "validity-path";
-       version = "0.3.0.0";
-       sha256 = "1ijrzfk9jhlxxcdjqdq4cqz7ir7k7z9zrbamb18zai99hb6gg066";
+       version = "0.3.0.1";
+       sha256 = "1mfd062p9wh63qnz4a06rj7179lyllfc97g60cmpnjspmcdgy1ky";
        libraryHaskellDepends = [ base filepath path validity ];
        testHaskellDepends = [
          base filepath genvalidity-hspec hspec path validity
@@ -218117,12 +220431,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-scientific_0_2_0_0" = callPackage
+  "validity-scientific_0_2_0_1" = callPackage
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
        pname = "validity-scientific";
-       version = "0.2.0.0";
-       sha256 = "0l4mzrhn6yhqd6kz7rwfvrqxk0dhwvfkh40pfjyzbkg5mvd1drhh";
+       version = "0.2.0.1";
+       sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
        libraryHaskellDepends = [ base scientific validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for scientific";
@@ -218142,12 +220456,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-text_0_3_0_0" = callPackage
+  "validity-text_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.3.0.0";
-       sha256 = "190gkwa3b4rnhmah9idivvrv0val4crv8y3qy9s0aa44kpcj2b8m";
+       version = "0.3.0.1";
+       sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
        libraryHaskellDepends = [ base bytestring text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
@@ -218167,12 +220481,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-time_0_2_0_0" = callPackage
+  "validity-time_0_2_0_1" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
-       version = "0.2.0.0";
-       sha256 = "0rp1y2xq3h18ji3vaiv3w76kkdyql5y8xxxz730za6mrf1ffbnk4";
+       version = "0.2.0.1";
+       sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
        libraryHaskellDepends = [ base time validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for time";
@@ -218194,12 +220508,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-unordered-containers_0_2_0_0" = callPackage
+  "validity-unordered-containers_0_2_0_1" = callPackage
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
        pname = "validity-unordered-containers";
-       version = "0.2.0.0";
-       sha256 = "08jw6acvi016lxkw6rzxfxfcx56nwfi6ka52flkq2ks8038y3syy";
+       version = "0.2.0.1";
+       sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742";
        libraryHaskellDepends = [
          base hashable unordered-containers validity
        ];
@@ -218221,12 +220535,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-uuid_0_1_0_0" = callPackage
+  "validity-uuid_0_1_0_1" = callPackage
     ({ mkDerivation, base, uuid, validity }:
      mkDerivation {
        pname = "validity-uuid";
-       version = "0.1.0.0";
-       sha256 = "129h7cjgixq6l29n3y66zcx5ynfnxz3prqkgf2028f6w4mhd0154";
+       version = "0.1.0.1";
+       sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
        libraryHaskellDepends = [ base uuid validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for uuid";
@@ -218246,12 +220560,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-vector_0_2_0_0" = callPackage
+  "validity-vector_0_2_0_1" = callPackage
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
        pname = "validity-vector";
-       version = "0.2.0.0";
-       sha256 = "0kyyrcwxial9csyx40vrl0frz5yrmzqhjpy1cz8afsc7r4ph12yi";
+       version = "0.2.0.1";
+       sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
        libraryHaskellDepends = [ base hashable validity vector ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for vector";
@@ -219063,14 +221377,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-sized_1_0_1_0" = callPackage
+  "vector-sized_1_0_2_0" = callPackage
     ({ mkDerivation, adjunctions, base, deepseq, distributive
      , finite-typelits, indexed-list-literals, primitive, vector
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.0.1.0";
-       sha256 = "0p3bwqdz3k1a3ya7bj80d6crpbsk62wcvl6rkpkr0snqh4zq87zl";
+       version = "1.0.2.0";
+       sha256 = "0ac9bx5pcf9hbm1i9ibw3x52j0a92j8y7svm4b3d65p85mxqhc69";
        libraryHaskellDepends = [
          adjunctions base deepseq distributive finite-typelits
          indexed-list-literals primitive vector
@@ -219334,6 +221648,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "verifiable-expressions" = callPackage
+    ({ mkDerivation, base, containers, lens, mtl, sbv, transformers
+     , union, vinyl
+     }:
+     mkDerivation {
+       pname = "verifiable-expressions";
+       version = "0.4.0";
+       sha256 = "0s0wqhss8155xy2gkdwylvp61cn0ra5245fa5l2k9rvqr8xxrfkd";
+       libraryHaskellDepends = [
+         base containers lens mtl sbv transformers union vinyl
+       ];
+       description = "An intermediate language for Hoare logic style verification";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "verify" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, containers, either
      , hspec, jwt, QuickCheck, text, text-conversions, time
@@ -221692,8 +224021,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.10.1";
-       sha256 = "1ahlvyplg1mh3w2yxag0nk67w13k70rff77b96grgr48a8b9b82g";
+       version = "0.10.2";
+       sha256 = "0nhimzkws5v7qpfv305lp41qm61q0xxny5vvs0d26jarnmar9crq";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
@@ -221773,6 +224102,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "wai-session_0_3_3" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , bytestring-builder, containers, cookie, entropy, http-types
+     , StateVar, time, transformers, vault, wai
+     }:
+     mkDerivation {
+       pname = "wai-session";
+       version = "0.3.3";
+       sha256 = "0lq0gqndb9simd1zkz355m604dwrpcdwxcl3bgagi6kb8h12fffj";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder containers cookie
+         entropy http-types StateVar time transformers vault wai
+       ];
+       homepage = "https://github.com/singpolyma/wai-session";
+       description = "Flexible session middleware for WAI";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-session-alt" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, cookie
      , http-types, time, vault, wai-transformers
@@ -222854,8 +225202,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.7.1.0";
-       sha256 = "0ckxnnp5aqcd13p5gnk1nx7ysws6x7nmfklxqllilpzdh5ibyj59";
+       version = "0.7.2.0";
+       sha256 = "15d0l5cvrncwmy27qk7y7f54snw1fjcsll52sdlmk3v2mpf6nppn";
        libraryHaskellDepends = [
          aeson async base basement bytestring cereal cryptonite data-default
          exceptions generics-sop http-client machines memory mtl parsec
@@ -223292,8 +225640,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.12.4.0";
-       sha256 = "1sq488nm8bjrg1q9vypag9pd8vljfibx3kacgkcfi1zqmr14x8x3";
+       version = "0.12.4.1";
+       sha256 = "1qr9sjjnllf6y2k5knyrck9nnh3s7z6nid8a0z5vsvmmvr37fa4j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -223434,6 +225782,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets-snap_0_10_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+     , mtl, snap-core, snap-server, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-snap";
+       version = "0.10.3.0";
+       sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk";
+       libraryHaskellDepends = [
+         base bytestring bytestring-builder io-streams mtl snap-core
+         snap-server websockets
+       ];
+       description = "Snap integration for the websockets library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webwire" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , bytestring, case-insensitive, containers, cookie, cprng-aes
@@ -223524,6 +225889,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weigh_0_0_12" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
+     mkDerivation {
+       pname = "weigh";
+       version = "0.0.12";
+       sha256 = "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x";
+       libraryHaskellDepends = [
+         base deepseq mtl process split temporary
+       ];
+       testHaskellDepends = [ base deepseq ];
+       homepage = "https://github.com/fpco/weigh#readme";
+       description = "Measure allocations of a Haskell functions/values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weighted" = callPackage
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
@@ -224201,6 +226582,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wizard" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "wizard";
+       version = "0.1.0.0";
+       sha256 = "0j485hbk42ipmc14ydickfm268b7z183rs37ih3j99lbzrdm1s8l";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/chessai/wizard.git";
+       description = "the fantastical wizard monoid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wizards" = callPackage
     ({ mkDerivation, base, containers, control-monad-free, haskeline
      , mtl, transformers
@@ -224456,8 +226849,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.44";
-       sha256 = "096j1f0xzjrnk8z7niyx19w05nx5222rgfbhgx8df8jwhfz0ymw7";
+       version = "0.3.45";
+       sha256 = "0l3jp2qqscy2fq5fvaq83hsh68f1d5xg97k2dhyc01zc6fd5jqi8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224485,6 +226878,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "word" = callPackage
+    ({ mkDerivation, base, Fin, natural-induction, peano, smallcheck
+     , tasty, tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "word";
+       version = "0.1.0.1";
+       sha256 = "1k7hz3w8isbdmj0f2klyj4drrk31lbs3fzdnin7pas7l0ai286qf";
+       libraryHaskellDepends = [
+         base Fin natural-induction peano transformers
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Words of arbitrary size";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "word-trie" = callPackage
     ({ mkDerivation, base, binary, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -224595,10 +227004,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.2.6";
-       sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w";
-       revision = "1";
-       editedCabalFile = "1igc5fc91ilva7yqhcmdsd6yq6q974ybb2hwk856cpqpmas0402j";
+       version = "0.1.2.7";
+       sha256 = "06xz5xk14fiy1z4j6q7lbjwj13m4hy22pzrcdwk6c078w85rp4yd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226013,10 +228420,10 @@ self: {
      }:
      mkDerivation {
        pname = "xeno";
-       version = "0.3.3";
-       sha256 = "034d38kcgpil1xf32cl131jh7b0x8awhxwv1nnc790x5wn876c0x";
+       version = "0.3.4";
+       sha256 = "1srlyg0wc2mwsa84isv0brcbwsrw6i7jbi0b2mjhnhd6d7cmcajs";
        libraryHaskellDepends = [
-         array base bytestring deepseq mtl mutable-containers vector
+         array base bytestring deepseq hspec mtl mutable-containers vector
        ];
        testHaskellDepends = [ base bytestring hexml hspec ];
        benchmarkHaskellDepends = [
@@ -228128,37 +230535,6 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.29";
-       sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs";
-       revision = "1";
-       editedCabalFile = "0hxmf36ydqr0gdwiagp57df7fxwhfy99r6s7mj861m8rflha0dks";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath resourcet scientific semigroups template-haskell text
-         transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring conduit directory hspec HUnit
-         mockery resourcet temporary text transformers unordered-containers
-         vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_30" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, resourcet, scientific, semigroups, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
        version = "0.8.30";
        sha256 = "11dyjqs1rzhpidzfqdw3lg8rsm32jhjph54kc68k4dwib6fnwnyi";
        configureFlags = [ "-fsystem-libyaml" ];
@@ -228178,7 +230554,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-combinators" = callPackage
@@ -228505,19 +230880,20 @@ self: {
 
   "yarn-lock" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, either
-     , megaparsec, neat-interpolation, protolude, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text
+     , megaparsec, neat-interpolation, protolude, quickcheck-instances
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text
      }:
      mkDerivation {
        pname = "yarn-lock";
-       version = "0.4.0";
-       sha256 = "1s95xdwshsvplv1406a4bn1v8xjhppfmhzf4302s9h41ai7b6wni";
+       version = "0.4.1";
+       sha256 = "1jhw8ss2psap2shl8spwqbdvxchmvfxb354asvdjjgld608xz8wk";
        libraryHaskellDepends = [
          base containers either megaparsec protolude text
        ];
        testHaskellDepends = [
          ansi-wl-pprint base containers either megaparsec neat-interpolation
-         protolude tasty tasty-hunit tasty-quickcheck tasty-th text
+         protolude quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         tasty-th text
        ];
        homepage = "https://github.com/Profpatsch/yarn-lock#readme";
        description = "Represent and parse yarn.lock files";
@@ -229297,6 +231673,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-bin_1_6_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, Cabal, conduit, conduit-extra, containers
+     , data-default-class, directory, file-embed, filepath, fsnotify
+     , http-client, http-client-tls, http-reverse-proxy, http-types
+     , network, optparse-applicative, parsec, process, project-template
+     , resourcet, say, shakespeare, split, stm, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp
+     , warp-tls, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.6.0.3";
+       sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring blaze-builder bytestring Cabal
+         conduit conduit-extra containers data-default-class directory
+         file-embed filepath fsnotify http-client http-client-tls
+         http-reverse-proxy http-types network optparse-applicative parsec
+         process project-template resourcet say shakespeare split stm
+         streaming-commons tar template-haskell text time transformers
+         transformers-compat unix-compat unliftio unordered-containers wai
+         wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
      , shakespeare, text, transformers, yesod-core, yesod-elements
@@ -229453,46 +231862,6 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.6.4";
-       sha256 = "09r714ibpml8mqbqhnckync5a0kb7fyz079m9lapmvhq1yvl4zld";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq deepseq-generics directory fast-logger
-         http-types monad-logger mtl old-locale parsec path-pieces primitive
-         random resourcet safe semigroups shakespeare template-haskell text
-         time transformers unix-compat unliftio unordered-containers vector
-         wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces QuickCheck random resourcet shakespeare
-         streaming-commons template-haskell text transformers unliftio wai
-         wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_5" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
-     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
-     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
-     , resourcet, safe, semigroups, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
        version = "1.6.5";
        sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml";
        libraryHaskellDepends = [
@@ -229517,7 +231886,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -231804,10 +234172,8 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "4.3";
-       sha256 = "1c29zzc6y7l169hdj9278z95530h6hc161fxgfn4zlxs3k5611d1";
-       revision = "1";
-       editedCabalFile = "0spg0sqqra4h5k5zagmmhh0sh10p3bzrhgrfspcd3i5c7yymwagb";
+       version = "4.3.1";
+       sha256 = "0fsddp5267bpmccg2hhra4z8isqmrdgcp0i0amrxsacgyqa4iqbv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
@@ -232178,8 +234544,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.7";
-       sha256 = "1gdrnxa23lk885ldbn72n136acjfv8l0bnpf5v0lnypzl1hwp4rk";
+       version = "0.0.1.8";
+       sha256 = "1vzl6gl2lism0nv5n9hs5mmprfkxp0ajr0ysrn21xwajbbnakcw2";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
new file mode 100644
index 000000000000..c13a26204e26
--- /dev/null
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "gauche-${version}";
+  version = "0.9.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
+    sha256 = "0g77nik15whm5frxb7l0pwzd95qlq949dym5pn5p04p17lhm72jc";
+  };
+
+  nativeBuildInputs = [ pkgconfig texinfo ];
+
+  buildInputs = [ libiconv gdbm openssl zlib ];
+
+  configureFlags = [
+    "--enable-multibyte=utf-8"
+    "--with-iconv=${libiconv}"
+    "--with-dbm=gdbm"
+    "--with-zlib=${zlib}"
+    # TODO: Enable slib
+    #       Current slib in nixpkgs is specialized to Guile
+    # "--with-slib=${slibGuile}/lib/slib"
+  ];
+
+  enableParallelBuilding = true;
+
+  # TODO: Fix tests that fail in sandbox build
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "R7RS Scheme scripting engine";
+    homepage = https://practical-scheme.net/gauche/;
+    maintainers = with maintainers; [ mnacamura ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch b/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
new file mode 100644
index 000000000000..31d3b8bdee76
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
@@ -0,0 +1,21 @@
+From: Enrico Tassi <gareuselesinge@debian.org>
+Date: Tue, 26 Aug 2014 16:20:55 +0200
+Subject: Fix stack overflow in vararg functions
+
+---
+ src/ldo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ldo.c b/src/ldo.c
+index d1bf786..30333bf 100644
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
+     CallInfo *ci;
+     StkId st, base;
+     Proto *p = cl->p;
+-    luaD_checkstack(L, p->maxstacksize);
++    luaD_checkstack(L, p->maxstacksize + p->numparams);
+     func = restorestack(L, funcr);
+     if (!p->is_vararg) {  /* no varargs? */
+       base = func + 1;
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 1c4fcd2811d1..15077578f27f 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -20,12 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
 
   patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ])
-    ++ [(fetchpatch {
-      name = "CVE-2014-5461.patch";
-      url = "http://anonscm.debian.org/cgit/pkg-lua/lua5.1.git/plain/debian/patches/"
-        + "0004-Fix-stack-overflow-in-vararg-functions.patch?id=b75a2014db2ad65683521f7bb295bfa37b48b389";
-      sha256 = "05i5vh53d9i6dy11ibg9i9qpwz5hdm0s8bkx1d9cfcvy80cm4c7f";
-    })];
+    ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
 
   configurePhase =
     if stdenv.isDarwin
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index a8e50945c3fd..e9230b218be9 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -3,13 +3,13 @@
 , libwebp, gnome3, libintl }:
 
 let
-  version = "0.4.0";
+  version = "0.4.2";
 in stdenv.mkDerivation rec {
   name = "gegl-${version}";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
-    sha256 = "1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh";
+    sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba";
   };
 
   # needs fonts otherwise, don't know how to pass them
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 55bb22e660b0..083ea88301a6 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "librelp-1.2.15";
+  name = "librelp-1.2.16";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9";
+    sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 59700669ba7c..57b810c0b448 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "6.6.0";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
+    sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 5ab681b21b28..233ba91d299a 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -1,28 +1,18 @@
 { fetchurl, stdenv, unzip, scheme, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "slib-3b2";
+  name = "slib-3b5";
 
   src = fetchurl {
     url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip";
-    sha256 = "1s6a7f3ha2bhwj4nkg34n0j511ww1nlgrn5xis8k53l8ghdrrjxi";
+    sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq";
   };
 
   patches = [ ./catalog-in-library-vicinity.patch ];
 
   buildInputs = [ unzip scheme texinfo ];
 
-  configurePhase = ''
-    mkdir -p "$out"
-    sed -i "Makefile" \
-        -e "s|^[[:blank:]]*prefix[[:blank:]]*=.*$|prefix = $out/|g"
-  '';
-
-  buildPhase = "make infoz";
-
-  installPhase = ''
-    make install
-
+  postInstall = ''
     ln -s mklibcat{.scm,}
     SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs
 
diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
new file mode 100644
index 000000000000..576d9b2528f5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/earley/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "earley is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "ocaml${ocaml.version}-earley-${version}";
+  src = fetchFromGitHub {
+    owner = "rlepigre";
+    repo = "ocaml-earley";
+    rev = "ocaml-earley_${version}";
+    sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx";
+  };
+
+  buildInputs = [ which ocaml findlib ocamlbuild ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Parser combinators based on Earley Algorithm";
+    license = stdenv.lib.licenses.cecill-b;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
new file mode 100644
index 000000000000..902d1b266534
--- /dev/null
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "geojson";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06ihcb8839zzgk5jcv18kc6nqld4hhj3nk4f3drzcr8n8893v1y8";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+  checkInputs = [ glibcLocales ];
+
+  meta = {
+    homepage = https://github.com/frewsxcv/python-geojson;
+    description = "Python bindings and utilities for GeoJSON";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ geistesk ];
+  };
+}
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index b4bc680a19aa..3d4d542d2f92 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   name = "git-ftp-${version}";
-  version = "1.4.0";
+  version = "1.5.1";
   src = fetchFromGitHub {
     owner = "git-ftp";
     repo = "git-ftp";
     rev = version;
-    sha256 = "0n8q1azamf10qql8f8c4ppbd3iisy460gwxx09v5d9hji5md27s3";
+    sha256 = "0nh2f58rwwfzmglm75fmmm10470a80q0vsihc2msa8xswngihg22";
   };
 
   dontBuild = true;
diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index ff03897edb29..788310d5fe97 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, glib, autoreconfHook, pkgconfig, libgsystem, fetchgit }:
+{ stdenv, glib, autoreconfHook, pkgconfig, systemd, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2016.1";
+  version = "2018.1";
   name = "gnome-desktop-testing-${version}";
 
   src = fetchgit {
     url = https://git.gnome.org/browse/gnome-desktop-testing;
     rev = "v${version}";
-    sha256 = "18qhmsab6jc01qrfzjx8m4799gbs72c4jg830mp0p865rcbl68dc";
+    sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ glib libgsystem ];
+  buildInputs = [ glib systemd ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 4b6d364a8569..8f2cdb0fcff7 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "materia-theme-${version}";
-  version = "20180321";
+  version = "20180519";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6";
+    sha256 = "0javva2a3kmwb7xss2zmbpc988gagrkjgxncy7i1jifyvbnamf70";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
       -e "s|if .*which gnome-shell.*;|if true;|" \
       -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
     mkdir -p $out/share/themes
-    # name is used internally by the package installation script
-    name= ./install.sh --dest $out/share/themes
+    ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';
 
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
new file mode 100644
index 000000000000..75f1113e9f08
--- /dev/null
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "m-cli-${version}";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "rgcr";
+    repo = "m-cli";
+    rev = "v${version}";
+    sha512 = "0mkcx7jq91pbfs8327qc8434gj73fvjgdfdsrza0lyd9wns6jhsqsf0585klzl68aqscvksgzi2asdnim4va35cdkp2fdzl0g3sm4kd";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    local MPATH="$out/share/m"
+
+    gawk -i inplace '{
+      gsub(/^\[ -L.*|^\s+\|\| pushd.*|^popd.*/, "");
+      gsub(/MPATH=.*/, "MPATH='$MPATH'");
+      gsub(/(update|uninstall)_mcli \&\&.*/, "echo NOOP \\&\\& exit 0");
+      print
+    }' m
+
+    install -Dt "$MPATH/plugins" -m755 plugins/*
+
+    install -Dm755 m $out/bin/m
+
+    install -Dt "$out/share/bash-completion/completions/" -m444 completion/bash/m
+    install -Dt "$out/share/fish/vendor_completions.d/" -m444 completion/fish/m.fish
+    install -Dt "$out/share/zsh/site-functions/" -m444 completion/zsh/_m
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Swiss Army Knife for macOS";
+    inherit (src.meta) homepage;
+    repositories.git = git://github.com/rgcr/m-cli.git;
+
+    license = licenses.mit;
+
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ yurrriq ];
+  };
+}
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 4bd50fdae40f..fd45e83c26b5 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, lib, kernel, fetchurl, pkgconfig, libvirt }:
-
-assert lib.versionAtLeast kernel.version "3.18";
+{ stdenv, kernel, fetchurl, pkgconfig, numactl }:
 
 stdenv.mkDerivation rec {
   name = "dpdk-${version}-${kernel.version}";
-  version = "17.05.1";
+  version = "17.11.2";
 
   src = fetchurl {
     url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
+    sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
-  buildInputs = [ libvirt ];
+  buildInputs = [ numactl ];
 
   RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   # we need sse3 instructions to build
-  NIX_CFLAGS_COMPILE = [ "-march=core2" ];
+  NIX_CFLAGS_COMPILE = [ "-msse3" ];
 
   enableParallelBuilding = true;
   outputs = [ "out" "kmod" ];
diff --git a/pkgs/os-specific/linux/odp-dpdk/configure.patch b/pkgs/os-specific/linux/odp-dpdk/configure.patch
deleted file mode 100644
index 3dadc98e8342..000000000000
--- a/pkgs/os-specific/linux/odp-dpdk/configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 001ebfc2893b..7d19ebcd213f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -215,7 +215,7 @@ AC_SUBST([testdir])
- ##########################################################################
- AM_CONDITIONAL([netmap_support], [test x$netmap_support = xyes ])
- AM_CONDITIONAL([PKTIO_DPDK], [test x$pktio_dpdk_support = xyes ])
--AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes])
-+AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes])
- AM_CONDITIONAL([DPDK_DEFAULT_DIR], [test "x${DPDK_DEFAULT_DIR}" = "x1"])
- AM_CONDITIONAL([test_installdir], [test "$testdir" != ""])
- AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ])
-@@ -320,18 +320,6 @@ ODP_CFLAGS="$ODP_CFLAGS -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonli
- ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings"
- ODP_CFLAGS="$ODP_CFLAGS -std=gnu99"
- 
--dnl Use -Werror in the checks below since Clang emits a warning instead of
--dnl an error when it encounters an unknown warning option.
--AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wimplicit-fallthrough=0"],
--                      [], [-Werror])
--AX_CHECK_COMPILE_FLAG([-Wformat-truncation=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wformat-truncation=0"],
--                      [], [-Werror])
--AX_CHECK_COMPILE_FLAG([-Wformat-overflow=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wformat-overflow=0"],
--                      [], [-Werror])
--
- # Extra flags for example to suppress certain warning types
- ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA"
- 
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index a444243e802e..cf4f9df26777 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -1,31 +1,27 @@
-{ stdenv, fetchgit, autoreconfHook, openssl, libpcap, dpdk }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig
+, dpdk, libconfig, libpcap, numactl, openssl
+}:
 
 stdenv.mkDerivation rec {
   name = "odp-dpdk-${version}";
-  version = "1.15.0.0";
+  version = "1.19.0.0_DPDK_17.11";
 
-  src = fetchgit {
-    url = "https://git.linaro.org/lng/odp-dpdk.git";
-    rev = "d8533b4e575d62c9f6f2caedd38d98a1a56fb8d3";
-    sha256 = "1p09rw7dxxqcxxrdb8wbwp2imapyjvdbvap7s9km2i9hbd8ipdif";
+  src = fetchurl {
+    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz";
+    sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ openssl dpdk libpcap ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ dpdk libconfig libpcap numactl openssl ];
 
-  RTE_SDK = "${dpdk}";
+  RTE_SDK = dpdk;
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   dontDisableStatic = true;
 
   configureFlags = [
     "--disable-shared"
-    "--with-sdk-install-path=${dpdk}/${RTE_TARGET}"
-  ];
-
-  patches = [
-    ./configure.patch
-    ./odp_crypto.patch
+    "--with-dpdk-path=${dpdk}"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch b/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch
deleted file mode 100644
index 44ef155d69fb..000000000000
--- a/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
-index d95b157805dc..d13ad5bbde95 100644
---- a/platform/linux-dpdk/odp_crypto.c
-+++ b/platform/linux-dpdk/odp_crypto.c
-@@ -900,11 +900,12 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param,
- 	/* Setup session */
- 	session = rte_cryptodev_sym_session_create(cdev_id, first_xform);
- 
--	if (session == NULL)
-+	if (session == NULL) {
- 		/* remove the crypto_session_entry_t */
- 		memset(entry, 0, sizeof(*entry));
- 		free_session(entry);
- 		return -1;
-+	}
- 
- 	entry->rte_session  = (intptr_t)session;
- 	entry->cipher_xform = cipher_xform;
diff --git a/pkgs/os-specific/linux/pktgen/Makefile.patch b/pkgs/os-specific/linux/pktgen/Makefile.patch
deleted file mode 100644
index da948bcc5a08..000000000000
--- a/pkgs/os-specific/linux/pktgen/Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/app/Makefile b/app/Makefile
-index 5078b9a..99b208a 100644
---- a/app/Makefile
-+++ b/app/Makefile
-@@ -46,29 +46,10 @@ APP = pktgen
- CFLAGS += -O3 -g $(WERROR_FLAGS) -fno-stack-protector
- CFLAGS += -I$(RTE_SRCDIR) -I$(RTE_SRCDIR)/../lib/common
- 
--dpdk_ver := $(RTE_SDK)/xusertools/dpdk-version.sh
--pktgen_ver := $(RTE_SRCDIR)/../tools/dpdk-version.sh
--ver_cmd := $(if $(wildcard $(dpdk_ver)),$(dpdk_ver),$(pktgen_ver))
--# $(info ver_cmd=$(ver_cmd))
--
--yy := $(shell $(ver_cmd) -yy)
--# mm := $(shell $(ver_cmd) -mm)
--
--# $(info yy=$(yy))
--
--ifeq ($(yy),17)
- COMMON_PRE := $(RTE_SRCDIR)/../lib/common
- LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src
- CLI_PRE := $(RTE_SRCDIR)/../lib/cli
- GUI_PRE := $(RTE_SRCDIR)/../gui/gui
--else
--ifeq ($(yy),16)
--COMMON_PRE := $(RTE_SRCDIR)/../lib/common/lib/common
--LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src/lib/lua/src
--CLI_PRE := $(RTE_SRCDIR)/../lib/cli/lib/cli
--GUI_PRE := $(RTE_SRCDIR)/../gui
--endif
--endif
- 
- COMMON_LIB := $(COMMON_PRE)/$(RTE_TARGET)
- LUA_LIB    := $(LUA_PRE)/$(RTE_TARGET)
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 9bc8967453b4..c443da7df3b4 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -1,34 +1,48 @@
-{ stdenv, fetchurl, dpdk, libpcap, utillinux
-, pkgconfig
+{ stdenv, lib, fetchurl, pkgconfig
+, dpdk, libpcap, numactl, utillinux
 , gtk2, withGtk ? false
 }:
 
-stdenv.mkDerivation rec {
+let
+
+  # pktgen needs a specific version of lua to apply its patch (see lib/lua/Makefile).
+  lua = rec {
+    name = "lua-5.3.4";
+    basename = name + ".tar.gz";
+    src = fetchurl {
+      url = "https://www.lua.org/ftp/${basename}";
+      sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
+    };
+  };
+
+in stdenv.mkDerivation rec {
   name = "pktgen-${version}";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
-    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz";
-    sha256 = "0fcyb56d4mkvchi5i8s3m210f5c3xa8zbjb08ranpa1a2k1kzfg5";
+    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.xz";
+    sha256 = "1gy99jr9dbwzi9pd3w5k673h3pfnbkz6rbzmrkwcyis72pnphy5z";
   };
 
   nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
 
   buildInputs =
-    [ dpdk libpcap ]
+    [ dpdk libpcap numactl ]
     ++ stdenv.lib.optionals withGtk [gtk2];
 
   RTE_SDK = "${dpdk}";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
   GUI = stdenv.lib.optionalString withGtk "true";
 
-  NIX_CFLAGS_COMPILE = [ "-march=core2" ];
+  NIX_CFLAGS_COMPILE = [ "-msse3" ];
 
-  patches = [ ./Makefile.patch ];
-
-  postPatch = ''
-    substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out
+  postPatch = let dpdkMajor = lib.versions.major dpdk.version; in ''
+    substituteInPlace app/Makefile --replace 'yy :=' 'yy := ${dpdkMajor} #'
     substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
+
+    ln -s ${lua.src} lib/lua/${lua.basename}
+    make -C lib/lua get_tarball # unpack and patch
+    substituteInPlace lib/lua/${lua.name}/src/luaconf.h --replace /usr/local $out
   '';
 
   installPhase = ''
@@ -38,6 +52,8 @@ stdenv.mkDerivation rec {
     install -m 0644 Pktgen.lua $out/lib/lua/5.3
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Traffic generator powered by DPDK";
     homepage = http://dpdk.org/;
diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix
index 01c84a1d1faa..690eb8b2eabb 100644
--- a/pkgs/os-specific/linux/tmon/default.nix
+++ b/pkgs/os-specific/linux/tmon/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = kernel.makeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ];
+  NIX_CFLAGS_LINK = "-lgcc_s";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index c5daaabd5be8..ae31edcaaede 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,73 +1,36 @@
-{ stdenv, fetchurl, libmnl, kernel ? null }:
+{ stdenv, fetchzip, kernel, wireguard-tools }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
-assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
+assert stdenv.lib.versionAtLeast kernel.version "3.10";
 
-let
+stdenv.mkDerivation rec {
   name = "wireguard-${version}";
-
   version = "0.0.20180514";
 
-  src = fetchurl {
-    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
-  };
+  inherit (wireguard-tools) src;
 
-  meta = with stdenv.lib; {
-    homepage     = https://www.wireguard.com/;
-    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
-    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
-  };
-
-  module = stdenv.mkDerivation {
-    inherit src meta name;
+  preConfigure = ''
+    cd src
+    sed -i '/depmod/,+1d' Makefile
+  '';
 
-    preConfigure = ''
-      cd src
-      sed -i '/depmod/,+1d' Makefile
-    '';
+  hardeningDisable = [ "pic" ];
 
-    hardeningDisable = [ "pic" ];
+  KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  INSTALL_MOD_PATH = "\${out}";
 
-    KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-    INSTALL_MOD_PATH = "\${out}";
+  NIX_CFLAGS = ["-Wno-error=cpp"];
 
-    NIX_CFLAGS = ["-Wno-error=cpp"];
-
-    nativeBuildInputs = kernel.moduleBuildDependencies;
-
-    buildPhase = "make module";
-  };
+  nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  tools = stdenv.mkDerivation {
-    inherit src meta name;
+  buildPhase = "make module";
 
-    preConfigure = "cd src";
-
-    buildInputs = [ libmnl ];
-
-    enableParallelBuilding = true;
-
-    makeFlags = [
-      "WITH_BASHCOMPLETION=yes"
-      "WITH_WGQUICK=yes"
-      "WITH_SYSTEMDUNITS=yes"
-      "DESTDIR=$(out)"
-      "PREFIX=/"
-      "-C" "tools"
-    ];
-
-    buildPhase = "make tools";
-
-    postInstall = ''
-      substituteInPlace $out/lib/systemd/system/wg-quick@.service \
-        --replace /usr/bin $out/bin
-    '';
+  meta = with stdenv.lib; {
+    homepage     = https://www.wireguard.com/;
+    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
+    description  = " Tools for the WireGuard secure network tunnel";
+    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
   };
-
-in if kernel == null
-   then tools
-   else module
+}
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index b71d9b8e58b8..37d82326cc29 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -45,8 +45,8 @@ let
     } // attrs');
 in rec {
   prometheus_1 = generic {
-    version = "1.8.1";
-    sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
+    version = "1.8.2";
+    sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv";
   };
 
   prometheus_2 = generic {
diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index eb6f5f94810e..6dcd19d8d680 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
-    sha256 = "1c4m1rg3122y8rndgz7sj9a49l3v9nm0qbpa04pls20pxzx21g5a";
+    sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
new file mode 100644
index 000000000000..b95ba35045d0
--- /dev/null
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "antibody-${version}";
+  version = "3.4.6";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/getantibody/antibody";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "getantibody";
+    repo   = "antibody";
+    sha256 = "0pvsngvlxv5iw7yj18snslag8c61ji4w3j3rw543ckl6k3f9zq6c";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "The fastest shell plugin manager";
+    homepage    = https://github.com/getantibody/antibody;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ worldofpeace ];
+  };
+}
diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix
new file mode 100644
index 000000000000..6e97ff319029
--- /dev/null
+++ b/pkgs/shells/zsh/antibody/deps.nix
@@ -0,0 +1,83 @@
+[
+  {
+    goPackagePath = "github.com/alecthomas/kingpin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kingpin";
+      rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
+      sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/caarlos0/gohome";
+    fetch = {
+      type = "git";
+      url = "https://github.com/caarlos0/gohome";
+      rev = "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
+      sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
+    };
+  }
+  {
+    goPackagePath = "github.com/getantibody/folder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getantibody/folder";
+      rev = "e65aa38ebeb03e6d6e91b90a637f3b7c17e1b6d6";
+      sha256 = "0h8al3sl4gxg1p33s8jrz91i7vrqahk12p0b3srlhnz1sn4ahn8n";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+]
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
new file mode 100644
index 000000000000..c48b85cedb26
--- /dev/null
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick }:
+
+stdenv.mkDerivation rec {
+  name = "blockhash-${version}";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "commonsmachinery";
+    repo = "blockhash";
+    rev = "v${version}";
+    sha256 = "15iwljpkykn2711jhls7cwkb23gk6iawlvvk4prl972wic2wlxcj";
+  };
+
+  nativeBuildInputs = [ python pkgconfig ];
+  buildInputs = [ imagemagick ];
+
+  configurePhase = "python waf configure --prefix=$out";
+  buildPhase = "python waf";
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = "http://blockhash.io/";
+    description = ''
+      This is a perceptual image hash calculation tool based on algorithm
+      descibed in Block Mean Value Based Image Perceptual Hashing by Bian Yang,
+      Fan Gu and Xiamu Niu.
+    '';
+    license = licenses.mit;
+    maintainers = [ maintainers.infinisil ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/misc/html-proofer/Gemfile b/pkgs/tools/misc/html-proofer/Gemfile
new file mode 100644
index 000000000000..a7c369cc6804
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'html-proofer'
diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
new file mode 100644
index 000000000000..c7ae194e426b
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -0,0 +1,48 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    colorize (0.8.1)
+    concurrent-ruby (1.0.5)
+    ethon (0.11.0)
+      ffi (>= 1.3.0)
+    ffi (1.9.23)
+    html-proofer (3.8.0)
+      activesupport (>= 4.2, < 6.0)
+      addressable (~> 2.3)
+      colorize (~> 0.8)
+      mercenary (~> 0.3.2)
+      nokogiri (~> 1.8.1)
+      parallel (~> 1.3)
+      typhoeus (~> 1.3)
+      yell (~> 2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    mercenary (0.3.6)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    public_suffix (3.0.2)
+    thread_safe (0.3.6)
+    typhoeus (1.3.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    yell (2.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  html-proofer
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix
new file mode 100644
index 000000000000..49881f1b0b49
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/default.nix
@@ -0,0 +1,18 @@
+{ bundlerEnv, ruby, lib }:
+
+bundlerEnv rec {
+  name = "${pname}-${version}";
+  pname = "html-proofer";
+  version = (import ./gemset.nix).html-proofer.version;
+
+  inherit ruby;
+  gemdir = ./.;
+
+  meta = with lib; {
+    description = "A tool to validate HTML files";
+    homepage    = https://github.com/gjtorikian/html-proofer;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ primeos ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
new file mode 100644
index 000000000000..7043c9e355b0
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -0,0 +1,154 @@
+{
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkzg31x501l8d1hbygyh1lr4c3vnw88a3c1rxz5ifvvzb10i6zm";
+      type = "gem";
+    };
+    version = "5.2.0";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  colorize = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  ethon = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      type = "gem";
+    };
+    version = "1.9.23";
+  };
+  html-proofer = {
+    dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06ggsx2fhsis1iw0sw12a709h99ksbs9kbmv0j05kvbak7b9m51a";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1milplpsdpxlvn23q6pvir4jgxsphq2ps2jgdb3i29kzpc55gm7y";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  mercenary = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      type = "gem";
+    };
+    version = "5.11.3";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  typhoeus = {
+    dependencies = ["ethon"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01pd16n6bvknyip42r1r7js0j8x8ly37gmr72z3695zcczh1blyq";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+  yell = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m3q1l33sznrl86myjhd2l7chma1wdcdrdmnf2fi7aydapwd4vib";
+      type = "gem";
+    };
+    version = "2.0.7";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix
new file mode 100644
index 000000000000..3037262322f2
--- /dev/null
+++ b/pkgs/tools/misc/nms/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "nms-${version}";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "bartobri";
+    repo = "no-more-secrets";
+    rev = "v${version}";
+    sha256 = "1zfv4qabikf8w9winsr4brxrdvs3f0d7xvydksyx8bydadsm2v2h";
+  };
+
+  buildFlags = [ "nms" "sneakers" ];
+  installFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bartobri/no-more-secrets";
+    description = ''
+      A command line tool that recreates the famous data decryption
+      effect seen in the 1992 movie Sneakers.
+    '';
+    license = licenses.gpl3;
+    maintainers = [ maintainers.infinisil ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 45fabeee1393..f6e0608ca7f8 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.35";
+  version = "1.36";
   src = fetchurl {
     url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
-    sha256 = "1apj5j25kj7v1bsfv3nh54aiq873nfrsjfbj85p5qm3ihfwxxmv6";
+    sha256 = "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7";
   };
 
   buildInputs = [ openconnect polkit
@@ -16,14 +16,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig file gawk ];
 
-  patches = [
-    (fetchpatch {
-      name = "header-include.patch";
-      url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24";
-      sha256 = "0q6ysy2xvvcmkcbw1y29x90g7g7kih7v95k1xbxdcxkras5yl8nf";
-    })
-  ];
-
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
     export PPPD=${ppp}/sbin/pppd
@@ -61,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A daemon for managing internet connections";
-    homepage = https://connman.net/;
+    homepage = https://01.org/connman;
     maintainers = [ maintainers.matejc ];
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
new file mode 100644
index 000000000000..e27b241e755d
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildGoPackage, fetchzip }:
+
+buildGoPackage rec {
+  name = "wireguard-go-${version}";
+  version = "0.0.20180514";
+
+  goPackagePath = "wireguard-go";
+
+  src = fetchzip {
+    url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
+    sha256 = "1i1w4vj8w353b92nfhs92k0f7fifrwi067qfmgckdk0kk76nv2id";
+  };
+
+  goDeps = ./deps.nix;
+
+  postPatch = ''
+    # Replace local imports so that go tools do not trip on them
+    find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Userspace Go implementation of WireGuard";
+    homepage = https://git.zx2c4.com/wireguard-go/about/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ kirelagin ];
+    platforms = with platforms; linux ++ darwin ++ windows;
+  };
+}
diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix
new file mode 100644
index 000000000000..88381d5f207a
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-go/deps.nix
@@ -0,0 +1,30 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "2491c5de3490fced2f6cff376127c667efeed857";
+      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
new file mode 100644
index 000000000000..f34119893c48
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }:
+
+let
+  inherit (lib) optional optionalString;
+in
+
+stdenv.mkDerivation rec {
+  name = "wireguard-tools-${version}";
+  version = "0.0.20180514";
+
+  src = fetchzip {
+    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
+    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
+  };
+
+  preConfigure = "cd src";
+
+  buildInputs = optional stdenv.isLinux libmnl;
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "WITH_BASHCOMPLETION=yes"
+    "WITH_WGQUICK=yes"
+    "WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}"
+    "DESTDIR=$(out)"
+    "PREFIX=/"
+    "-C" "tools"
+  ];
+
+  buildPhase = "make tools";
+
+  postInstall = optionalString useSystemd ''
+    substituteInPlace $out/lib/systemd/system/wg-quick@.service \
+      --replace /usr/bin $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage     = https://www.wireguard.com/;
+    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
+    description  = " Tools for the WireGuard secure network tunnel";
+    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
+    license      = licenses.gpl2;
+    platforms    = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index e9dffa5dbfa9..4db350684bef 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "0k3vnlibv05wnn6qn3qjlcyj2s07di7zkmdnijd6cp1hfk76z2r5";
+    sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h";
   };
 
   nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6591968ed55b..7a12cc93aa35 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -295,6 +295,7 @@ mapAliases (rec {
   vorbisTools = vorbis-tools; # added 2016-01-26
   wineStaging = wine-staging; # added 2018-01-08
   winusb = woeusb; # added 2017-12-22
+  wireguard = wireguard-tools; # added 2018-05-19
   x11 = xlibsWrapper; # added 2015-09
   xbmc = kodi; # added 2018-04-25
   xbmcPlain = kodiPlain; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a012cfda52eb..e8b6f31be751 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -484,6 +484,7 @@ with pkgs;
 
   alacritty = callPackage ../applications/misc/alacritty {
     inherit (xorg) libXcursor libXxf86vm libXi;
+    inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL;
   };
 
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
@@ -683,6 +684,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
+  m-cli = callPackage ../os-specific/darwin/m-cli { };
+
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
   skhd = callPackage ../os-specific/darwin/skhd {
@@ -841,6 +844,8 @@ with pkgs;
 
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
+  blockhash = callPackage ../tools/graphics/blockhash { };
+
   bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
 
   libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
@@ -1460,6 +1465,8 @@ with pkgs;
     utillinux = utillinuxMinimal;
   };
 
+  antibody = callPackage ../shells/zsh/antibody { };
+  
   antigen = callPackage ../shells/zsh/antigen { };
 
   apparix = callPackage ../tools/misc/apparix { };
@@ -2968,6 +2975,8 @@ with pkgs;
 
   hping = callPackage ../tools/networking/hping { };
 
+  html-proofer = callPackage ../tools/misc/html-proofer { };
+
   htpdate = callPackage ../tools/networking/htpdate { };
 
   http-prompt = callPackage ../tools/networking/http-prompt { };
@@ -3160,7 +3169,7 @@ with pkgs;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
   jira-cli = callPackage ../development/tools/jira_cli { };
- 
+
   jl = haskellPackages.callPackage ../development/tools/jl { };
 
   jmespath = callPackage ../development/tools/jmespath { };
@@ -4012,6 +4021,8 @@ with pkgs;
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
+  nms = callPackage ../tools/misc/nms { };
+
   notify-desktop = callPackage ../tools/misc/notify-desktop {};
 
   nkf = callPackage ../tools/text/nkf {};
@@ -5498,6 +5509,8 @@ with pkgs;
 
   whois = callPackage ../tools/networking/whois { };
 
+  wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
+
   woff2 = callPackage ../development/web/woff2 { };
 
   woof = callPackage ../tools/misc/woof { };
@@ -5712,6 +5725,8 @@ with pkgs;
 
   wipe = callPackage ../tools/security/wipe { };
 
+  wireguard-go = callPackage ../tools/networking/wireguard-go { };
+
   wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
     overrideDerivation = lib.overrideDerivation;
   };
@@ -15636,6 +15651,8 @@ with pkgs;
 
   ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { };
 
+  gauche = callPackage ../development/interpreters/gauche { };
+
   gcal = callPackage ../applications/misc/gcal { };
 
   geany = callPackage ../applications/editors/geany { };
@@ -18410,8 +18427,6 @@ with pkgs;
     erlang = erlangR18;
   };
 
-  wireguard = callPackage ../os-specific/linux/wireguard { };
-
   alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
 
   wllvm = callPackage  ../development/tools/wllvm { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bce2662abfd1..e46888992f77 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -215,6 +215,8 @@ let
 
     dtoa = callPackage ../development/ocaml-modules/dtoa { };
 
+    earley = callPackage ../development/ocaml-modules/earley { };
+
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
     eliom = callPackage ../development/ocaml-modules/eliom { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2ac3ad985ce..be41d5eef493 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5983,6 +5983,8 @@ in {
 
   geopandas = callPackage ../development/python-modules/geopandas { };
 
+  geojson = callPackage ../development/python-modules/geojson { };
+
   gevent-websocket = buildPythonPackage rec {
     name = "gevent-websocket-0.9.3";