From d06b547cc00932dc836d1876c2ac15aaf62f3940 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Mon, 2 Apr 2018 11:04:53 +0100
Subject: [PATCH 01/46] znc: add uriPrefix option

Allows the ZNC web interface to be hosted behind a reverse proxy as a
subdirectory.

https://wiki.znc.in/Reverse_Proxy#As_subdirectory
---
 nixos/modules/services/networking/znc.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 72313ab2ee14..149c9a4cb9ef 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -36,6 +36,7 @@ let
             IPv4 = true
             IPv6 = true
             SSL = ${boolToString confOpts.useSSL}
+            ${lib.optionalString (confOpts.uriPrefix != null) "URIPrefix = ${confOpts.uriPrefix}"}
     </Listener>
 
     <User ${confOpts.userName}>
@@ -310,6 +311,16 @@ in
           '';
         };
 
+        uriPrefix = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          example = "/znc/";
+          description = ''
+            An optional URI prefix for the ZNC web interface. Can be
+            used to make ZNC available behind a reverse proxy.
+          '';
+        };
+
         extraZncConf = mkOption {
           default = "";
           type = types.lines;

From 8100691b3e5d24618f691c6aef25d6685f273556 Mon Sep 17 00:00:00 2001
From: qoli <qoli@protonmail.com>
Date: Mon, 18 Jun 2018 16:47:16 -0700
Subject: [PATCH 02/46] Cryptsetup: 2.0.2 -> 2.0.3. Also, add upstream
 libressl-2.7 patch.

---
 pkgs/os-specific/linux/cryptsetup/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 4a64154b585d..e1da0a449c5b 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchurl, devicemapper, json_c, openssl, libuuid, pkgconfig, popt
+{ stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt
 , enablePython ? false, python2 ? null }:
 
 assert enablePython -> python2 != null;
 
 stdenv.mkDerivation rec {
-  name = "cryptsetup-2.0.2";
+  name = "cryptsetup-2.0.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz";
-    sha256 = "15wyjfgcqjf0wy5gxnmjj8aah33csv5v6n1hv9c8sxdzygbhb0ag";
+    sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d";
   };
 
+  patches = [
+    # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated.
+    (fetchpatch {
+      url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch";
+      sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m";
+    })
+  ];
+
   NIX_LDFLAGS = "-lgcc_s";
 
   configureFlags = [

From e57fd11bb4c74ac858184611240f295ab7043d52 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <gabriel@awakenetworks.com>
Date: Tue, 3 Jul 2018 09:25:15 -0700
Subject: [PATCH 03/46] Add `pkgs.haskell.lib.readDirectory` utility

This adds a `readDirectory` utility that can be used to "slurp" a directory
full of `cabal2nix`-generated files and transform them into a Haskell package
override set.  The main use of this is so that users don't have to write:

```
{ overrides = self: super: {
    foo = self.callPackage ./path/to/foo.nix { };

    bar = self.callPackage ./path/to/bar.nix { };

    ...
  };
}
```

Instead, they can write:

```
{ overrides = pkgs.haskell.lib.readDirectory ./path/to;
}
```

This is a an alternative to `packageSourceOverrides` which primarily addresses
the following use cases:

* The desired package is not yet available in `all-cabal-hashes` (perhaps the
  user is pinned to an older revision of `nixpkgs`)
* The default `cabal2nix` invocation used by `packageSourceOverrides`
  does not use the desired `cabal2nix` flags
* The user wants to avoid the use of import-from-derivation
---
 pkgs/development/haskell-modules/lib.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index fb1302f60ea5..8a5ed7d4e948 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -382,4 +382,23 @@ rec {
           allPkgconfigDepends;
       };
 
+  # Utility to convert a directory full of `cabal2nix`-generated files into a
+  # package override set
+  #
+  # readDirectory : Directory -> HaskellPackageOverrideSet
+  readDirectory =
+    directory:
+
+    self: super:
+      let
+        haskellPaths = builtins.attrNames (builtins.readDir directory);
+
+        toKeyVal = file: {
+          name  = builtins.replaceStrings [ ".nix" ] [ "" ] file;
+
+          value = self.callPackage (directory + "/${file}") { };
+        };
+
+      in
+        builtins.listToAttrs (map toKeyVal haskellPaths);
 }

From 8dae83157b42e79aac8f45cfbf0c27c4f67b5ec9 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <gabriel@awakenetworks.com>
Date: Tue, 3 Jul 2018 17:44:19 -0700
Subject: [PATCH 04/46] Change `readDirectory` to accept an attribute set

... as suggested by @roberth
---
 pkgs/development/haskell-modules/lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 8a5ed7d4e948..f5713b6cd202 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -387,7 +387,7 @@ rec {
   #
   # readDirectory : Directory -> HaskellPackageOverrideSet
   readDirectory =
-    directory:
+    { directory }:
 
     self: super:
       let

From 2c55c157bda5c28d0a430bd37d01989e7e151e27 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Wed, 4 Jul 2018 08:22:20 -0700
Subject: [PATCH 05/46] Rename `readDirectory` to `packagesFromDirectory`

... as suggested by @roberth
---
 pkgs/development/haskell-modules/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index f5713b6cd202..289fa4b77363 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -385,8 +385,8 @@ rec {
   # Utility to convert a directory full of `cabal2nix`-generated files into a
   # package override set
   #
-  # readDirectory : Directory -> HaskellPackageOverrideSet
-  readDirectory =
+  # packagesFromDirectory : Directory -> HaskellPackageOverrideSet
+  packagesFromDirectory =
     { directory }:
 
     self: super:

From 5012ce727ab54d7fe02ae730011d3160ab3743a0 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Thu, 5 Jul 2018 16:36:27 +0100
Subject: [PATCH 06/46] dwarf-fortress: Init TWBT at 6.46

---
 pkgs/games/dwarf-fortress/default.nix         |  2 +
 pkgs/games/dwarf-fortress/dfhack/default.nix  | 70 +++++++++++--------
 pkgs/games/dwarf-fortress/twbt/default.nix    | 35 ++++++++++
 pkgs/games/dwarf-fortress/wrapper/default.nix |  7 ++
 4 files changed, 83 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/games/dwarf-fortress/twbt/default.nix

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index b959ea3eda73..f0dd7f08020f 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -31,6 +31,8 @@ let
 
     legends-browser = callPackage ./legends-browser {};
 
+    twbt = callPackage ./twbt {};
+
     themes = callPackage ./themes {
       stdenv = stdenvNoCC;
     };
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index a6430fa3c260..3acd556e80cc 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, hostPlatform, lib, fetchFromGitHub, cmake, writeScriptBin, callPackage
+{ stdenv, buildEnv, hostPlatform, lib, fetchurl, fetchFromGitHub, cmake, writeScriptBin, callPackage
 , perl, XMLLibXML, XMLLibXSLT, zlib
 , enableStoneSense ? false,  allegro5, libGLU_combined
+, enableTWBT ? true, twbt
 , SDL
 }:
 
@@ -33,40 +34,47 @@ let
     fi
   '';
 
-in stdenv.mkDerivation rec {
+  dfhack = stdenv.mkDerivation rec {
+    name = "dfhack-base-${version}";
+
+    # Beware of submodules
+    src = fetchFromGitHub {
+      owner = "DFHack";
+      repo = "dfhack";
+      sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm";
+      rev = version;
+      fetchSubmodules = true;
+    };
+
+    nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
+    # We don't use system libraries because dfhack needs old C++ ABI.
+    buildInputs = [ zlib SDL ]
+               ++ lib.optionals enableStoneSense [ allegro5 libGLU_combined ];
+
+    preConfigure = ''
+      # Trick build system into believing we have .git
+      mkdir -p .git/modules/library/xml
+      touch .git/index .git/modules/library/xml/index
+    '';
+
+    preBuild = ''
+      export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
+    '';
+
+    cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ]
+              ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ];
+
+    enableParallelBuilding = true;
+  };
+in
+
+buildEnv {
   name = "dfhack-${version}";
 
-  # Beware of submodules
-  src = fetchFromGitHub {
-    owner = "DFHack";
-    repo = "dfhack";
-    sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm";
-    rev = version;
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
-  # We don't use system libraries because dfhack needs old C++ ABI.
-  buildInputs = [ zlib SDL ]
-             ++ lib.optionals enableStoneSense [ allegro5 libGLU_combined ];
-
-  preConfigure = ''
-    # Trick build system into believing we have .git
-    mkdir -p .git/modules/library/xml
-    touch .git/index .git/modules/library/xml/index
-  '';
-
-  preBuild = ''
-    export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
-  '';
-
-  cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ]
-            ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ];
-
-  enableParallelBuilding = true;
-
   passthru = { inherit version dfVersion; };
 
+  paths = [ dfhack ] ++ lib.optionals enableTWBT [ twbt.lib ];
+
   meta = with stdenv.lib; {
     description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";
     homepage = https://github.com/DFHack/dfhack/;
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
new file mode 100644
index 000000000000..c262ae6572fa
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -0,0 +1,35 @@
+{ stdenvNoCC, fetchurl, unzip }:
+
+
+stdenvNoCC.mkDerivation rec {
+  name = "twbt-${version}";
+  version = "6.46";
+  dfVersion = "0.44.10";
+
+  src = fetchurl {
+    url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
+    sha256 = "1a4k26z5n547k5j3ij2kx834963rc8vwgwcmbmzmhi893bryb1k6";
+  };
+
+  sourceRoot = ".";
+
+  outputs = [ "lib" "art" "out" ];
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $lib/hack/{plugins,lua} $art/data/art
+    cp -a */twbt.plug.so $lib/hack/plugins/
+    cp -a *.lua $lib/hack/lua/
+    cp -a *.png $art/data/art/
+  '';
+
+  
+  meta = with stdenvNoCC.lib; {
+    description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface.";
+    maintainers = with maintainers; [ Baughn ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+    homepage = https://github.com/mifki/df-twbt;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 9b171fc88b76..0db6ac619633 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -2,6 +2,7 @@
 , enableDFHack ? false, dfhack
 , enableSoundSense ? false, soundSense, jdk
 , enableStoneSense ? false
+, enableTWBT ? false, twbt
 , themes ? {}
 , theme ? null
 }:
@@ -9,6 +10,7 @@
 let
   dfhack_ = dfhack.override {
     inherit enableStoneSense;
+    inherit enableTWBT;
   };
 
   ptheme =
@@ -16,10 +18,15 @@ let
     then builtins.getAttr theme themes
     else theme;
 
+  twbtOnlyWithDFHack = assert (enableDFHack || !enableTWBT); true;
+
+  unBool = b: if b then "YES" else "NO";
+
   # These are in inverse order for first packages to override the next ones.
   themePkg = lib.optional (theme != null) ptheme;
   pkgs = lib.optional enableDFHack dfhack_
          ++ lib.optional enableSoundSense soundSense
+         ++ lib.optional enableTWBT twbt.art
          ++ [ dwarf-fortress-original ];
 
   env = buildEnv {

From b0c7245ee5ea9a93b9bdd2896c90fe822edb0596 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Thu, 5 Jul 2018 20:09:03 +0100
Subject: [PATCH 07/46] dwarf-fortress: Add "lazy pack", config flags and some
 comments.

---
 pkgs/games/dwarf-fortress/default.nix         | 27 ++++++++++++--
 pkgs/games/dwarf-fortress/lazy-pack.nix       | 36 +++++++++++++++++++
 pkgs/games/dwarf-fortress/twbt/default.nix    |  6 ++--
 pkgs/games/dwarf-fortress/wrapper/default.nix | 19 +++++++++-
 4 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/games/dwarf-fortress/lazy-pack.nix

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index f0dd7f08020f..bfb22aa3a3d1 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,9 +1,32 @@
-{ pkgs, stdenv, stdenvNoCC, gccStdenv }:
+{ pkgs, stdenv, stdenvNoCC, buildEnv, gccStdenv }:
+
+# To whomever it may concern:
+#
+# This directory menaces with spikes of Nix code. It is terrifying.
+#
+# If this is your first time here, you should probably install the dwarf-fortress-full package,
+# for instance with `environment.systempackages = [ pkgs.dwarf-fortress.dwarf-fortress-full ];`.
+#
+# You can adjust its settings by using override, or compile your own package by
+# using the other packages here. Take a look at lazy-pack.nix to get an idea of
+# how.
+#
+# You will find the configuration files in ~/.local/share/df_linux/data/init. If
+# you un-symlink them and edit, then the scripts will avoid overwriting your
+# changes on later launches, but consider extending the wrapper with your
+# desired options instead.
+#
+# Although both dfhack and dwarf therapist are included in the lazy pack, you
+# can only use one at a time. DFHack does have therapist-like features, so this
+# may or may not be a problem.
 
 let
   callPackage = pkgs.newScope self;
 
   self = rec {
+
+    dwarf-fortress-full = callPackage ./lazy-pack.nix { };
+
     dwarf-fortress-original = callPackage ./game.nix { };
 
     dfhack = callPackage ./dfhack {
@@ -13,7 +36,7 @@ let
 
     soundSense = callPackage ./soundsense.nix { };
 
-    # unfuck is linux-only right now, we will just use it there
+    # unfuck is linux-only right now, we will only use it there.
     dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
                                  else null;
 
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
new file mode 100644
index 000000000000..3aa9e573f61d
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -0,0 +1,36 @@
+{ stdenvNoCC, lib, buildEnv, callPackage
+, dwarf-fortress, themes
+  # This package should, at any given time, provide an opinionated "optimal"
+  # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and
+  # should contain every utility available.
+, enableDFHack ? stdenvNoCC.isLinux
+, enableTWBT ? enableDFHack
+, enableSoundSense ? true
+, enableStoneSense ? false  # StoneSense is currently broken.
+, enableDwarfTherapist ? true, dwarf-therapist
+, enableLegendsBrowser ? true, legends-browser
+, theme ? themes.phoebus
+# General config options:
+, enableIntro ? true
+, enableTruetype ? true
+, enableFPS ? false
+}:
+
+buildEnv {
+  name = "dwarf-fortress-full";
+  paths = [
+    (dwarf-fortress.override {
+      inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme
+              enableIntro enableTruetype enableFPS;
+    })]
+    ++ lib.optional enableDwarfTherapist dwarf-therapist
+    ++ lib.optional enableLegendsBrowser legends-browser;
+
+  meta = with stdenvNoCC.lib; {
+    description = "An opinionated wrapper for Dwarf Fortress";
+    maintainers = with maintainers; [ Baughn ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    homepage = https://github.com/NixOS/nixpkgs/;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index c262ae6572fa..b56170e5229a 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -3,12 +3,12 @@
 
 stdenvNoCC.mkDerivation rec {
   name = "twbt-${version}";
-  version = "6.46";
-  dfVersion = "0.44.10";
+  version = "6.49";
+  dfVersion = "0.44.11";
 
   src = fetchurl {
     url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
-    sha256 = "1a4k26z5n547k5j3ij2kx834963rc8vwgwcmbmzmhi893bryb1k6";
+    sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 0db6ac619633..e58169484987 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -5,6 +5,10 @@
 , enableTWBT ? false, twbt
 , themes ? {}
 , theme ? null
+# General config options:
+, enableIntro ? true
+, enableTruetype ? true
+, enableFPS ? false
 }:
 
 let
@@ -36,11 +40,24 @@ let
     pathsToLink = [ "/" "/hack" "/hack/scripts" ];
     ignoreCollisions = true;
 
-    postBuild = lib.optionalString enableDFHack ''
+    postBuild = ''
+      # De-symlink init.txt
+      cp $out/data/init/init.txt init.txt
+      rm $out/data/init/init.txt
+      mv init.txt $out/data/init/init.txt
+    '' + lib.optionalString enableDFHack ''
       rm $out/hack/symbols.xml
       substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
         --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
                   $(cat ${dwarf-fortress-original}/hash.md5)
+    '' + lib.optionalString enableTWBT ''
+      substituteInPlace $out/data/init/init.txt \
+        --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
+    '' + ''
+      substituteInPlace $out/data/init/init.txt \
+        --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
+        --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
+        --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
     '';
   };
 in

From aba6a3d7f40d193661c20f723414dcd19a7d768d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jul 2018 00:12:38 -0400
Subject: [PATCH 08/46] dwarf-fortress: use fetchFromGitHub directly

This avoids creating a second derivation to copy things from the
original. The new themes are now fixed output.
---
 pkgs/games/dwarf-fortress/themes/default.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 90f46d052618..5caaa9e05ca5 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -4,18 +4,12 @@ with builtins;
 
 listToAttrs (map (v: {
   inherit (v) name;
-  value = stdenv.mkDerivation {
+  value = fetchFromGitHub {
     name = "${v.name}-${v.version}";
-    src = fetchFromGitHub {
-      owner = "DFgraphics";
-      repo = v.name;
-      rev = v.version;
-      sha256 = v.sha256;
-    };
-    installPhase = ''
-      mkdir -p $out
-      cp -r data raw $out
-    '';
+    owner = "DFgraphics";
+    repo = v.name;
+    rev = v.version;
+    sha256 = v.sha256;
     meta = with lib; {
       platforms = platforms.all;
       maintainers = [ maintainers.matthewbauer ];

From 637fcd4c5b28e2c3459e20398ed9310c9ff3fbc0 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 6 Jul 2018 13:03:56 +0200
Subject: [PATCH 09/46] pkgs.haskell.lib.packagesFromDirectory: forward
 compatibility

Add `...` for less painful downgrades in the future
---
 pkgs/development/haskell-modules/lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 289fa4b77363..b730ef9b2ed7 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -387,7 +387,7 @@ rec {
   #
   # packagesFromDirectory : Directory -> HaskellPackageOverrideSet
   packagesFromDirectory =
-    { directory }:
+    { directory, ... }:
 
     self: super:
       let

From 656335cd8bd4b09868180a7f87976525d94f95f6 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Thu, 5 Jul 2018 18:21:07 +0200
Subject: [PATCH 10/46] linux: Temporary fix for issue #42755

Fix a serious issue with the xen-netfront driver introduced in
upstream commit f599c64fdf7d ("xen-netfront: Fix race between device
setup and open") where the MTU of the device cannot be set
properly. This should be removed once it's included in upstream.
---
 pkgs/os-specific/linux/kernel/patches.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix           | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 69495e5fc439..e0826aaa9d48 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -59,4 +59,24 @@ rec {
     };
   };
 
+  # https://github.com/NixOS/nixpkgs/issues/42755
+  xen-netfront_fix_mismatched_rtnl_unlock = rec {
+    name = "xen-netfront_fix_mismatched_rtnl_unlock";
+    patch = fetchpatch {
+      name = name + ".patch";
+      url = https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch;
+      sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8";
+    };
+  };
+
+  # https://github.com/NixOS/nixpkgs/issues/42755
+  xen-netfront_update_features_after_registering_netdev = rec {
+    name = "xen-netfront_update_features_after_registering_netdev";
+    patch = fetchpatch {
+      name = name + ".patch";
+      url = https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch;
+      sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
+    };
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f7b57295566..b054048be438 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13688,6 +13688,11 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
         kernelPatches.modinst_arg_list_too_long
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -13696,6 +13701,11 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -13706,6 +13716,11 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -13717,6 +13732,11 @@ with pkgs;
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
         kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
+        # https://github.com/NixOS/nixpkgs/issues/42755
+        # Remove these xen-netfront patches once they're included in
+        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
+        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
+        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 

From 05ca67107a42c3b5f545337823e3829f1dbb1deb Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Sat, 7 Jul 2018 15:23:03 -0700
Subject: [PATCH 11/46] Fix type signature

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

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index b730ef9b2ed7..c9dc7254800e 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -385,7 +385,7 @@ rec {
   # Utility to convert a directory full of `cabal2nix`-generated files into a
   # package override set
   #
-  # packagesFromDirectory : Directory -> HaskellPackageOverrideSet
+  # packagesFromDirectory : { directory : Directory, ... } -> HaskellPackageOverrideSet
   packagesFromDirectory =
     { directory, ... }:
 

From 4ea0930f7162d1d95ddcf990beb746e655a40fc6 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 7 Jul 2018 17:38:11 -0400
Subject: [PATCH 12/46] vscode-extensions.ms-python.python: 0.8.0 -> 2018.6.0

---
 pkgs/misc/vscode-extensions/python/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 430ce192ed0d..41db2c1fcea3 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, vscode-utils
 
-, pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified. 
+, pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified.
                                   # Use version from `PATH` for default setting otherwise.
                                   # Defaults to `false` as we expect it to be project specific most of the time.
-, ctagsUseFixed ? true, ctags     # When `true`, the ctags default setting will be fixed to specified. 
+, ctagsUseFixed ? true, ctags     # When `true`, the ctags default setting will be fixed to specified.
                                   # Use version from `PATH` for default setting otherwise.
                                   # Defaults to `true` as usually not defined on a per projet basis.
 }:
@@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "0.8.0";
-    sha256 = "0i7s93l5g5lyi6vn77zh3ipj0p267y17fayv6vjrxc2igrs27ik6";
+    version = "2018.6.0";
+    sha256 = "a157399b45b40caa9e0b3432eaf3e7444ee4cb91497c139bcb740d42d61f9ae8";
   };
 
   postPatch = ''

From a2986ad883915b008abc01ec81f7902143c8712c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 7 Jul 2018 17:40:13 -0400
Subject: [PATCH 13/46] vscode-extensions.ms-vscode.cpptools: 0.16.1 -> 0.17.6

---
 pkgs/misc/vscode-extensions/cpptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index c29611c0c662..6cec206b73a4 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -67,8 +67,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.16.1";
-    sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3";
+    version = "0.17.6";
+    sha256 = "2625be8b922ffc199e1c776f784d39b6e004523212f7956c93ae40f9040ce6d5";
   };
 
   buildInputs = [

From 563575edb23744b9b85c34c27dccbfab35da13bf Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 8 Jul 2018 22:52:33 +0200
Subject: [PATCH 14/46] gf2x: 1.1 -> 1.2

---
 pkgs/development/libraries/gf2x/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index 1a449f57be7f..0d0fa0b2ca5d 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -1,18 +1,19 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   name = "gf2x-${version}";
-  version = "1.1";
+  version = "1.2";
 
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz";
-    sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd";
+    # find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/
+    url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-1.2.tar.gz";
+    sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = ''Routines for fast arithmetic in GF(2)[x]'';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = ["x86_64-linux"];
+    homepage = http://gf2x.gforge.inria.fr;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
   };
 }

From 218d4dc154faca85c5e0024c6ab7bf2d1ddac0a5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 22 Dec 2017 16:05:33 -0500
Subject: [PATCH 15/46] make-derivation: Don't add host-suffix to fixed-output
 derivations names

Not only does the suffix unnecessarily reduce sharing, but it also breaks
unpacker setup hooks (e.g. that of `unzip`) which identify interesting tarballs
using the file extension.

This also means we can get rid of the splicing hacks for fetchers.
---
 pkgs/stdenv/generic/make-derivation.nix | 13 +++++++++++--
 pkgs/top-level/splice.nix               |  9 ++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index dce715a6a53e..778f107f71e1 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -77,8 +77,13 @@ rec {
 
     , ... } @ attrs:
 
-    # TODO(@Ericson2314): Make this more modular, and not O(n^2).
     let
+      fixedOutputDrv = attrs ? outputHash;
+      noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated
+                                      ++ depsHostHost ++ depsHostHostPropagated
+                                      ++ buildInputs ++ propagatedBuildInputs
+                                      ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
+      runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps;
       supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
       defaultHardeningFlags = lib.remove "pie" supportedHardeningFlags;
       enabledHardeningOptions =
@@ -168,7 +173,11 @@ rec {
           # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
           # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
           name = assert validity.handled; name + lib.optionalString
-            (stdenv.hostPlatform != stdenv.buildPlatform)
+            # Fixed-output derivations like source tarballs shouldn't get a host
+            # suffix. But we have some weird ones with run-time deps that are
+            # just used for their side-affects. Those might as well since the
+            # hash can't be the same. See #32986.
+            (stdenv.hostPlatform != stdenv.buildPlatform && runtimeSensativeIfFixedOutput)
             ("-" + stdenv.hostPlatform.config);
 
           builder = attrs.realBuilder or stdenv.shell;
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 1fde08d1d48b..078075323dd0 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -31,13 +31,8 @@ let
     then defaultBuildHostScope
     else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope;
   defaultHostHostScope = {}; # unimplemented
-  # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing
-  # these attributes. We should have a more general solution for selecting
-  # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`.
-  pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs;
-  targetPkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs.targetPackages;
-  defaultHostTargetScope = pkgsWithoutFetchers // pkgs.xorg;
-  defaultTargetTargetScope = targetPkgsWithoutFetchers // targetPkgsWithoutFetchers.xorg or {};
+  defaultHostTargetScope = pkgs // pkgs.xorg;
+  defaultTargetTargetScope = pkgs.targetPackages // pkgs.targetPackages.xorg or {};
 
   splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget:
             pkgsHostHost: pkgsHostTarget:

From 58021b77a08a92c2aeb26a110d0017367ec48954 Mon Sep 17 00:00:00 2001
From: Kim Ingmar Ferenc ALLAMANDOLA <kim@kfx.fr>
Date: Sat, 7 Jul 2018 08:38:05 +0200
Subject: [PATCH 16/46] nilfs-utils: force enable limbount support

https://discourse.nixos.org/t/how-to-contribute-send-bugreport-without-github-account/475
https://nilfs.sourceforge.io/en/faq.html
---
 pkgs/tools/filesystems/nilfs-utils/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index 5bce33065192..6b56a8aadfa0 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, libuuid, libselinux }:
-let 
+let
   sourceInfo = rec {
     version = "2.2.7";
     url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2";
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  configureFlags = [ "--with-libmount" ];
+
   # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv
   # still doesn't use it
   #

From 0299641c91f55a9d1687a4e1e6e9c6759187caeb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 25 Jun 2018 15:03:59 -0400
Subject: [PATCH 17/46] haskell generic-builder: Make test and benchmark tool
 depends `nativeBuildInputs`

This was reverted in 6e07a3a19a56b27446fb78b3213ea1d6534d1c99 with the
other commits in the PR, as the number of overrides added in that PR was deemed
excessive. But this commit adds no overrides, and is valuable on its
own, so I am adding it back.

(cherry picked from commit 359e0ce4bb084a07a39fa369a0121a2f997548a3)
---
 pkgs/development/haskell-modules/generic-builder.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 9ac88dca83e3..d1304c796949 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -182,12 +182,14 @@ let
   depsBuildBuild = [ nativeGhc ];
   nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
                       setupHaskellDepends ++
-                      buildTools ++ libraryToolDepends ++ executableToolDepends;
+                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
+                      optionals doCheck testToolDepends ++
+                      optionals doBenchmark benchmarkToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
                      allPkgconfigDepends ++
-                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++
-                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends);
+                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++
+                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
 
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 

From 48ccdf322d9e7a68d0caf5833511ee3e53ec7d3a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 6 Jul 2018 16:17:54 -0400
Subject: [PATCH 18/46] lib: Use lib.fixed-points.extends to avoid repetition

---
 lib/customisation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index d942f54ee798..9017319420c8 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -202,7 +202,7 @@ rec {
           callPackage = self.newScope {};
           overrideScope = g:
             makeScope newScope
-            (self_: let super = f self_; in super // g super self_);
+            (lib.fixed-points.extends f g);
           packages = f;
         };
     in self;

From 0eb142cd46e8a46eb61fe41e1b916ffe0ec3e0ba Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 5 Jul 2018 20:19:07 -0400
Subject: [PATCH 19/46] top-level: Expose `splicePackages` for `newScope` users

Otherwise extra packages in scope can't be made to work for cross. As
much as I think splicing is an evil trick, I think it's best to do this
and at least have it work consistently for now.

It would seems simpler to expose a `newScopeWithSplicing`, but there's a
few attrs (like `buildPackages` or `buildHaskellPackages`) that
shouldn't be spliced. Users should instead splice, override the splicing
on those packages, and apply `newScope` to that.
---
 pkgs/top-level/splice.nix | 66 ++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 078075323dd0..9f5acd0a7de7 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -34,9 +34,10 @@ let
   defaultHostTargetScope = pkgs // pkgs.xorg;
   defaultTargetTargetScope = pkgs.targetPackages // pkgs.targetPackages.xorg or {};
 
-  splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget:
-            pkgsHostHost: pkgsHostTarget:
-            pkgsTargetTarget: let
+  spliceReal = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+               , pkgsHostHost, pkgsHostTarget
+               , pkgsTargetTarget
+               }: let
     mash =
       # Other pkgs sets
       pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget
@@ -50,7 +51,7 @@ let
         valueBuildBuild = pkgsBuildBuild.${name} or {};
         valueBuildHost = pkgsBuildHost.${name} or {};
         valueBuildTarget = pkgsBuildTarget.${name} or {};
-        valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splicer.";
+        valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splice.";
         valueHostTarget = pkgsHostTarget.${name} or {};
         valueTargetTarget = pkgsTargetTarget.${name} or {};
         augmentedValue = defaultValue
@@ -77,38 +78,51 @@ let
       in
         # The derivation along with its outputs, which we recur
         # on to splice them together.
-        if lib.isDerivation defaultValue then augmentedValue // splicer
-          (tryGetOutputs valueBuildBuild) (tryGetOutputs valueBuildHost) (tryGetOutputs valueBuildTarget)
-          (tryGetOutputs valueHostHost) (getOutputs valueHostTarget)
-          (tryGetOutputs valueTargetTarget)
+        if lib.isDerivation defaultValue then augmentedValue // spliceReal {
+          pkgsBuildBuild = tryGetOutputs valueBuildBuild;
+          pkgsBuildHost = tryGetOutputs valueBuildHost;
+          pkgsBuildTarget = tryGetOutputs valueBuildTarget;
+          pkgsHostHost = tryGetOutputs valueHostHost;
+          pkgsHostTarget = getOutputs valueHostTarget;
+          pkgsTargetTarget = tryGetOutputs valueTargetTarget;
         # Just recur on plain attrsets
-        else if lib.isAttrs defaultValue then splicer
-          valueBuildBuild valueBuildHost valueBuildTarget
-          {} valueHostTarget
-          valueTargetTarget
+        } else if lib.isAttrs defaultValue then spliceReal {
+          pkgsBuildBuild = valueBuildBuild;
+          pkgsBuildHost = valueBuildHost;
+          pkgsBuildTarget = valueBuildTarget;
+          pkgsHostHost = {};
+          pkgsHostTarget = valueHostTarget;
+          pkgsTargetTarget = valueTargetTarget;
         # Don't be fancy about non-derivations. But we could have used used
         # `__functor__` for functions instead.
-        else defaultValue;
+        } else defaultValue;
     };
   in lib.listToAttrs (map merge (lib.attrNames mash));
 
-  splicedPackages =
-    if actuallySplice
-    then
-      splicer
-        defaultBuildBuildScope defaultBuildHostScope defaultBuildTargetScope
-        defaultHostHostScope defaultHostTargetScope
-        defaultTargetTargetScope
-      // {
-        # These should never be spliced under any circumstances
-        inherit (pkgs) pkgs buildPackages targetPackages
-          buildPlatform targetPlatform hostPlatform;
-      }
-    else pkgs // pkgs.xorg;
+  splicePackages = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+                   , pkgsHostHost, pkgsHostTarget
+                   , pkgsTargetTarget
+                   } @ args:
+    if actuallySplice then spliceReal args else pkgsHostTarget;
+
+  splicedPackages = splicePackages {
+    pkgsBuildBuild = defaultBuildBuildScope;
+    pkgsBuildHost = defaultBuildHostScope;
+    pkgsBuildTarget = defaultBuildTargetScope;
+    pkgsHostHost = defaultHostHostScope;
+    pkgsHostTarget = defaultHostTargetScope;
+    pkgsTargetTarget = defaultTargetTargetScope;
+  } // {
+    # These should never be spliced under any circumstances
+    inherit (pkgs) pkgs buildPackages targetPackages
+      buildPlatform targetPlatform hostPlatform;
+  };
 
 in
 
 {
+  inherit splicedPackages;
+
   # We use `callPackage' to be able to omit function arguments that can be
   # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use
   # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).

From 131e9f59e825aa3f1100619191a64d1e147ec263 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Jul 2018 17:15:33 +0000
Subject: [PATCH 20/46] ocamlPackages.ppx_tools_versioned: remove spurious
 dependency to camlp4

---
 .../ocaml-modules/ppx_tools_versioned/default.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 5d27dc35396c..363b774aaeba 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml-migrate-parsetree }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocaml-migrate-parsetree }:
 
-buildOcaml rec {
-  name = "ppx_tools_versioned";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_tools_versioned-${version}";
   version = "5.1";
 
-  minimumSupportedOcamlVersion = "4.02";
-
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "ppx_tools_versioned";
@@ -13,6 +11,8 @@ buildOcaml rec {
     sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624";
   };
 
+  buildInputs = [ ocaml findlib ];
+
   propagatedBuildInputs = [ ocaml-migrate-parsetree ];
 
   createFindlibDestdir = true;

From de1a8ddb3c58ef477940054224646c7ed550a7cd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Jul 2018 17:15:42 +0000
Subject: [PATCH 21/46] ocamlPackages.iri: init at 0.4.0

iri is an OCaml implementation of Internationalized Resource Identifiers
(IRIs).

Homepage: https://framagit.org/zoggy/ocaml-iri
---
 .../development/ocaml-modules/iri/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/iri/default.nix

diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix
new file mode 100644
index 000000000000..15f3a5613b55
--- /dev/null
+++ b/pkgs/development/ocaml-modules/iri/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitLab, ocaml, findlib
+, sedlex, uunf, uutf
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "iri is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "0.4.0";
+  name = "ocaml${ocaml.version}-iri-${version}";
+
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "zoggy";
+    repo = "ocaml-iri";
+    rev = version;
+    sha256 = "0fsmfmzmyggm0h77a7mb0n41vqi6q4ln1xzsv72zbvysa7l8w84q";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  propagatedBuildInputs = [ sedlex uunf uutf ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "IRI (RFC3987) native OCaml implementation";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a0e91a8e0932..fb51cb949442 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -321,6 +321,8 @@ let
 
     inifiles = callPackage ../development/ocaml-modules/inifiles { };
 
+    iri = callPackage ../development/ocaml-modules/iri { };
+
     jingoo = callPackage ../development/ocaml-modules/jingoo {
       pcre = ocaml_pcre;
     };

From d3a63b2b788aa2c9f5436953e7678032949240f2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 9 Jul 2018 19:31:15 +0200
Subject: [PATCH 22/46] calibre: 3.27.0 -> 3.27.1

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index c2ae98d71e7f..1aabbb587eb5 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.27.0";
+  version = "3.27.1";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1367fhgqynh6ic318wppv4m7343ghvdgazm4qq2jqli8y1gxdfbz";
+    sha256 = "0hmdlnwrfql2b675xmjf50hnnrrkv5jbky0ssdpyfjfa5vxya2bh";
   };
 
   patches = [

From cdd0ac7e5477602289ff8cee94930065e7bc570d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 5 Jul 2018 17:21:24 -0400
Subject: [PATCH 23/46] dwarf-fortress: support older versions as well

game.json now contains a dictionary of old game hashes. I have added
them for the last 3 releases.

- add script to generate hashes

  Makes it much easier to update game.json file.

- add updateScript meta

  This adds some info on the ./update.sh updateScript now available.

- cleanup updateScript

  - Add some more systems
  - Correctly detect source extensions (.zip or .tar.bz2)
  - Proper bash quoting

- fix update.sh

  - correctly detect latest df version
  - append to game.json instead of overwriting it

- update hashes for 44.12
---
 pkgs/games/dwarf-fortress/default.nix |  4 +-
 pkgs/games/dwarf-fortress/game.json   | 86 +++++++++++++++++++++++++++
 pkgs/games/dwarf-fortress/game.nix    | 58 +++++++++++-------
 pkgs/games/dwarf-fortress/update.sh   | 42 +++++++++++++
 4 files changed, 166 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/games/dwarf-fortress/game.json
 create mode 100755 pkgs/games/dwarf-fortress/update.sh

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index b959ea3eda73..480b36f34598 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -4,7 +4,9 @@ let
   callPackage = pkgs.newScope self;
 
   self = rec {
-    dwarf-fortress-original = callPackage ./game.nix { };
+    dwarf-fortress-original = callPackage ./game.nix {
+      dfVersion = "0.44.11";
+    };
 
     dfhack = callPackage ./dfhack {
       inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
diff --git a/pkgs/games/dwarf-fortress/game.json b/pkgs/games/dwarf-fortress/game.json
new file mode 100644
index 000000000000..05fb0cf50800
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/game.json
@@ -0,0 +1,86 @@
+{
+  "0.43.05": {
+    "linux": "1r0b96yrdf24m9476k5x7rmp3faxr0kfwwdf35agpvlb1qbi6v45",
+    "linux32": "16l1lydpkbnl3zhz4i2snmjk7pps8vmw3zv0bjgr8dncbsrycd03",
+    "osx": "1j2zdkjnmxy8yn599pm0qmbi4zjp1m8h4ggqjxhyzp135h0lqqf9",
+    "osx32": "09ym4mflp5z78pk5mvj7b44xihnsvrxmh0b5kix6h1m6z3cc90l4",
+    "win": "0m337wh4c47ij1f3zrimvy7baff7nzrmgjbmrwdy89d0z90xpnx8",
+    "win_s": "0bjk5m1qkn3ldhqiwbq24y2m9fz9r574d54ngdb8b4ri2xfl1fbp",
+    "win32": "162rl9ygpj66pis87bqc5bwc0mk75hxv6ianhn87pbl4rh7g8ax8",
+    "win32_s": "0gv1jyw5fdskjjs27pr41grbmkk7ipqn0ry615f5g79k3mhl200i",
+    "legacy": "09lvbmg1gq257qchlbmq7hxc5nl9r39jpf73zhmwb5xfbpprn0zs",
+    "legacy_s": "023a5b27fm65w7gmzjssyyci70fdjk2zbv965y4n0f23kc4rj9gl",
+    "legacy32": "1m75arxj1q82l2dkk8qcargm3xczxlqi8krwvg3iimddky34gipq",
+    "legacy32_s": "1hgzsk66isfr5vcraxwgl7cvycl14kwf8w9kzxr8jyp5z7k24q29"
+  },
+  "0.44.05": {
+    "linux": "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3",
+    "linux32": "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr",
+    "osx": "1ssc8vq3ad38x9c04j8gg96kxv0g2npi3jwcg40676byx5nrx7b6",
+    "osx32": "12i7x8idcbvp5h62jyc7b7j98jf4lrisnwglvnrms6jclj0b3g0q",
+    "win": "1kaifarjx0akg7s5a2ngfw0vm0vyr4jnax5rrbv96dliqn5knddz",
+    "win_s": "1a1xikrjdv4b0yfgnp5s8d6xn0njylynsqd8zixdc01vccl5kqm6",
+    "win32": "1j3cq0h7jdvxbsbpfxa7bli45smvy9m4fji0j6849kj7x0vcpwq4",
+    "win32_s": "10cw1n48ffkrv9ms07ka5b5370d9k2fm051cnnq03lkcvlwrq145",
+    "legacy": "0y7xpgmwn4nshhc7apyf8mj5ycl0q5vckdaviwzz6w1x31s3dp6n",
+    "legacy_s": "0j8rbw9ww1avmh8zhyzljjj6in87q4qffpffdl394fsi74n8px0d",
+    "legacy32": "0d3l4jvx53a01fjf1lf20ar9lfyykfhk05dlrfwz3w4k7vj4vvlf",
+    "legacy32_s": "1c5x9x44bblz7anhmk4y9a7p1b39b9k7gzvj4pi55jzfq0k60kl7"
+  },
+  "0.44.09": {
+    "linux": "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy",
+    "linux32": "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8",
+    "osx": "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs",
+    "osx32": "1iwlvmz1ir9k0kzn6726frmkznvsg9a99bbqnxvwcnq3nnnjxw3s",
+    "win": "08g5irgp59dfjgj3jxc8ixwzgnz2wghcl8cg1b1g4088dsf2x3x8",
+    "win_s": "1xyb4msn9wfrh7x136r8xn3sjz6z8c4zksbzifa0z0bpa3pdviap",
+    "win32": "0m8bs2mnyi1r4x84fwnfgd1ijdcf08xsq5zy84476svci932g5kz",
+    "win32_s": "0pl319qmyy96ibzlgj4wfj19dv1wzyg8ig6q11l4c7rivzc9286i",
+    "legacy": "0l8nrvppfzazhjsfkd5nd0bxnc6ljk8fs6yg8qh69g7q7zvzgnd3",
+    "legacy_s": "1c49z539a31czzq0rnhg6yrv1zbaja35sd0ssr4k7lsghjv84k1z",
+    "legacy32": "155xg6dpb8frlw7d9h7m1y0spw55wl4nkn7zrm70bpyp39pydlqp",
+    "legacy32_s": "05qkzjfx1ybrv96wya1dirdfxdkhj6a440sjpzwbqpkqgr8z57a3"
+  },
+  "0.44.10": {
+    "linux": "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2",
+    "linux32": "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n",
+    "osx": "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g",
+    "osx32": "0rsy1n19n12gh8rddgi3db32in488f2nizq8kw25hga03hsh4r6x",
+    "win": "04i0ka12hmn3chsyfmk2pbknr1pdf3p8yaz7kv82ri4g6dvsjfv6",
+    "win_s": "01m6nqcrz4rhdc8wb31azj3vmjid8bdpqaf9wkz4g4vvjyy7xiyz",
+    "win32": "1nymin8wbzbh8gm2702dy7h5spdijdxnysdz71ldyl0xx4vw68d9",
+    "win32_s": "1skz0jpfm6j9bins04kn96f3v3k0kvjqlh25x3129r3hh8xacnd3",
+    "legacy": "0s84vpfr2b5y1kda9allqjrpkaxw15mkblk9dq08syhsj19vspa7",
+    "legacy_s": "18b7ikp7xy2y071h3ydfh5mq9hw9y303rdqyikvra5ji3n5p96cm",
+    "legacy32": "1yh2fl3qwpy6wrxavhn75grbjygymnfh746hxbmc60la7y5flrpy",
+    "legacy32_s": "0j65w2hxgpccg9qsaz14r82qvnvfd0pbl2gyx9fv8d77kxhkc4pw"
+  },
+  "0.44.11": {
+    "linux": "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf",
+    "linux32": "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5",
+    "osx": "073hmcj7bm323m3xqi42605rkvmgmv83bnxz1byymgs8aqyfykkx",
+    "osx32": "0w5avnj86wprk8q0rb5qm9kxbigzk6dk0akqbw4m76jgg2jdmir7",
+    "win": "1yxyv1sycn5jc3g1y02d82154xydg3kbghis7l3xi28n3bh8387b",
+    "win_s": "1xzwl6c362wqgps911y9q8vndp8zyd20fc2p7pkzzmw2hrgfqi6q",
+    "win32": "16x2rg3gm3lh2akg7n057kkxxigb2ljz0nk685lmn4j0adq8l31p",
+    "win32_s": "1a2y220111d94mzj5y3jwpy062k8fw25akyp7yn3fwa17vwvn8zq",
+    "legacy": "0gfjmsfqj21hs4d1hm7fvppbdjspc4r2qnnp6mwcbgh67i5p5rdb",
+    "legacy_s": "1wr4hpzmhgl8haric3jpfd3kwqv1fi4vkb1gvaax5f7kplvfqfac",
+    "legacy32": "1cpzckwvqkxqn0c498mmh4papsjdi3mcvcp2vzlvj46kvdl3n0f0",
+    "legacy32_s": "024vzwfcrx7ms4dip0ccwd0vizzck2pwz2ryyvlz4rpjzhswj5gi"
+  },
+  "0.44.12": {
+    "win32": "0bxrc7zj4vgcgdwc130g6f5jnp13vgx9a2kn2l1jcc958x8a367g",
+    "linux32": "0fmr8diskmbh12s0bpfn5gky9lmrc7xxj6va5adjm6ahxv9jwr06",
+    "osx": "1md6r1pimmlhcn5gjqzg0ygbdwc2v125sfjy0f6gbfbykwcm7391",
+    "osx32": "1dbg7pavxw20r8iqc566fn558avgj5glsycvi6ggbvsh0rpw6n5v",
+    "win": "0zb5ximqi5j7vyvgjzfz7ycadh5sgb7jlyaa68x0sjlbybdr1min",
+    "win_s": "1ncf5zr1fggr5knf30l0wh7spp376v1jcc6m9c86zim8azcfx0y7",
+    "linux": "0ydr5lnysy45nsznqp5r2pysdqn3f0xkrkh9v9l1md111mriabas",
+    "win32_s": "1mxbjkikf010skrpng51r86jmv4nal51j5n1y9kyhv344bq6chr9",
+    "legacy": "11a212ynhx18p3k8hvdjx199din14wggxiwz191b4309fznzpprz",
+    "legacy_s": "05madj529y18ndxrih96mivbzng1vz2zbzicrcnj58i2084zm23f",
+    "legacy32": "0rapcydiic2nq6idjf7fg53xsxk8dxzyi1vflpz554ghdrnsmwjv",
+    "legacy32_s": "16fgbd3lx4r270dxqj6gr1g1iqjj8cv389h2hw1l646xx28g8d2m"
+  }
+}
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 97a94c940cd4..d1264cefe8cd 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -3,36 +3,44 @@
 
 # Our own "unfuck" libs for macOS
 , ncurses, fmodex, gcc
+
+, dfVersion
 }:
 
-with lib;
+with lib; with builtins;
 
 let
-  baseVersion = "44";
-  patchVersion = "11";
-  dfVersion = "0.${baseVersion}.${patchVersion}";
-
   libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
 
   homepage = http://www.bay12games.com/dwarves/;
 
+  # Map Dwarf Fortress platform names to Nixpkgs platform names.
   # Other srcs are avilable like 32-bit mac & win, but I have only
   # included the ones most likely to be needed by Nixpkgs users.
-  srcs = {
-    "x86_64-linux" = fetchurl {
-      url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
-      sha256 = "1qizfkxl2k6pn70is4vz94q4k55bc3pm13b2r6yqi6lw1cnna4sf";
-    };
-    "i686-linux" = fetchurl {
-      url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
-      sha256 = "11m39lfyrsxlw1g7f269q7fzwichg06l21fxhqzgvlvmzmxsf8q5";
-    };
-    "x86_64-darwin" = fetchurl {
-      url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
-      sha256 = "073hmcj7bm323m3xqi42605rkvmgmv83bnxz1byymgs8aqyfykkx";
-    };
+  platforms = {
+    "x86_64-linux" = "linux";
+    "i686-linux" = "linux32";
+    "x86_64-darwin" = "osx";
+    "i686-darwin" = "osx32";
+    "x86_64-cygwin" = "win";
+    "i686-cygwin" = "win32";
   };
 
+  dfVersionTriple = splitString "." dfVersion;
+  baseVersion = elemAt dfVersionTriple 1;
+  patchVersion = elemAt dfVersionTriple 2;
+
+  games = fromJSON (readFile ./game.json);
+  game = if hasAttr dfVersion games
+         then getAttr dfVersion games
+         else throw "Unknown Dwarf Fortress version: ${dfVersion}";
+  dfPlatform = if hasAttr stdenv.system platforms
+               then getAttr stdenv.system platforms
+               else throw "Unsupported system: ${stdenv.system}";
+  sha256 = if hasAttr dfPlatform game
+           then getAttr dfPlatform game
+           else throw "Unsupported dfPlatform: ${dfPlatform}";
+
 in
 
 assert dwarf-fortress-unfuck != null ->
@@ -41,9 +49,10 @@ assert dwarf-fortress-unfuck != null ->
 stdenv.mkDerivation {
   name = "dwarf-fortress-original-${dfVersion}";
 
-  src = if builtins.hasAttr stdenv.system srcs
-        then builtins.getAttr stdenv.system srcs
-        else throw "Unsupported systems";
+  src = fetchurl {
+    url = "${homepage}df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2";
+    inherit sha256;
+  };
 
   installPhase = ''
     mkdir -p $out
@@ -81,13 +90,16 @@ stdenv.mkDerivation {
     md5sum $exe | awk '{ print $1 }' > $out/hash.md5
   '';
 
-  passthru = { inherit baseVersion patchVersion dfVersion; };
+  passthru = {
+    inherit baseVersion patchVersion dfVersion;
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "A single-player fantasy game with a randomly generated adventure world";
     inherit homepage;
     license = licenses.unfreeRedistributable;
-    platforms = attrNames srcs;
+    platforms = attrNames platforms;
     maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/update.sh b/pkgs/games/dwarf-fortress/update.sh
new file mode 100755
index 000000000000..3db68122d358
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p jq nix coreutils curl
+
+# systems to generate hashes for
+systems='linux linux32 osx osx32
+	 win win_s win32 win32_s
+         legacy legacy_s legacy32 legacy32_s'
+
+if [ $# -eq 0 ]; then
+    versions="$(curl http://www.bay12games.com/dwarves/ \
+		   | grep 'DOWNLOAD DWARF FORTRESS' \
+		   | sed 's/.*DOWNLOAD DWARF FORTRESS \([0-9.]*\) .*/\1/')"
+else
+    versions="$@"
+fi
+
+tmp1="$(mktemp)"
+tmp2="$(mktemp)"
+for version in $versions; do
+    for system in $systems; do
+	echo -n $version,$system,
+	ver=$(echo $version | sed -e s,^0\.,, | tr . _)
+	if [[ "$system" = *win* ]] || [[ "$system" = *legacy* ]]; then
+	    ext=zip
+	else
+	    ext=tar.bz2
+	fi
+	nix-prefetch-url \
+	    http://www.bay12games.com/dwarves/df_${ver}_${system}.${ext}
+    done
+done | jq --slurp --raw-input \
+	  'split("\n")  | .[:-1] | map(split(",")) |
+           map({ "version": .[0], "platform": .[1], "sha256": .[2] }) |
+	   group_by(.version) |
+	   map(map({"version": .version, (.platform): .sha256}) | add |
+	       {(.version): .} | map_values(del(.version))) | add' \
+	  > "$tmp1"
+
+# Append $tmp1 to game.json. There should be a better way to handle
+# this but all other attempts failed for me.
+jq -M --argfile a "$tmp1" '. + $a' < "$(dirname "$0")/game.json" > "$tmp2"
+cat "$tmp2" > "$(dirname "$0")/game.json"

From 530427c7abc7ccff6d1310496c8e6a0362e331ab Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 8 Jul 2018 15:44:29 -0400
Subject: [PATCH 24/46] dwarf-fortress: refactors

This will make it easier for people to access old versions.

You can now access attributes like:

- dwarf-fortress_0_44_11
- dwarf-fortress_0_43_05
- etc.
---
 pkgs/games/dwarf-fortress/default.nix         | 37 +++++++++++--------
 .../dwarf-therapist/default.nix               |  5 ++-
 .../dwarf-therapist/wrapper.nix               | 19 +++++-----
 pkgs/games/dwarf-fortress/game.nix            | 11 +++---
 pkgs/games/dwarf-fortress/wrapper/default.nix | 16 ++++----
 5 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 480b36f34598..1924e0ac846f 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,12 +1,19 @@
-{ pkgs, stdenv, stdenvNoCC, gccStdenv }:
+{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib }:
 
 let
   callPackage = pkgs.newScope self;
 
-  self = rec {
-    dwarf-fortress-original = callPackage ./game.nix {
-      dfVersion = "0.44.11";
+  df-games = lib.listToAttrs (map (dfVersion: {
+    name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}";
+    value = callPackage ./wrapper {
+      inherit (self) themes;
+      dwarf-fortress = callPackage ./game.nix { inherit dfVersion; };
     };
+  }) (lib.attrNames self.df-hashes));
+
+  self = rec {
+    df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
+    dwarf-fortress = df-games.dwarf-fortress_0_44_11;
 
     dfhack = callPackage ./dfhack {
       inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
@@ -17,29 +24,27 @@ let
 
     # unfuck is linux-only right now, we will just use it there
     dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
-                                 else null;
+                            else null;
 
-    dwarf-fortress = callPackage ./wrapper {
-      inherit themes;
-    };
-
-    dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
-      texlive = pkgs.texlive.combine {
-        inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
+    dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
+      inherit (dwarf-fortress) dwarf-fortress;
+      dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
+        texlive = pkgs.texlive.combine {
+          inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
+        };
       };
     };
 
-    dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { };
-
     legends-browser = callPackage ./legends-browser {};
 
     themes = callPackage ./themes {
       stdenv = stdenvNoCC;
     };
 
+    # aliases
     phoebus-theme = themes.phoebus;
-
     cla-theme = themes.cla;
+    dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
   };
 
-in self
+in self // df-games
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index bd63e3eae91f..5e92bbb285b8 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase
+, qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "dwarf-therapist-original-${version}";
+  name = "dwarf-therapist-${version}";
   version = "40.1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index f9e3e468cdc0..334c7ebbf6fc 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,20 +1,19 @@
-{ stdenv, symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
+{ stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }:
 
 let
-  df = dwarf-fortress-original;
-  dt = dwarf-therapist-original;
   platformSlug = if stdenv.targetPlatform.is32bit then
     "linux32" else "linux64";
-  inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}_${platformSlug}.ini";
-  dfHashFile = "${df}/hash.md5";
+  inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";
 
 in symlinkJoin {
-  name = "dwarf-therapist-${dt.version}";
+  name = "dwarf-therapist-${dwarf-therapist.version}";
 
-  paths = [ dt ];
+  paths = [ dwarf-therapist ];
 
   buildInputs = [ makeWrapper ];
 
+  passthru = { inherit dwarf-fortress dwarf-therapist; };
+
   postBuild = ''
     # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
     # therefore uses many relative paths.
@@ -23,10 +22,10 @@ in symlinkJoin {
 
     rm -rf $out/share/dwarftherapist/memory_layouts/linux
     mkdir -p $out/share/dwarftherapist/memory_layouts/linux
-    origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8)
-    patchedmd5=$(cat "${dfHashFile}" | cut -c1-8)
+    origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8)
+    patchedmd5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8)
     substitute \
-      ${dt}/share/dwarftherapist/memory_layouts/${inifile} \
+      ${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile} \
       $out/share/dwarftherapist/memory_layouts/${inifile} \
       --replace "$origmd5" "$patchedmd5"
   '';
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index d1264cefe8cd..f57e9703fabf 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -4,10 +4,10 @@
 # Our own "unfuck" libs for macOS
 , ncurses, fmodex, gcc
 
-, dfVersion
+, dfVersion, df-hashes
 }:
 
-with lib; with builtins;
+with lib;
 
 let
   libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
@@ -30,9 +30,8 @@ let
   baseVersion = elemAt dfVersionTriple 1;
   patchVersion = elemAt dfVersionTriple 2;
 
-  games = fromJSON (readFile ./game.json);
-  game = if hasAttr dfVersion games
-         then getAttr dfVersion games
+  game = if hasAttr dfVersion df-hashes
+         then getAttr dfVersion df-hashes
          else throw "Unknown Dwarf Fortress version: ${dfVersion}";
   dfPlatform = if hasAttr stdenv.system platforms
                then getAttr stdenv.system platforms
@@ -47,7 +46,7 @@ assert dwarf-fortress-unfuck != null ->
        dwarf-fortress-unfuck.dfVersion == dfVersion;
 
 stdenv.mkDerivation {
-  name = "dwarf-fortress-original-${dfVersion}";
+  name = "dwarf-fortress-${dfVersion}";
 
   src = fetchurl {
     url = "${homepage}df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2";
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 9b171fc88b76..62c15394565f 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll
+{ stdenv, lib, buildEnv, dwarf-fortress, substituteAll
 , enableDFHack ? false, dfhack
 , enableSoundSense ? false, soundSense, jdk
 , enableStoneSense ? false
@@ -20,10 +20,10 @@ let
   themePkg = lib.optional (theme != null) ptheme;
   pkgs = lib.optional enableDFHack dfhack_
          ++ lib.optional enableSoundSense soundSense
-         ++ [ dwarf-fortress-original ];
+         ++ [ dwarf-fortress ];
 
   env = buildEnv {
-    name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
+    name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}";
 
     paths = themePkg ++ pkgs;
     pathsToLink = [ "/" "/hack" "/hack/scripts" ];
@@ -32,16 +32,16 @@ let
     postBuild = lib.optionalString enableDFHack ''
       rm $out/hack/symbols.xml
       substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
-        --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
-                  $(cat ${dwarf-fortress-original}/hash.md5)
+        --replace $(cat ${dwarf-fortress}/hash.md5.orig) \
+                  $(cat ${dwarf-fortress}/hash.md5)
     '';
   };
 in
 
 stdenv.mkDerivation rec {
-  name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}";
+  name = "dwarf-fortress-${dwarf-fortress.dfVersion}";
 
-  compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress-original.dfVersion); true) pkgs;
+  compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress.dfVersion); true) pkgs;
 
   dfInit = substituteAll {
     name = "dwarf-fortress-init";
@@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
   runDFHack = ./dfhack.in;
   runSoundSense = ./soundSense.in;
 
+  passthru = { inherit dwarf-fortress; };
+
   buildCommand = ''
     mkdir -p $out/bin
 

From 812b0ec62e0054e647fbb6b6f716bd4c4515bacb Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 9 Jul 2018 16:18:17 -0400
Subject: [PATCH 25/46] dwarf-fortress: recurse into themes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now the output of “nix-env” should be:

$ nix-env -qa -f . -A dwarf-fortress-packages
afro-graphics-44.10
autoreiv-44.03
cla-44.xx-v25
dwarf-fortress-0.43.05
dwarf-fortress-0.44.05
dwarf-fortress-0.44.09
dwarf-fortress-0.44.10
dwarf-fortress-0.44.11
dwarf-fortress-0.44.12
dwarf-therapist-40.1.0
gemset-44.10a
ironhand-44.10
jolly-bastion-44.10
legends-browser-1.17.1
mayday-44.10
obsidian-44.10
phoebus-44.10
rally-ho-44.10
soundsense-2016-1_196
spacefox-44.10a
taffer-44.10a
tergel-44.03
wanderlust-44.10
---
 pkgs/games/dwarf-fortress/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 1924e0ac846f..218cf4309861 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib }:
+{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs }:
 
 let
   callPackage = pkgs.newScope self;
@@ -37,9 +37,9 @@ let
 
     legends-browser = callPackage ./legends-browser {};
 
-    themes = callPackage ./themes {
+    themes = recurseIntoAttrs (callPackage ./themes {
       stdenv = stdenvNoCC;
-    };
+    });
 
     # aliases
     phoebus-theme = themes.phoebus;

From d9b1c16ee85d2ee8db83a9520960208bf24e63a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jul 2018 13:30:18 -0700
Subject: [PATCH 26/46] spidermonkey_52: 52.8.1 -> 52.9.0 (#42957)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/spidermonkey/versions.

These checks were done:

- built on NixOS
- /nix/store/sxcxd6f05aqpiw7jgrpyi8qmgxjy2r4x-spidermonkey-52.9.0/bin/js52 passed the binary check.
- /nix/store/sxcxd6f05aqpiw7jgrpyi8qmgxjy2r4x-spidermonkey-52.9.0/bin/js52-config passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 52.9.0 with grep in /nix/store/sxcxd6f05aqpiw7jgrpyi8qmgxjy2r4x-spidermonkey-52.9.0
- directory tree listing: https://gist.github.com/6e6d8bcfc14e1e59028ad1397d75fce1
- du listing: https://gist.github.com/f69575b0d92d2b3ffec1c4dda0afa0e6
---
 pkgs/development/interpreters/spidermonkey/52.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 2a10caec3af8..bfbc48e753b7 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
 
 let
-  version = "52.8.1";
+  version = "52.9.0";
 in stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "0yyg9405y19n22x1gybyl7vp6zglbl5h749rsvgv9bm4x5zlnys8";
+    sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
   };
 
   buildInputs = [ readline icu zlib nspr ];

From b32b22e245033b22ade1bc3d24d8280fbe1ea66b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jul 2018 13:33:55 -0700
Subject: [PATCH 27/46] mate.mate-user-guide: 1.20.1 -> 1.21.0 (#43173)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mate-user-guide/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/e4cc1dd609c5e947c5c71615994b8bb9
- du listing: https://gist.github.com/56b98015d6d99b9978906a8d770bcfb0
---
 pkgs/desktops/mate/mate-user-guide/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index 4d878e224967..9992d911814d 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-user-guide-${version}";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1k99cjg54wlipy5bfiv6v6za6gdzmilfvlvb0ingv4p51jp4iddr";
+    sha256 = "0ayg570000calzpj51dwhh5mil11s0nrhl21c0si3sxr8f5cld6q";
   };
 
   nativeBuildInputs = [ itstool intltool libxml2 ];

From 0c4595a9b68e82b5b3bb05b4f89e00e5b5b75c5e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 2 Jul 2018 23:54:19 +0200
Subject: [PATCH 28/46] python37: fix darwin build

---
 .../development/interpreters/python/cpython/3.7/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index 9cc0377f925f..cd198b5f1738 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -63,6 +63,12 @@ in stdenv.mkDerivation {
 
   patches = [
     ./no-ldconfig.patch
+
+    # Fix darwin build https://bugs.python.org/issue34027
+    (fetchpatch {
+      url = https://bugs.python.org/file47666/darwin-libutil.patch;
+      sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa";
+    })
   ];
 
   postPatch = ''

From 79b97aab7f8540d6fc8311e8339761e8085d3e98 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 9 Jul 2018 20:37:27 +0000
Subject: [PATCH 29/46] options.i18n.inputMethod.package: fix type (#43239)

---
 nixos/modules/i18n/input-method/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 7ed4a584d646..9548a249efa0 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -50,7 +50,7 @@ in
 
       package = mkOption {
         internal = true;
-        type     = types.path;
+        type     = types.nullOr types.path;
         default  = null;
         description = ''
           The input method method package.

From f27f491784cd19abca6494ae28306deeea17c613 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 7 Jul 2018 14:28:42 -0400
Subject: [PATCH 30/46] Haskell infra: Do callPackage splicing

---
 .../haskell-modules/make-package-set.nix        | 17 +++++++++++++++--
 pkgs/top-level/splice.nix                       |  4 ++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index a54967c4e45e..87ac65307aab 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -97,7 +97,20 @@ let
       };
     in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
 
-  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope;
+  mkScope = scope: let
+      ps = pkgs.__splicedPackages;
+      scopeSpliced = pkgs.splicePackages {
+        pkgsBuildBuild = scope.buildHaskellPackages.buildHaskellPackages;
+        pkgsBuildHost = scope.buildHaskellPackages;
+        pkgsBuildTarget = {};
+        pkgsHostHost = {};
+        pkgsHostTarget = scope;
+        pkgsTargetTarget = {};
+      } // {
+        # Don't splice these
+        inherit (scope) ghc buildHaskellPackages;
+      };
+    in ps // ps.xorg // ps.gnome2 // { inherit stdenv; } // scopeSpliced;
   defaultScope = mkScope self;
   callPackage = drv: args: callPackageWithScope defaultScope drv args;
 
@@ -150,7 +163,7 @@ let
 
 in package-set { inherit pkgs stdenv callPackage; } self // {
 
-    inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
+    inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;
 
     inherit (haskellLib) packageSourceOverrides;
 
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 9f5acd0a7de7..a9dd6c3ec0df 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -131,4 +131,8 @@ in
   callPackages = lib.callPackagesWith splicedPackages;
 
   newScope = extra: lib.callPackageWith (splicedPackages // extra);
+
+  # Haskell package sets need this because they reimplement their own
+  # `newScope`.
+  __splicedPackages = splicedPackages // { recurseForDerivations = false; };
 }

From 35b2c0edf2d3e12f1ca7dae2a91f5232a1ab1445 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 6 Jul 2018 18:49:38 -0400
Subject: [PATCH 31/46] xcbuild: refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reworks some of xcbuild logic to make it more compatible with
Apple’s SDK.

- Add a fake version of xcrun & xcode-select
- Cleanup platform generation. Clang does not like having 20 char
  hashes in sysroot so it is much easier to just build the parent
  directory for each runCommand. This is a little awkward but I have
  renamed everything with an added ‘s’ to make the distinction more clear.
- Cleaned up wrapper.nix in some different ways
- Reuse some versioning logic so that we don’t end up with two
  different versions of Xcode or SDK reported.
---
 .../xcbuild/{platform.nix => platforms.nix}   |  28 +--
 .../tools/xcbuild/{sdk.nix => sdks.nix}       |  13 +-
 pkgs/development/tools/xcbuild/toolchain.nix  |  69 --------
 pkgs/development/tools/xcbuild/toolchains.nix |  71 ++++++++
 pkgs/development/tools/xcbuild/wrapper.nix    | 160 ++++++++++++------
 5 files changed, 199 insertions(+), 142 deletions(-)
 rename pkgs/development/tools/xcbuild/{platform.nix => platforms.nix} (93%)
 rename pkgs/development/tools/xcbuild/{sdk.nix => sdks.nix} (63%)
 delete mode 100644 pkgs/development/tools/xcbuild/toolchain.nix
 create mode 100644 pkgs/development/tools/xcbuild/toolchains.nix

diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platforms.nix
similarity index 93%
rename from pkgs/development/tools/xcbuild/platform.nix
rename to pkgs/development/tools/xcbuild/platforms.nix
index bb91df474aae..bc60af9e1a5c 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platforms.nix
@@ -1,13 +1,13 @@
-{ runCommand, lib, sdk, platformName, writeText }:
+{ runCommand, lib, sdks, xcodePlatform, writeText }:
 
 let
 
   inherit (lib.generators) toPlist;
 
   Info = {
-    CFBundleIdentifier = platformName;
+    CFBundleIdentifier = "com.apple.platform.${lib.toLower xcodePlatform}";
     Type = "Platform";
-    Name = "macosx";
+    Name = lib.toLower xcodePlatform;
   };
 
   Version = {
@@ -285,14 +285,18 @@ let
 
 in
 
-runCommand "MacOSX.platform" {} ''
-  install -D ${writeText "Info.plist" (toPlist {} Info)} $out/Info.plist
-  install -D ${writeText "version.plist" (toPlist {} Version)} $out/version.plist
-  install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec
-  install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec
-  install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec
+runCommand "Platforms" {} ''
+  platform=$out/${xcodePlatform}.platform
 
-  mkdir -p $out/Developer/SDKs/
-  cd $out/Developer/SDKs/
-  cp -r ${sdk} ${sdk.name}
+  install -D ${writeText "Info.plist" (toPlist {} Info)} $platform/Info.plist
+  install -D ${writeText "version.plist" (toPlist {} Version)} $platform/version.plist
+  install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $platform/Developer/Library/Xcode/Specifications/Architectures.xcspec
+  install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $platform/Developer/Library/Xcode/Specifications/PackageTypes.xcspec
+  install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $platform/Developer/Library/Xcode/Specifications/ProductTypes.xcspec
+
+  # per-platform bins go here
+  mkdir -p $platform/usr/bin
+
+  mkdir -p $platform/Developer
+  ln -s ${sdks} $platform/Developer/SDKs
 ''
diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdks.nix
similarity index 63%
rename from pkgs/development/tools/xcbuild/sdk.nix
rename to pkgs/development/tools/xcbuild/sdks.nix
index c97d17d739ba..b0af26e87c12 100644
--- a/pkgs/development/tools/xcbuild/sdk.nix
+++ b/pkgs/development/tools/xcbuild/sdks.nix
@@ -1,11 +1,8 @@
-{ runCommand, lib, toolchainName, sdkName, writeText }:
+{ runCommand, lib, toolchainName, sdkName, writeText, version, xcodePlatform }:
 
 let
   inherit (lib.generators) toPlist;
 
-  # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here.
-  version = "10.10";
-
   SDKSettings = {
     CanonicalName = sdkName;
     DisplayName = sdkName;
@@ -21,9 +18,11 @@ let
   };
 in
 
-runCommand "MacOSX${version}.sdk" {
+runCommand "SDKs" {
   inherit version;
 } ''
-  install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $out/SDKSettings.plist
-  install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist
+  sdk=$out/${sdkName}.sdk
+  install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist
+  install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist
+  ln -s $sdk $out/${xcodePlatform}.sdk
 ''
diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix
deleted file mode 100644
index 3c20b510c3b5..000000000000
--- a/pkgs/development/tools/xcbuild/toolchain.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ runCommand, toolchainName, fetchurl, makeWrapper, stdenv
-, buildPackages, lib, writeText }:
-
-let
-
-  inherit (lib) getBin optionalString;
-  inherit (lib.generators) toPlist;
-
-  ToolchainInfo = {
-    Identifier = toolchainName;
-  };
-
-  # We could pull this out of developer_cmds but it adds an annoying
-  # loop if we want to bootstrap and this is just a tiny script so I'm
-  # not going to bother.
-  mkdep-darwin-src = fetchurl {
-    url        = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh";
-    sha256     = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541";
-    executable = true;
-  };
-in
-
-runCommand "nixpkgs.xctoolchain" {
-  nativeBuildInputs = [ makeWrapper ];
-} (''
-  mkdir -p $out
-  install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $out/ToolchainInfo.plist
-
-  mkdir -p $out/usr/include
-  mkdir -p $out/usr/lib
-  mkdir -p $out/usr/libexec
-  mkdir -p $out/usr/share
-  mkdir -p $out/usr/bin
-
-  for bin in ${getBin stdenv.cc}/bin/*; do
-    ln -s $bin $out/usr/bin
-  done
-
-  for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do
-    if ! [ -e "$out/usr/bin/$(basename $bin)" ]; then
-      ln -s $bin $out/usr/bin
-    fi
-  done
-
-  ln -s ${buildPackages.yacc}/bin/yacc $out/usr/bin/yacc
-  ln -s ${buildPackages.yacc}/bin/bison $out/usr/bin/bison
-  ln -s ${buildPackages.flex}/bin/flex $out/usr/bin/flex
-  ln -s ${buildPackages.flex}/bin/flex++ $out/usr/bin/flex++
-  ln -s $out/bin/flex $out/usr/bin/lex
-
-  ln -s ${buildPackages.m4}/bin/m4 $out/usr/bin/m4
-  ln -s $out/usr/bin/m4 $out/usr/bin/gm4
-
-  ln -s ${buildPackages.unifdef}/bin/unifdef $out/usr/bin/unifdef
-  ln -s ${buildPackages.unifdef}/bin/unifdefall $out/usr/bin/unifdefall
-
-  ln -s ${buildPackages.gperf}/bin/gperf $out/usr/bin/gperf
-  ln -s ${buildPackages.indent}/bin/indent $out/usr/bin/indent
-  ln -s ${buildPackages.ctags}/bin/ctags $out/usr/bin/ctags
-'' + optionalString stdenv.isDarwin ''
-  for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do
-    if ! [ -e "$out/usr/bin/$(basename $bin)" ]; then
-      ln -s $bin $out/usr/bin
-    fi
-  done
-
-  ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $out/usr/bin
-  ln -s ${mkdep-darwin-src} $out/usr/bin/mkdep
-'')
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix
new file mode 100644
index 000000000000..01a8fbdb0b06
--- /dev/null
+++ b/pkgs/development/tools/xcbuild/toolchains.nix
@@ -0,0 +1,71 @@
+{ runCommand, toolchainName, fetchurl, makeWrapper, stdenv
+, buildPackages, lib, writeText }:
+
+let
+
+  inherit (lib) getBin optionalString;
+  inherit (lib.generators) toPlist;
+
+  ToolchainInfo = {
+    Identifier = toolchainName;
+  };
+
+  # We could pull this out of developer_cmds but it adds an annoying
+  # loop if we want to bootstrap and this is just a tiny script so I'm
+  # not going to bother.
+  mkdep-darwin-src = fetchurl {
+    url        = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh";
+    sha256     = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541";
+    executable = true;
+  };
+in
+
+runCommand "Toolchains" {
+  nativeBuildInputs = [ makeWrapper ];
+} (''
+  toolchain=$out/XcodeDefault.xctoolchain
+  mkdir -p $toolchain
+
+  install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $toolchain/ToolchainInfo.plist
+
+  mkdir -p $toolchain/usr/include
+  mkdir -p $toolchain/usr/lib
+  mkdir -p $toolchain/usr/libexec
+  mkdir -p $toolchain/usr/share
+  mkdir -p $toolchain/usr/bin
+
+  for bin in ${getBin stdenv.cc}/bin/*; do
+    ln -s $bin $toolchain/usr/bin
+  done
+
+  for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do
+    if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then
+      ln -s $bin $toolchain/usr/bin
+    fi
+  done
+
+  ln -s ${buildPackages.yacc}/bin/yacc $toolchain/usr/bin/yacc
+  ln -s ${buildPackages.yacc}/bin/bison $toolchain/usr/bin/bison
+  ln -s ${buildPackages.flex}/bin/flex $toolchain/usr/bin/flex
+  ln -s ${buildPackages.flex}/bin/flex++ $toolchain/usr/bin/flex++
+  ln -s $toolchain/bin/flex $toolchain/usr/bin/lex
+
+  ln -s ${buildPackages.m4}/bin/m4 $toolchain/usr/bin/m4
+  ln -s $toolchain/usr/bin/m4 $toolchain/usr/bin/gm4
+
+  ln -s ${buildPackages.unifdef}/bin/unifdef $toolchain/usr/bin/unifdef
+  ln -s ${buildPackages.unifdef}/bin/unifdefall $toolchain/usr/bin/unifdefall
+
+  ln -s ${buildPackages.gperf}/bin/gperf $toolchain/usr/bin/gperf
+  ln -s ${buildPackages.indent}/bin/indent $toolchain/usr/bin/indent
+  ln -s ${buildPackages.ctags}/bin/ctags $toolchain/usr/bin/ctags
+'' + optionalString stdenv.isDarwin ''
+  for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do
+    if ! [ -e "$toolchain/usr/bin/$(basename $bin)" ]; then
+      ln -s $bin $toolchain/usr/bin
+    fi
+  done
+
+  ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/usr/bin
+  ln -s ${mkdep-darwin-src} $toolchain/usr/bin/mkdep
+'')
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index cfa855e23cd8..f8b1c1bf31e9 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -1,80 +1,132 @@
-{ stdenv, buildPackages, makeWrapper, writeText, runCommand
-, CoreServices, ImageIO, CoreGraphics }:
+{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand
+, CoreServices, ImageIO, CoreGraphics
+, targetPlatform
+, xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX"
+, xcodeVer ? targetPlatform.xcodeVer or "9.4.1"
+, sdkVer ? targetPlatform.sdkVer or "10.10" }:
 
 let
 
+  inherit (lib) toLower;
+
   toolchainName = "com.apple.dt.toolchain.XcodeDefault";
-  platformName = "com.apple.platform.macosx";
-  sdkName = "macosx10.10";
+  sdkName = "${xcodePlatform}${sdkVer}";
+
+  # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here.
+  sdkBuildVersion = "17E189";
+  xcodeSelectVersion = "2349";
 
   xcbuild = buildPackages.callPackage ./default.nix {
     inherit CoreServices ImageIO CoreGraphics;
   };
 
-  toolchain = buildPackages.callPackage ./toolchain.nix {
+  toolchains = buildPackages.callPackage ./toolchains.nix {
     inherit toolchainName;
   };
 
-  sdk = buildPackages.callPackage ./sdk.nix {
-    inherit toolchainName sdkName;
+  sdks = buildPackages.callPackage ./sdks.nix {
+    inherit toolchainName sdkName xcodePlatform;
+    version = sdkVer;
   };
 
-  platform = buildPackages.callPackage ./platform.nix {
-    inherit sdk platformName;
+  platforms = buildPackages.callPackage ./platforms.nix {
+    inherit sdks xcodePlatform;
   };
 
   xcconfig = writeText "nix.xcconfig" ''
     SDKROOT=${sdkName}
   '';
 
-in
-
-stdenv.mkDerivation {
-  name = "xcbuild-wrapper-${xcbuild.version}";
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  setupHook = ./setup-hook.sh;
-
-  phases = [ "installPhase" "fixupPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    for file in ${xcbuild}/bin/*; do
-      ln -s $file $out/bin
-    done
-
-    mkdir -p $out/usr
-    ln -s $out/bin $out/usr/bin
-
-    mkdir -p $out/Library/Xcode
-    ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications
-
-    mkdir -p $out/Platforms
-    ln -s ${platform} $out/Platforms/nixpkgs.platform
-
-    mkdir -p $out/Toolchains
-    ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolchain
-
-    wrapProgram $out/bin/xcodebuild \
-      --add-flags "-xcconfig ${xcconfig}" \
-      --add-flags "DERIVED_DATA_DIR=." \
-      --set DEVELOPER_DIR "$out" \
-      --set SDKROOT ${sdkName}
-    wrapProgram $out/bin/xcrun \
-      --set DEVELOPER_DIR "$out" \
-      --set SDKROOT ${sdkName}
-    wrapProgram $out/bin/xcode-select \
-      --set DEVELOPER_DIR "$out" \
-      --set SDKROOT ${sdkName}
+  xcode-select = writeText "xcode-select" ''
+#!/usr/bin/env sh
+while [ $# -gt 0 ]; do
+   case "$1" in
+         -h | --help) ;; # noop
+         -s | --switch) shift;; # noop
+         -r | --reset) ;; # noop
+         -v | --version) echo xcode-select version ${xcodeSelectVersion} ;;
+         -p | --print-path) echo @DEVELOPER_DIR@ ;;
+         --install) ;; # noop
+    esac
+    shift
+done
   '';
 
+  xcrun = writeText "xcrun" ''
+#!/usr/bin/env sh
+while [ $# -gt 0 ]; do
+   case "$1" in
+         --sdk | -sdk) shift ;;
+         --find | -find)
+           shift
+           command -v $1 ;;
+         --log | -log) ;; # noop
+         --verbose | -verbose) ;; # noop
+         --no-cache | -no-cache) ;; # noop
+         --kill-cache | -kill-cache) ;; # noop
+         --show-sdk-path | -show-sdk-path)
+           echo ${sdks}/${sdkName}.sdk ;;
+         --show-sdk-platform-path | -show-sdk-platform-path)
+           echo ${platforms}/${xcodePlatform}.platform ;;
+         --show-sdk-version | -show-sdk-version)
+           echo ${sdkVer} ;;
+         --show-sdk-build-version | -show-sdk-build-version)
+           echo ${sdkBuildVersion} ;;
+         *) break ;;
+    esac
+    shift
+done
+if ! [[ -z "$@" ]]; then
+   exec "$@"
+fi
+  '';
+
+in
+
+runCommand "xcodebuild-${xcbuild.version}" {
+  nativeBuildInputs = [ makeWrapper ];
   inherit (xcbuild) meta;
 
-  passthru = {
-    raw = xcbuild;
-  };
+  # ensure that the toolchain goes in PATH
+  propagatedBuildInputs = [ "${toolchains}/XcodeDefault.xctoolchain/usr" ];
+
+  passthru = { inherit xcbuild; };
 
   preferLocalBuild = true;
-}
+} ''
+  mkdir -p $out/bin
+
+  mkdir -p $out/usr
+  ln -s $out/bin $out/usr/bin
+
+  mkdir -p $out/Library/Xcode
+  ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications
+
+  ln -s ${platforms} $out/Platforms
+  ln -s ${toolchains} $out/Toolchains
+
+  makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \
+    --add-flags "-xcconfig ${xcconfig}" \
+    --add-flags "DERIVED_DATA_DIR=." \
+    --set DEVELOPER_DIR "$out" \
+    --set SDKROOT ${sdkName} \
+    --run '[ "$1" = "-version" ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0'
+
+  substitute ${xcode-select} $out/bin/xcode-select \
+    --subst-var-by DEVELOPER_DIR $out
+  chmod +x $out/bin/xcode-select
+
+  substitute ${xcrun} $out/bin/xcrun
+  chmod +x $out/bin/xcrun
+
+  for bin in PlistBuddy actool builtin-copy builtin-copyPlist \
+             builtin-copyStrings builtin-copyTiff \
+             builtin-embeddedBinaryValidationUtility \
+             builtin-infoPlistUtility builtin-lsRegisterURL \
+             builtin-productPackagingUtility builtin-validationUtility \
+             lsbom plutil; do
+    ln -s ${xcbuild}/bin/$bin $out/bin/$bin
+  done
+
+  fixupPhase
+''

From 0534ceac816cb708434b126e38e98b925516498a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 6 Jul 2018 18:53:50 -0400
Subject: [PATCH 32/46] xcbuild: move setup hook to xcbuildHook

Not every package that needs xcbuild will want to use its build phase.
I have moved the xcbuild setup hook to the new attribute xcbuildHook.
This means that dontUseXcbuild is no longer needed. If you just need
to call xcbuild on its own you can just refer to xcbuild.
---
 pkgs/development/tools/xcbuild/setup-hook.sh              | 8 +++-----
 .../apple-source-releases/PowerManagement/default.nix     | 5 +++--
 .../apple-source-releases/SmartCardServices/default.nix   | 5 +++--
 .../darwin/apple-source-releases/adv_cmds/xcode.nix       | 4 ++--
 .../darwin/apple-source-releases/basic_cmds/default.nix   | 4 ++--
 .../apple-source-releases/developer_cmds/default.nix      | 4 ++--
 .../darwin/apple-source-releases/diskdev_cmds/default.nix | 6 ++++--
 .../darwin/apple-source-releases/dtrace/xcode.nix         | 6 ++++--
 .../darwin/apple-source-releases/file_cmds/default.nix    | 5 +++--
 .../darwin/apple-source-releases/libutil/new.nix          | 4 ++--
 .../darwin/apple-source-releases/network_cmds/default.nix | 6 ++++--
 .../security_systemkeychain/default.nix                   | 5 +++--
 .../darwin/apple-source-releases/shell_cmds/default.nix   | 4 ++--
 .../darwin/apple-source-releases/text_cmds/default.nix    | 5 +++--
 .../darwin/apple-source-releases/top/default.nix          | 5 +++--
 pkgs/os-specific/darwin/insert_dylib/default.nix          | 4 ++--
 pkgs/tools/misc/contacts/default.nix                      | 5 +++--
 pkgs/tools/security/pinentry/mac.nix                      | 5 +++--
 pkgs/top-level/all-packages.nix                           | 3 +++
 19 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh
index 70100c196973..9dc03a61f62e 100644
--- a/pkgs/development/tools/xcbuild/setup-hook.sh
+++ b/pkgs/development/tools/xcbuild/setup-hook.sh
@@ -19,11 +19,9 @@ xcbuildInstallPhase () {
     runHook postInstall
 }
 
-if [ -z "$dontUseXcbuild" ]; then
-    buildPhase=xcbuildBuildPhase
-    if [ -z "$installPhase" ]; then
-        installPhase=xcbuildInstallPhase
-    fi
+buildPhase=xcbuildBuildPhase
+if [ -z "$installPhase" ]; then
+    installPhase=xcbuildInstallPhase
 fi
 
 # if [ -d "*.xcodeproj" ]; then
diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
index a866c9414d52..2d5520b9bf9c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
@@ -1,7 +1,8 @@
-{ appleDerivation, xcbuild, IOKit }:
+{ appleDerivation, xcbuildHook, IOKit }:
 
 appleDerivation {
-  buildInputs = [ xcbuild IOKit ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ IOKit ];
   xcbuildFlags = "-target caffeinate";
   installPhase = ''
     install -D Products/Deployment/caffeinate $out/bin/caffeinate
diff --git a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
index 1cb85b1e9884..6e9003350780 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, appleDerivation, xcbuild, gnumake, Security
+{ stdenv, appleDerivation, xcbuildHook, gnumake, Security
 , libsecurity_utilities, libsecurity_cdsa_utilities }:
 
 appleDerivation {
-  buildInputs = [ xcbuild libsecurity_utilities libsecurity_cdsa_utilities ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities ];
 
   DSTROOT = "$out";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index dcfb4aefe1f5..fda7cd85e4f7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -2,7 +2,6 @@
 
 appleDerivation {
   # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
-  dontUseXcbuild = true;
 
   # pkill requires special private headers that are unavailable in
   # NixPkgs. These ones are needed:
@@ -49,7 +48,8 @@ appleDerivation {
     # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1
   '';
 
-  buildInputs = [ xcbuild ncurses libutil-new ];
+  nativeBuildInputs = [ xcbuild ];
+  buildInputs = [ ncurses libutil-new ];
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index b52ec3306dc4..596ca25d70a4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, appleDerivation, fetchurl, xcbuild }:
+{ stdenv, appleDerivation, fetchurl, xcbuildHook }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   # These PBXcp calls should be patched in xcbuild to allow them to
   # automatically be prefixed.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index 1f35e3008b3b..a572d46ceab5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, appleDerivation, xcbuild }:
+{ stdenv, fetchurl, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   patchPhase = ''
     substituteInPlace rpcgen/rpc_main.c \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
index aba2472af602..b947267ab14d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, appleDerivation, xcbuild, lib, hostPlatform, Libc, xnu, libutil-new }:
+{ stdenv, appleDerivation, xcbuildHook
+, lib, hostPlatform, Libc, xnu, libutil-new }:
 
 appleDerivation {
-  buildInputs = [ xcbuild libutil-new ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ libutil-new ];
 
   NIX_CFLAGS_COMPILE = "-I.";
   NIX_LDFLAGS = "-lutil";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
index dd193f2c07dc..f8636403ed54 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix
@@ -1,7 +1,9 @@
-{ appleDerivation, xcbuild, CoreSymbolication, xnu, bison, flex, darling, stdenv }:
+{ appleDerivation, xcbuildHook, CoreSymbolication
+, xnu, bison, flex, darling, stdenv }:
 
 appleDerivation {
-  buildInputs = [ xcbuild CoreSymbolication xnu bison flex darling ];
+  nativeBuildInputs = [ xcbuildHook flex bison ];
+  buildInputs = [ CoreSymbolication darling ];
   NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers";
   NIX_LDFLAGS = "-L./Products/Release";
   xcbuildFlags = "-target dtrace";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
index 47a587966b44..a19e0736336d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma, ncurses, libutil-new }:
+{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil-new }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild zlib bzip2 lzma ncurses libutil-new ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ zlib bzip2 lzma ncurses libutil-new ];
 
   # some commands not working:
   # mtree: _simple.h not found
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
index 7facea2b8936..0115ce537e27 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix
@@ -1,8 +1,8 @@
-{ stdenv, appleDerivation, xcbuild }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 # TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap
 appleDerivation {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   prePatch = ''
     substituteInPlace tzlink.c \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 23777c941576..dccc83a70bff 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, appleDerivation, xcbuild, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
+{ stdenv, appleDerivation, xcbuildHook
+, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ];
 
   NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
index 1a0208ef3a08..d5bc3483c389 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix
@@ -1,9 +1,10 @@
-{ appleDerivation, xcbuild, Security
+{ appleDerivation, xcbuildHook, Security
 , libsecurity_codesigning, libsecurity_utilities, libsecurity_cdsa_utilities
 , xnu, osx_private_sdk, pcsclite}:
 
 appleDerivation {
-  buildInputs = [ xcbuild Security libsecurity_utilities
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ Security libsecurity_utilities
                   libsecurity_cdsa_utilities libsecurity_codesigning
                   pcsclite ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index 8ce916feb38a..bec05ef85757 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, appleDerivation, xcbuild }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
-  buildInputs = [ xcbuild ];
+  nativeBuildInputs = [ xcbuildHook ];
 
   patchPhase = ''
     # NOTE: these hashes must be recalculated for each version change
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
index 196276b0b273..08df235ed8c2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, bzip2, zlib, lzma }:
+{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }:
 
 appleDerivation {
-  buildInputs = [ xcbuild ncurses bzip2 zlib lzma ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ ncurses bzip2 zlib lzma ];
 
   # patches to use ncursees
   # disables md5
diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
index 4ddec2a30c90..3513cb2e172c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix
@@ -1,7 +1,8 @@
-{xcbuild, appleDerivation, apple_sdk, ncurses, libutil-new, lib}:
+{xcbuildHook, appleDerivation, apple_sdk, ncurses, libutil-new, lib}:
 
 appleDerivation {
-  buildInputs = [ xcbuild apple_sdk.frameworks.IOKit ncurses libutil-new ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ apple_sdk.frameworks.IOKit ncurses libutil-new ];
   NIX_LDFLAGS = "-lutil";
   installPhase = ''
     install -D Products/Release/libtop.a $out/lib/libtop.a
diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix
index b3790b8c87c3..510c7154f2bc 100644
--- a/pkgs/os-specific/darwin/insert_dylib/default.nix
+++ b/pkgs/os-specific/darwin/insert_dylib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, xcbuild }:
+{ stdenv, fetchFromGitHub, xcbuildHook }:
 
 stdenv.mkDerivation
   { name = "insert_dylib-2016.08.28";
@@ -8,7 +8,7 @@ stdenv.mkDerivation
         rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9";
         sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya";
       };
-    buildInputs = [ xcbuild ];
+    nativeBuildInputs = [ xcbuildHook ];
     installPhase =
       ''
         prog=$(find . -type f -name insert_dylib)
diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix
index 47a74e84b55a..dc8f776cef66 100644
--- a/pkgs/tools/misc/contacts/default.nix
+++ b/pkgs/tools/misc/contacts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xcbuild, Foundation, AddressBook }:
+{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }:
 
 stdenv.mkDerivation rec {
   version = "1.1a-3";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3";
   };
 
-  buildInputs = [ xcbuild Foundation AddressBook ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ Foundation AddressBook ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index e555889d1abb..b198d7446a92 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }:
+{ fetchurl, stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "pinentry-mac-0.9.4";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83";
   };
 
-  buildInputs = [ xcbuild libiconv Cocoa ncurses ];
+  nativeBuildInputs = [ xcbuildHook ];
+  buildInputs = [ libiconv Cocoa ncurses ];
 
   installPhase = ''
     mkdir -p $out/Applications
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2f78782e6ab..ac92e8d2b625 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8607,6 +8607,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
     stdenv = buildPackages.clangStdenv;
   };
+  xcbuildHook = makeSetupHook {
+    deps = [ xcbuild ];
+  } ../development/tools/xcbuild/setup-hook.sh  ;
 
   xmlindent = callPackage ../development/web/xmlindent {};
 

From 2621171e58549ccc7d2b5230ebca024ee14d7f5a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 6 Jul 2018 23:51:28 -0400
Subject: [PATCH 33/46] xcbuild: add alias

You can now refer to it as xcodebuild. This is meant to be more
discoverable for not familiar with xcbuild. xcodebuild should work in
the same way as the xcodebuild that comes with Xcode.app, but it is
built entirely with free software.
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac92e8d2b625..a75f6e5ce14f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8603,10 +8603,11 @@ with pkgs;
 
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
-  xcbuild  = callPackage ../development/tools/xcbuild/wrapper.nix {
+  xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
     stdenv = buildPackages.clangStdenv;
   };
+  xcbuild = xcodebuild;
   xcbuildHook = makeSetupHook {
     deps = [ xcbuild ];
   } ../development/tools/xcbuild/setup-hook.sh  ;

From 740cfffcb2ea32ae2ea888ac685d883e3ad3c36a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 9 Jul 2018 12:22:23 -0400
Subject: [PATCH 34/46] haskell infra: Fix built-time overrides

These should all come from `buildHaskellPackages`
---
 .../haskell-modules/configuration-common.nix   | 18 ++++++++++++------
 .../configuration-ghc-7.10.x.nix               |  2 +-
 .../haskell-modules/configuration-ghcjs.nix    |  8 ++++----
 .../haskell-modules/configuration-nix.nix      | 12 ++++++------
 pkgs/top-level/splice.nix                      |  2 +-
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c3b04c22c2aa..9d53e61dd692 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -510,8 +510,14 @@ self: super: {
   doctest-prop = dontCheck super.doctest-prop;
 
   # Depends on itself for testing
-  doctest-discover = addBuildTool super.doctest-discover (dontCheck super.doctest-discover);
-  tasty-discover = addBuildTool super.tasty-discover (dontCheck super.tasty-discover);
+  doctest-discover = addBuildTool super.doctest-discover
+    (if pkgs.buildPlatform != pkgs.hostPlatform
+     then self.buildHaskellPackages.doctest-discover
+     else dontCheck super.doctest-discover);
+  tasty-discover = addBuildTool super.tasty-discover
+    (if pkgs.buildPlatform != pkgs.hostPlatform
+     then self.buildHaskellPackages.tasty-discover
+     else dontCheck super.tasty-discover);
 
   # generic-deriving bound is too tight
   aeson = doJailbreak super.aeson;
@@ -597,7 +603,7 @@ self: super: {
   # Install icons, metadata and cli program.
   bustle = overrideCabal super.bustle (drv: {
     buildDepends = [ pkgs.libpcap ];
-    buildTools = with pkgs; [ gettext perl help2man intltool ];
+    buildTools = with pkgs.buildPackages; [ gettext perl help2man intltool ];
     patches = [
       # Add missing gio-unix-2.0 dependency
       (pkgs.fetchpatch {
@@ -665,7 +671,7 @@ self: super: {
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
   dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
-  graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; });
+  graphviz = (addBuildTool super.graphviz pkgs.buildPackages.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; });
   status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
 
   # https://github.com/bos/configurator/issues/22
@@ -698,8 +704,8 @@ self: super: {
   jsaddle = dontCheck super.jsaddle;
 
   # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
-  cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
-  pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
+  cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
+  pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
   gtk =
     if pkgs.stdenv.isDarwin
     then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 15220c24b4f2..9925a5c03c89 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -39,7 +39,7 @@ self: super: {
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
 
-  gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; };
+  gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.buildHaskellPackages.Cabal_1_24_2_0; };
 
   # https://github.com/mrkkrp/megaparsec/issues/282
   megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 0482d03ba8fb..f1a60f5ea878 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -23,9 +23,9 @@ self: super:
       };
   in stage1 // stage2 // {
 
-  network = addBuildTools super.network (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
-  zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
-  unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
+  network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
+  zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
+  unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
 
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
@@ -121,7 +121,7 @@ self: super:
   });
 
   ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
-    setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.Cabal_1_24_2_0 ];
+    setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.buildHaskellPackages.Cabal_1_24_2_0 ];
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
     isLibrary = true;
   });
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 54366046222d..b8e3bbb30caf 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -138,10 +138,10 @@ self: super: builtins.intersectAttrs super {
     else super.x509-system;
 
   # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
-  gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
-  glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"];
+  gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
+  glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
   gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
-  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
+  gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.buildHaskellPackages.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
   gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
   gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
 
@@ -305,7 +305,7 @@ self: super: builtins.intersectAttrs super {
 
   # https://github.com/edwinb/EpiVM/issues/13
   # https://github.com/edwinb/EpiVM/issues/14
-  epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
+  epic = addExtraLibraries (addBuildTool super.epic self.buildHaskellPackages.happy) [pkgs.boehmgc pkgs.gmp];
 
   # https://github.com/ekmett/wl-pprint-terminfo/issues/7
   wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
@@ -469,10 +469,10 @@ self: super: builtins.intersectAttrs super {
   io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
 
   # requires autotools to build
-  secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ];
+  secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
 
   # tests require git
-  hapistrano = addBuildTool super.hapistrano pkgs.git;
+  hapistrano = addBuildTool super.hapistrano pkgs.buildPackages.git;
 
   # This propagates this to everything depending on haskell-gi-base
   haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index a9dd6c3ec0df..27e8136cd397 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -121,7 +121,7 @@ let
 in
 
 {
-  inherit splicedPackages;
+  inherit splicePackages;
 
   # We use `callPackage' to be able to omit function arguments that can be
   # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use

From ed98822350926bd757d2e8ed89faf1bf1cf51473 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Tue, 10 Jul 2018 08:38:45 +1000
Subject: [PATCH 35/46] bazel-deps: init at 2018-05-31 (#43018)

---
 .../build-bazel-package/default.nix           | 12 +--
 .../bazel/bazel-deps/default.nix              | 80 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 3 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 349a7e5aa333..07d37451ddf9 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bazel }:
+{ stdenv, bazel, enableNixHacks ? true }:
 
 args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
 
@@ -17,14 +17,15 @@ in stdenv.mkDerivation (fBuildAttrs // {
     nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ];
 
     preHook = fFetchAttrs.preHook or "" + ''
-      export bazelOut="$NIX_BUILD_TOP/output"
+      export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')"
+      export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')"
       export HOME="$NIX_BUILD_TOP"
     '';
 
     buildPhase = fFetchAttrs.buildPhase or ''
       runHook preBuild
 
-      bazel --output_base="$bazelOut" fetch $bazelFlags $bazelTarget
+      bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
 
       runHook postBuild
     '';
@@ -52,10 +53,11 @@ in stdenv.mkDerivation (fBuildAttrs // {
     outputHash = fetchAttrs.sha256;
   });
 
-  nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ];
+  nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (if enableNixHacks then (bazel.override { enableNixHacks = true; }) else bazel) ];
 
   preHook = fBuildAttrs.preHook or "" + ''
     export bazelOut="$NIX_BUILD_TOP/output"
+    export bazelUserRoot="$NIX_BUILD_TOP/tmp"
     export HOME="$NIX_BUILD_TOP"
   '';
 
@@ -71,7 +73,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
   buildPhase = fBuildAttrs.buildPhase or ''
     runHook preBuild
 
-    bazel --output_base="$bazelOut" build -j $NIX_BUILD_CORES $bazelFlags $bazelTarget
+    bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" build -j $NIX_BUILD_CORES $bazelFlags $bazelTarget
 
     runHook postBuild
   '';
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
new file mode 100644
index 000000000000..76e2ad1e7cac
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
@@ -0,0 +1,80 @@
+{ stdenv, buildBazelPackage, lib, fetchFromGitHub, git, jre, makeWrapper }:
+
+buildBazelPackage rec {
+  name = "bazel-deps-${version}";
+  version = "2018-05-31";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/johnynek/bazel-deps";
+    description = "Generate bazel dependencies for maven artifacts";
+    license = licenses.mit;
+    maintainers = [ maintainers.uri-canva ];
+    platforms = platforms.all;
+  };
+
+  src = fetchFromGitHub {
+    owner = "johnynek";
+    repo = "bazel-deps";
+    rev = "dd7d0086d3a61c1d5c3370a0300824d0c75946e4";
+    sha256 = "1h9ddgk6vn0bhnnkwwz4n1iqv2rcdj521dxhdwj5wwpndbciw855";
+  };
+
+  bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
+
+  buildInputs = [ git makeWrapper ];
+
+  fetchAttrs = {
+    preInstall = ''
+      # Remove all built in external workspaces, Bazel will recreate them when building
+      rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*}
+      # For each external workspace, remove all files that aren't referenced by Bazel
+      # Many of these files are non-hermetic (for example .git/refs/remotes/origin/HEAD)
+      files_to_delete=()
+      for workspace in $(find $bazelOut/external -maxdepth 2 -name "WORKSPACE" -print0 | xargs -0L1 dirname); do
+        workspaceOut="$NIX_BUILD_TOP/workspaces/$(basename workspace)/output"
+        workspaceUserRoot="$NIX_BUILD_TOP/workspaces/$(basename workspace)/tmp"
+        rm -rf $workspace/.git
+        if ! targets_and_files=$(cd "$workspace" && bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" query '//...:*' 2> /dev/null | sort -u); then
+          continue
+        fi
+        if ! targets=$(cd "$workspace" && bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" query '//...:all' 2> /dev/null | sort -u); then
+          continue
+        fi
+        mapfile -t referenced_files < <(comm -23 <(printf '%s' "$targets_and_files") <(printf '%s' "$targets") | sed -e 's,^//:,,g' | sed -e 's,^//,,g' | sed -e 's,:,/,g')
+        referenced_files+=( "WORKSPACE" )
+        for referenced_file in "''${referenced_files[@]}"; do
+          # Some of the referenced files are symlinks to non-referenced files.
+          # The symlink targets have deterministic contents, but non-deterministic
+          # paths. Copy them to the referenced path, which is deterministic.
+          if target=$(readlink "$workspace/$referenced_file"); then
+            rm "$workspace/$referenced_file"
+            cp -a "$target" "$workspace/$referenced_file"
+          fi
+        done
+        mapfile -t workspace_files_to_delete < <(find "$workspace" -type f -or -type l | sort -u | comm -23 - <(printf "$workspace/%s\n" "''${referenced_files[@]}" | sort -u))
+        for workspace_file_to_delete in "''${workspace_files_to_delete[@]}"; do
+          files_to_delete+=("$workspace_file_to_delete")
+        done
+        # We're running bazel in many different workspaces in a loop. Letting the
+        # daemon shut down on its own would leave several daemons alive at the
+        # same time, using up a lot of memory. Shut them down explicitly instead.
+        bazel --output_base="$workspaceOut" --output_user_root="$workspaceUserRoot" shutdown 2> /dev/null
+      done
+      for file_to_delete in "''${files_to_delete[@]}"; do
+        rm "$file_to_delete"
+      done
+      find . -type d -empty -delete
+    '';
+
+    sha256 = "0fh9jjwk3aq0kklhl9zyy8hj8gjm1y1fy4ygjinm0469w9jdgc3g";
+  };
+
+  buildAttrs = {
+    installPhase = ''
+      mkdir -p $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
+      cp gen_maven_deps.sh $out/bin
+      wrapProgram "$out/bin/gen_maven_deps.sh" --set JAVA_HOME "${jre}" --prefix PATH : ${lib.makeBinPath [ jre ]}
+      cp bazel-bin/src/scala/com/github/johnynek/bazel_deps/parseproject_deploy.jar $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e31a55782f15..d49fadac6f18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7794,6 +7794,10 @@ with pkgs;
   buildozer = bazel-buildtools;
   unused_deps = bazel-buildtools;
 
+  bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps {
+    buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; };
+  };
+
   buildBazelPackage = callPackage ../build-support/build-bazel-package { };
 
   bear = callPackage ../development/tools/build-managers/bear { };

From 9371f6ad37accdb843958fe4aee54d9eec10e027 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 9 Jul 2018 20:11:10 -0400
Subject: [PATCH 36/46] linux: 4.18-rc3 -> 4.18-rc4

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 100ac73d8812..548c66e87e63 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -230,7 +230,7 @@ let
     };
 
     usb = {
-      USB_DEBUG            = option no;
+      USB_DEBUG            = option (whenOlder "4.18" no);
       USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators
       USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling
     };
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4af7647a1a5c..cc82e146abd1 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.18-rc3";
-  modDirVersion = "4.18.0-rc3";
+  version = "4.18-rc4";
+  modDirVersion = "4.18.0-rc4";
   extraMeta.branch = "4.18";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1kr9bhvcdp792micjmhl2hwhs5iid1srb4ia8hm4cpy1lnzdgrih";
+    sha256 = "1nhl82ygz7sm6njnb9qg9k4jp0gr1cv2wxpayrpc4ab21xb6b5mj";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 3ea10ab2d8f0081c7af7043075db220c58c7a0d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 10 Jul 2018 11:24:24 +0200
Subject: [PATCH 37/46] flexget: pin guessit==2.1.4

---
 pkgs/applications/networking/flexget/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index cc89f09d6402..ecad7549117d 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -20,6 +20,14 @@ let
         sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv";
       };
     });
+
+    guessit = super.guessit.overridePythonAttrs (old: rec {
+      version = "2.1.4";
+      src = old.src.override {
+        inherit version;
+        sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
+      };
+    });
   };
 
 in
@@ -48,7 +56,7 @@ buildPythonApplication rec {
     chardet beautifulsoup4 html5lib
     PyRSS2Gen pynzb rpyc jinja2
     jsonschema requests dateutil
-    pathpy guessit_2_0 APScheduler
+    pathpy guessit APScheduler
     terminaltables colorclass
     cherrypy flask flask-restful
     flask-restplus flask-compress

From 1789ee279e02d042a6d18772aea4a4efd3b5e661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 10 Jul 2018 11:25:18 +0200
Subject: [PATCH 38/46] pythonPackages.guessit_2_0: remove

---
 .../python-modules/guessit/2.0.nix            | 31 -------------------
 pkgs/top-level/python-packages.nix            |  3 --
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/development/python-modules/guessit/2.0.nix

diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix
deleted file mode 100644
index d95d0880adfb..000000000000
--- a/pkgs/development/python-modules/guessit/2.0.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytestrunner
-, dateutil
-, babelfish
-, rebulk
-}:
-
-buildPythonPackage rec {
-  pname = "guessit";
-  version = "3.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bf17e78783cf13bf903750770de4c3bb6c9ca89baafedb1612794660b6ebe32b";
-  };
-
-  # Tests require more packages.
-  doCheck = false;
-  buildInputs = [ pytestrunner ];
-  propagatedBuildInputs = [
-    dateutil babelfish rebulk
-  ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/guessit;
-    license = lib.licenses.lgpl3;
-    description = "A library for guessing information from video files";
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0cbd5f0b468b..6ac09121fac2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6317,9 +6317,6 @@ in {
 
   guessit = callPackage ../development/python-modules/guessit { };
 
-  # used by flexget
-  guessit_2_0 = callPackage ../development/python-modules/guessit/2.0.nix { };
-
   rebulk = callPackage ../development/python-modules/rebulk { };
 
   gunicorn = callPackage ../development/python-modules/gunicorn { };

From 68010cf5ef925e34cbd3ffada2a695f9962697b5 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 10 Jul 2018 13:55:16 +0800
Subject: [PATCH 39/46] firefox-devedition-bin: 62.0b6 -> 62.0b7

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 0f4631adfeed..3e8210fb2cf3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0b6";
+  version = "62.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ach/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ach/firefox-62.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "471aae0d0a183d50cc46b0f210c528ef7af62ddc1763e032ead21708898ca26e28ec05ff2057d8c5fd26f4ea9413bc7898f682b1ab3baef50a843e293c4bc64f";
+      sha512 = "ad08810db2d54a91f3c27de8c488f2fab9af74b82734e8ee50e54d9d07831059445c498763196ce74aa064c35122c6f18e95287e4368b8c2e92607b6d50e58a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/af/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/af/firefox-62.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1fff40bc08178b4bc9b16aee9db3e969bb863875ea0583b9db39b45b61a78325c7783d2a0b57cbce6c81dcde107a3f0c5534c9ba90eb1b9f650e6b0f34d7b027";
+      sha512 = "578a8f111932e5326805a15a2a3130c8203ad4c2db2bac20ebc5c7bef73c570b1f9f19f150ce1ed54a0dfd8eab9d7c1d08b20a8466a3ec7bc75c19e058824553";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/an/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/an/firefox-62.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "888a8a0e6a6eded1c71f1cd58846674b4ea9b2a7fd013f34c9a44358f0549a1f5c074fead496bee4e53d81f85be0a0396becc03fe108a6263a11f31d1e78c286";
+      sha512 = "ef79cc04ab8d40e08dab5c1685722cf7bc22c5b71c6f60a81d9aaa0016fa455034256ddf5a8e08d870905023a2e97c5cd02ce9e38cb7e82d06dac6a9d1d5a7df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ar/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ar/firefox-62.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "a45852089ddd9d1d49af1c644ce0428481aac3bb91e75cb6f099e65d8e78fab95e953df1081e5cd285b6fb08d472de06235e5ae8de95a633b07546136426c760";
+      sha512 = "4cc1ac41c460f28078b4c20257ff3a698b6241b88e1f9b39e97c6a3ee963b7daebaed0a4e96527d5360b7e9e987bb3c50f6ab92bf23427ec04409c3342d6c0d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/as/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/as/firefox-62.0b7.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "757adb18c9956f8177ba372eeee3a53a54836e3f999e9e300173b236848673f4e0e412b1b75345f959424e6be2afa9c1c190afe763f5efb142c5f5895b0c83b9";
+      sha512 = "82ee25270097990f786d2d83e107eddaa9a8ec7f349c8b5ea4c1d5da914086354bbde4674d0742f5080b8793165366bce907496e98405f20759fcb040723d824";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ast/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ast/firefox-62.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "47e0367ec2cd24b61af27b28c40f595bd2bfde866c96f0b33f552453b280de723955cb2c90f80513a2f557b0fde29cc44ed756fc60803d1d0cc80e20fe398348";
+      sha512 = "420f2d7fdd8a2e8a91a595577e7f74be2329e1b82691ab6ba1f27d667a7f7814f0594f3fbf31853ed85f2b748c105e7f929c9ae4b474460f107ff0321e458c04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/az/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/az/firefox-62.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "4029a5230e5733d7eccdfc4640a00dda67f51e2d774530f4d3f711f3c0541a22ccd7edb6df9fb0f6b716ff1aefa7f9319371dadbfc5fb02ae68881b950930794";
+      sha512 = "2498ce2c40640895e22fee41c64cadd32d808e723acecd918edd8e066d677d456cefb41743ea3f0777b1e564c7bb8d9418dc06e2979bad48e0174ab97dfe5665";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/be/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/be/firefox-62.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "5da8b18d79ccd8753b0eccb7b24aa2fc0a672e3681aa265a0bf25d80accb0b1bdef7679d1917e07ae9a2cc60d7cae7ef2fe3f9a08bd6b8da78edd4205f909c4e";
+      sha512 = "c8bbcfa2bbd1e32163c5df7d45c47102134be3c05398e3d201f6fe79a9cd37e636b75b381601b67fb9f582edac05aa09818746ecbaa83dc1697d0c720721a374";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/bg/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bg/firefox-62.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "eda06aac793a635ca2322b89ed9e8029c33d2c5b7156c3fb3c3a700c93d66567cab3492a5368ce3b0fd6ce1b3cd8a1e669d1220eec865d6bf21a21176ca901f2";
+      sha512 = "600c6cd53275a2082dbc545c6d9aff3863f1fd206c857868702c79313ced4ecb6f337145cb82b8afe53f33218f7ccf8b99c83ac2c4037c5567551ebe3d4062da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/bn-BD/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bn-BD/firefox-62.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "68a3cae666783c5cadae644938b80f75091f1cc0eda7400658ec4da27776bfae8ad86a532fdfe81af50b502ffc55408c80793a906cbfb533ed502b5db13e9c16";
+      sha512 = "d42868cbe252001da5137588d364005ffb69c0619035a607aae110e70074012cac87ad5256f46955f5c74e45ee3fd314928be42edc85db738ebe0f3763eb0dd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/bn-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bn-IN/firefox-62.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "9bf3045ca4b34f39cb61b2e57d4a8d7a6cef81dc20b2e9150a7d5bf9baadddeebbbe3b37cd3fe6cdd1415886c35ff41dc4c1fa94d9f2ff51159d6404452c6e7f";
+      sha512 = "3597895f922e63bd7ac1d80fa1317949d187cf415b5b872a8a97d38a06a2a73b93aff77d6b1d0bdc5a8269fc88f2582aa5b5228a9adb68bcd6bd98b13e3b74f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/br/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/br/firefox-62.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "4621cb9f670852aca6fafde2966391d0f2d667b2dc3e966c356edf3f84e0ff7a491862ae18f56f76a45ad279bd0127f136ce94b547c5e569b3b42387ad622b3b";
+      sha512 = "e9f8298513422cec45f96af7334a1948012cc697bf867825159a44f7593f5da5995b1ae82fbf4bf1f419bd0633bd3ef9861e929f6a49598c82ad39b2edaa6a58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/bs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bs/firefox-62.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "c0dd5a7ab9fa0e4d17ba462be1dbfcbb778b6a2f948330bc66478c5ab73836369574a1e627323413cc3c8f92335227d287034bf6ec28c6ace00d6065bb621efb";
+      sha512 = "098678b5fed12858f7f20de039bb460560ba531065b60ce2f052fb344a775feaacfa6811a34c389759ab936c2c82661aaffd997b7897ee5d31d5207e5f50873c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ca/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ca/firefox-62.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "9d7700977fa423e45195331f8d491f345d2d17b1a5977ff2733233001e0c227a6dca926d9ce0bc67d0d51206afad68830e86b33b644898d38f3d15767f7df25f";
+      sha512 = "46a8f99ab04b98462dd468af8b34fb0d34d52c364434f12e44f147402981e3bc26bef6d2bc696463282be7f705507c7ee21e05e8ad668906c9dcdc59614a36ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/cak/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/cak/firefox-62.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6632ec7b8cd3f231c21f915fa917af0cf2d4fcd4a9ecb55beddf2a6e9cd44d3698de12a798dd3152370381d2ab14f27787b239a07597e8a058e4b0cfbeadadda";
+      sha512 = "417c12a94576f5dc860deb9aa1c9e57c8604e9c0d3ff7f5be2a2860b3a690bbc02b7f84817f7a7c3f617cfe935c90f04078c40e1ba8b300518f01ec4ee6cd291";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/cs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/cs/firefox-62.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "665c454958ae0c562355da95fb310f4868ca6f31d76a92571fd2ed3ad2f90cd6c6e6b8395267194d3dd92972f74fba96b3285b438eb7d90bbd604a0cfbe2b184";
+      sha512 = "1ee2c7e1561d37e7f6f126cd417e8ca9ed09c6bc1c24483bf3e2241cfb37bd2c3094490d953c2be707f8d77898be3eb3e58fe399c58ec8b0b00e3752ef8e7e1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/cy/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/cy/firefox-62.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "b935f07f94389a9affecbc967291212330ef275e4c32077829efb8c9b0b093487401096c582e8074aa06da7c771739813e537155ade2d8141b721b3c6e65b782";
+      sha512 = "287cb14d43214d7ab33971d31b223ab0adc3bab6f3ce6f1d359f5e118a6c43f287dcb52f702ca6a60effd2dddb953fac935374349981d0af04532fcc39e38649";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/da/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/da/firefox-62.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "8e0c4553eaa27d3a8f4d8f9d803a75bb595e9619943dc233a652ea0dd3884b380d5e0c7b63222dc50ec26a73f57c5ac84a48edab9079f84664d3738dba9a40ff";
+      sha512 = "91f9f393ef74d59ea786a32b69182355297fbc002b60bf2cf791272f07d0637f3603b5133b8c81f4cf50c83a9feb15b95c56a8e8c1351d77f6d58fbd3c7d1fce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/de/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/de/firefox-62.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "92cdbb190aa16c9ca0deded72bf2ab394fd4b8676f2242ee32ff0fe381d48c6dcbf0fe1d7c7dbf02462fa9686d1b9e3d35d52bde9e785bf1df49ee55fe0a4e3f";
+      sha512 = "db29303b902e89ef4c3de68c8f19ddfcfdcdd8487140e9ad3304746bee745359bab170171c84776c1fc9b331d1e19bd8442926b61c91f1c0da33adaca1276803";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/dsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/dsb/firefox-62.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "0ded4bf24a7b76620b72f211d5ea27dec543e45cd63670e1a57b72a1e31da552c35c5c8d18dffe4c67205d20ff7c6a55b61afe7eb45c554b68ebfb91fae59489";
+      sha512 = "68c0dc705c7c48455555a7491dfa6b6b283115818a3101089941a63fabd24ce6645b0ab7a21bd022ec4917adab2341ac24806d8f40c000f19b56d6b30b000936";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/el/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/el/firefox-62.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "77e97df53c0a04252d9a551bc597bd3d6da18dd8ca138feb21301b9871b97cf38e968c8fb1216164b21e3868b9443b00c53bd32b3332745d9804f1581ab3c0ff";
+      sha512 = "5982b479db0152aa8c117489648677c4ed9d7e7471d6d202decb1e7e70200a4fc072ad936428ba97efc2b122a922affb5b549241e9cdccd12b656d2161bd3ab8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/en-CA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-CA/firefox-62.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "cff4582b3ff37380123f04d79351b6843b3260da3a8ad196c2aa700d5b4cd7b0a1f532625917d6e079f2ccdfd5de3d6a9f3a1969ab88d8600f8eb41a9b4fc846";
+      sha512 = "d15d881d2e0a415f686bc211a1edb4eba628d4eddb9b670f745aedff4b480b949624851bc086fe49e0509eed782284ccaa5b112106ff1dcb413ce1678f6bb47f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/en-GB/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-GB/firefox-62.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "023cd33b11c2f3c25fb5bf54fd0722bb850693fd43f1b028f72921e986f6d78e03fc8e8c8063deb1008875c7c0c383a6a192bd25d4ad2b4159f204be18f247b2";
+      sha512 = "33f1e7674e8463bd746debb0689264cb6ee4214d7fa32a5bf5a9ef316f9761ee5b9329cfb20c466e530ea25a5ffc3850c6245f3d10c2f7c657c453cefbde9b66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/en-US/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-US/firefox-62.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f3951f064e3ca87c9f9fd44f78208bf16c8b884f3f08ef5123768dd738e9af0fa2e192ae3ccc49c3215fe615bd9ddf46153b7e073195cfc8d95dfe4e30a84074";
+      sha512 = "12162030c68d469f02286e4e785590123a342ce815093440126b2cafbdd1336bea40faa4801920444a88b92292554414fbd6457a29d6d3127cdb9833be8c648d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/en-ZA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-ZA/firefox-62.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "8e1819c64c83cd5b7bddc6dfaebebe3bdaf8ab1e96ca0db74d3bb7b2f2a5009645fd9bf810e3673e1864455db0dac82162d1d7d20a6397652eba86a8cef21602";
+      sha512 = "be168558fb81c84e81c9eb2394da118f8beda3fc358fa6969928d62f381723b8299cea16f9994075aab5b97c30fd2829d9dd3f9dc1111e4457e9073cb64f580b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/eo/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/eo/firefox-62.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "1a0d9aebb489343d53080e6e5a0e499ab974af21822e69da325be39df56753c33dbf4dfa6a866787e8d963f6b2587ab7460c5ef75756474d450262b0a540aa0a";
+      sha512 = "817bcb0b76ddbc8bf5b3f0a6cf2cdcdce0cf9f43656b335fc7c09dff745ff9119d639c153f0167fd08aad357b4738edb54dce363b2652580dc369b21f4284357";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/es-AR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-AR/firefox-62.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "aaf771b39231e4b0c3da6e8c10527da818689ccc2d5e0a2338f83d4f566ea7d4ae4b7e076e6497c9578d7d518256972f48f80dcfafd78e3f9b492fc74b7eaeb4";
+      sha512 = "f83e704dba692049b8a32c08e9fbaf7a44bcdf2aec2df29dfc04e98979d8c7b8226e742428b2849e9513dceb49b2e4aef789d9fd82a035fcb00cad511ba7c524";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/es-CL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-CL/firefox-62.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "8c80b3ffe7c483fcadc23f9f0c66d4c3e3ff7a0678eb40fe0a7214d3e39c7e7c03d6205b73d7bdfc016b7221942df8c1168ba71b2b674cb8de1f0304ea4fd044";
+      sha512 = "da14922c4bb5ac06e9b90611c5f5ccaf9e9594bf2c4b0b081bb6d744a278c619294cfe38df4b6e87719626ba90c9d1c54b2bb467fca7361ce64297c6c5073dc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/es-ES/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-ES/firefox-62.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "79c567e4fc9a9764b0932b0bed5894592ef8fb9a520c61d334a66514d27a855238c5874907b804b2b8fff24d35a65d1d4534f2c2a858017d1cc0a6a638196067";
+      sha512 = "3b37cbca21858a1dc64e0cab2fcc0cf8243a06a3946c9bb45be63f9b4cb6eee8d07625f427e48b5564770cd35572712bedb40110c49a974cf550487e85e3dae7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/es-MX/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-MX/firefox-62.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "767cb2dba8c0bcbe957d89e82860ddd268a36241976be69815c2378deb8433342b5de24e3aadea6345cdbd79bcf90671cb610ee66ee6ec03d09cc44ef3f03814";
+      sha512 = "bf6061739b353f85d9c6d1d2c69cfc9a1544a7a09389d58d7ce9cde70c31da7512e8c341e248395b9b77b94c73682536af922e49f400512e4cd231caeb314b96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/et/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/et/firefox-62.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "8a32e24e71c0fd3d67e0a555b34f4e1ef6708c294cc0ebdaf439c94d4903d6ad19ce8cb15738dadff50f34558d75b58a47e300c091fcc17d497f778e93aac454";
+      sha512 = "07ac73f1870373fa00f0226ac3bb84096647702e37382be5025a0d8fed6c2dc06f0329972ab380579db6903a418d8f20866723973159c856d340e70e3fde738d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/eu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/eu/firefox-62.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "1632aa89d6bc4498f7302e539cd3f312c3c97723ca0d191181223aa037a31ed929319f8e94891e07617f293cd3fdf71c97f6f0936518d075e028c9003bae7711";
+      sha512 = "2b27fcc174fe1959685c143610ad8b03b419bc58fc7e0780b1957a1d9865b9249e6e906ac651453b8745b7a4204fc7e80c95af1da83be189c61c6d45681d1311";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/fa/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fa/firefox-62.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "474469ae77b312e20b0f67b43ba85b8582ed8bac364eaa9af16b5984500cc68b83663a732f30f962ea030aef374595131dbef355e29c1b195895a613571dd12d";
+      sha512 = "af9e4ddf5b67646a66c6733584b2fb1277fdfa2a151e0c26975c8bfe871226c8670884ebaeadb7410f269ae770a1b9ae53484db50dad4d2bbdfb7b24ed497722";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ff/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ff/firefox-62.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "13da65d7fdb18f0cd4877c01269dcad4a5bfe9d556d4ea0e677d3566cf8995ea0a53febe9d6a08a48d6533b125079d4f13a638cdd882352af65dd55ee56a90e8";
+      sha512 = "2e834669103ad3475e2177f6d00e882bca0dac6387110e28b75d3c172fad519e1867884464de2fee463a87c673da9db1c586640f976560d9f182db878381e3fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/fi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fi/firefox-62.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "d228623bb7bb86eba3d2c1336eacc2f2cff125d6f426766e69c468a7201ec70c3a2a78205b7aa52fe94df5d8dac8975d10a525a3e06e70bca036f70fefd10ad1";
+      sha512 = "e76dd7f036ddb276a990e6c4f0369c485fd976fc33f1440ef2eccb8418889cbc9eb0bcd857900efc091f0423dcb14fc585b96c7712976f358edb7de53ee5f538";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/fr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fr/firefox-62.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "bb1f48483e0e42655bbc0948dcb1f99178876d9e5b918d846bc245c53c7a5d38b36f0c6af305a16e45f589ad65e5f27da8c092bd85674336cec40d5f2ee8c0a1";
+      sha512 = "2eec8e3724110e49fa089055e5debd4c20468acf2ac259c5ccf5b2f693982ad66ff223e03549804d15f63ba6c90ec90e241a411ed79301475c1a768d004aa306";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/fy-NL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fy-NL/firefox-62.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "4f73ed77c39109e814c341d6555c146f1aa6ca196a8665aee10025f5c52642119c3bb4fcab13cbdfbec590a3d0d143ae8ffc08d8ef5ca1a9e58b041438d5e143";
+      sha512 = "a2a0e518b368c283fefd13fd130d2bcb287e8ffa8a2610d0d29ed1438ea8dfedaa49f86f86996754409cd9e146c98af195a351b5bae1b5fe1bc2b1e6d1412d3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ga-IE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ga-IE/firefox-62.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c4da1569af71f7d49f2d337aa3fe9c35ec61a5f726193699fcfa7a10eea1e4635ad4d430062574e46638870079ebe52cfc85660e02629c0921aeddc55695135e";
+      sha512 = "ee9af54ba0fe2780955ba536f4a8d1c565630650a8e8b94cf9ac84b6ea433e324f408dd664fb06c07aeb1b6774a1b20a915bad4b51824b14e734ff9abe029009";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/gd/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gd/firefox-62.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "741157cf2cd8aef6f7b15f8d506f1a0e84749f3a0e20f67a007696e8afb63cda0cf826cd1e374f8f9f5514b3eaf05b11a5debb2925010c538374454e3adf0e93";
+      sha512 = "acf1d362349402b83f0cc169801ac05a7583a65883cc7c0a20ce3d867cf37bb72715ea106d20340db6a319c4f62d14f30b1b9144fc191ce35ccc1e58b1ba9b38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/gl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gl/firefox-62.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "17b568b03fab189ba657e96cb99a0a1e1643654311bd3fcd104e56d211c74e72cd064693b390ab5d617fa8b0993b4e80c2aaf75db8f92aa27bbc6080d03204b0";
+      sha512 = "be133df9db001c96eb9689ad56c16b353a3e93b6fc94d89bc02ff4c02d6847c396379673242bdc129b968d10e02425785ac01c220bbc25c9ffe328abccc84f02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/gn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gn/firefox-62.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "76cad9ebd0e1cddee6ee755698b20c8f8f7dc930ec5085248834be498ea33cbff3d74d420f2b2789f9dd02bfefb9d2de43fb39770988998d54948f413a421a8e";
+      sha512 = "921b320fe4287dbb12ecdc7bd1a47bbf2994116c33be412fb5af5f2a3c873897f6beba74805f0bab91eafed05406d7be2f704dfd6bfd7d0a27991f5afb1d1fda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/gu-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gu-IN/firefox-62.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e0f6eb15167ba5c2c89528b580aabdca1281c4ad83d290ea655bbcbccffffe3847c1c6ca1d911e59ed00179dcdef4fb3b580c6ad35fedbfda729dc68aefa0125";
+      sha512 = "5a2b3e65bff11aee6db10fa04bcee43af95efb94f45667e447af8a3ab764f09d41c0f19c976b3b4a0c6996f6bdca83cb0f4b23b0600d5d9c4cbdf7282f92f920";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/he/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/he/firefox-62.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "5dc3ae215868777f969739017c56f505a088271f874ed31dc7f62d01a72643055868d68826c733744e1b0ff0f3df8eadff2095164f9a8e9e89ba5305c02dac2a";
+      sha512 = "b6e9c2c8024099a672f13a5fbd319a6723bd187d7282c2597c388d19b4a997471534004386ac3a48e48f0e56e7731753257cddbb34ed4842c117e77500118fbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/hi-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hi-IN/firefox-62.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "6309f3f868ae0f64f391754add39758e75f2befd7f729f1f3af5ab743fe0b92ecc371e150fffc2c9dc355af49e98f2f459f0cc574d973b2df3d1dce4594420a0";
+      sha512 = "cfdfb7713ef6e1be40fb8db91ad94cd04624d52c689cb0b1906ae27102865c20af62d08fd59cd137c6e1cbe55278733267266777c439c9d3d340de887e6f520f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/hr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hr/firefox-62.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "1bca3c98b098956bc3a882fad17e2157f5e9262a3dbae0c942e17aee1ba1e79bf45ffbb0de97fa89d50b048eb1ab6ac92779018b8746c21f49f64fc0218cb3c7";
+      sha512 = "d8ba79a9c4c591c7df13813a35a512d417db81032f37eda50995dd7d56cffee337cb9e90f806ad2f2104f20b9a41f4e54876483c8a1d05ad21096b634096d572";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/hsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hsb/firefox-62.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "070b75bcf9e5701d8f33e3d955aa68024781815c885fb3141a000d9495638f2d9315ed8f23194c8c2f066f6ee1d7350620b557762a37e1adf18843ca0cc45431";
+      sha512 = "68d3cfd92fcd272aef7c45e51e2ffdd33c257f34ba2b0534643506d15a6d5b4393c31600e8675c8d93409497569b3673f5c99102109327ecf7e24817986d5207";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/hu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hu/firefox-62.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "36bbff8164673f18796d262dcc1695dede9538f8d9f8fbf94e8049f2d444f615bd16591cf13b2f55e27657304f1da20045a76b55ac6cd3de02c0a1f756df22ec";
+      sha512 = "509c1e1e550b4a4a874955b7b9f3ce2953dc75d5fd261d41d3dd483c69e0bf914361eb9e6b516592d86e2a03adee70ab065efb2f23988be350089460c82d22f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/hy-AM/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hy-AM/firefox-62.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "fb9afefe4d2e09b6201176fe1efac0a031199159250eff7ce516426fc773e66b745837b766fc5a30acb793b59ce859df7953e95d0a8d4c3515b75bd59335e081";
+      sha512 = "a6ac32775b9a59d3ed44703ac3826f4cc4c57b85b4b173924c4265bb4228c32f297f682a00eda662df010cb36ed1d2b3c612e90a78a3bb7a394c78588398832f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ia/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ia/firefox-62.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "70aeb4851117978725b075b72fa933ff3848491f217978b5b6fde51a33966f23a91e0e0c819c8a2b90bdabcd3872c43127ed399e01e9111730c8d48fae338ebb";
+      sha512 = "36ca419e8dbf4bd6e3da793a52bc42005ee0df7dbf5e24dbe55dee7f3336c28699c944166301ec7b2a39f1a80aa5ad5cd0d3bc49ac096efa857db235a669221d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/id/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/id/firefox-62.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "7412e6800087d6a7c8222d731379bcd5a0433399afaedcc8a100db908805c44b70e69c59d3fb206e0e1a6b54319582cf04c7977311eb378bb7aceefc4f6dd0e7";
+      sha512 = "8a2130ee6657e39c3f7d32bd705c639789faea541b2ddcb192c9bc9322507f631642465ca24ee2e814ffad41ce1d6316a3a98cb95ef65ff8fd8d2136ee5135f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/is/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/is/firefox-62.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "35d46a41ee55181174dab8e2c5800b67c57b6ef1f0610b343d33637239c0d9d11a49c4480cef262e27cbf1470bf890200d028bffa8d122d98021df4048b50264";
+      sha512 = "ea3765044ecece6162e3d1b1bd10a3c1ca8a6dbfcab7a3acb9d35e27269da102315d1d65bb4029c17cca05ef6f3dd762ab96c3c13d15b06ebbdec865be806f52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/it/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/it/firefox-62.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "4c0049c6d4c6fe5b0c0641bb016262c94b2664a6da2feeeb1d1c5445085e56df8ef7dd2cdf3de42f3b51d51ad17ea2ec80d5e2d7c7293ce3d6ade8be6a2bbbb3";
+      sha512 = "400b8cf5733a93950d8b7f5d51b3b2feb04812fd63de1fdbc9b6cc53637182791239a2493da976b04dcaf30e1e121101a8fd905919f1c246b76edeb680bdc6f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ja/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ja/firefox-62.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "120dee49d479fc93d279af3fd5b95eee84cbccfbbdad2ef4ff8a4801b46b4ade9e63ff43c89d0c314d817352795edaf488dd188d938f234bc50da2ec853b6c61";
+      sha512 = "e20e4c624b1365c5b07097dbd94acc5cff41db8eb4f0d9656ee419f2571a8c82266819fd001f7ac75bf799a37855b036bd019071678cef54c8bf33685ae669af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ka/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ka/firefox-62.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "7ddee2ee68c7c658c663b5ffde44d3cf17b5de22567ea6f8341881791db5e21ad834770cc55b9fc0515af97ffc9e5267e110d384d07aa355f7ade8f0408d4abb";
+      sha512 = "3c23f7f85b30d1e41968f5b5caced4f9632a4dbbc6c28d37766692658158e49a26afa8bb0ba7600f6c6dad9c8048d58c3befb36f822e372d053d2392ffc8ddd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/kab/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/kab/firefox-62.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "c50006005385572138d46e0bafdda1d0dd335d8eb6a1b104666fff20e78b8360ea42fc50bb04856ccfbb4a352bfbe8a1864539b03f0b0332c03961e027d20a73";
+      sha512 = "d6623d0e0cd3776fa9983ce304728bbff19876927c68f4af25be40d8620f4c1af6000aee740c80773d4bc86a825ad5af869a36977eb5113b7b2bff390e328331";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/kk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/kk/firefox-62.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "5f54dbbcce3e680b7d81f607425be37ca099db3c6a9844bbc3347b1a48ba962002fd9edc2d12bab854efbb14d75fbbb3f767d7f8baa3665fc9e4cd671bdb56f3";
+      sha512 = "a4bed4a76ec0d7892fbc2e89d839c66c625abef20c458d794283b1fe423d6f568a29e5e9e186de580cf6118e3d28fab515fdeb11fb1109109f2452c1b57575dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/km/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/km/firefox-62.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "795be12cfd96f0ce4b14dc8b7ce043935329190c4339ee2dea23a526993b2ce39bf89f560c48eeaba266846fa76728496c293c1935bbf05d30e2850a75f6b6f1";
+      sha512 = "b3b99481cbd52bc0c15edda62689bf8a03e9056785e2ba93735138e805a6c992ec28b00eef24f739a8903e805370391c3f3a1577c6e39d661292fb46ed4b24c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/kn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/kn/firefox-62.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "8b37e5da19bad065b17b9507d47e3cfd72898b63788b07fb71e84821de4b399876f73c3a6ee47916bdef9705c275943620618e430012086ad407c1e20b491b8e";
+      sha512 = "9ac915f31e9ac4306cabfd66396cb9cd5dbfda8ff20fe5fcad9c18843c1c15ef578d4c8ba34f0cb46039c28411abbdd6bd9d7ff05481d4f43a53f5222ed230aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ko/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ko/firefox-62.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "134b6b2d83f9c3edf16d78340b0b02b3110c90ae3d058cb6274190d0e3141776e19b3c1f2d05da7b75ad0dc4c5cdae8ed3960e0098bded7828af184f3fe85504";
+      sha512 = "88574a2ee7f59d9e77927d20d6b344a0b8fa28f077d69b881b20c12ef955df57343e02bb5e580c59cd17d9b1224d3b1c1f2dc1a557993585fca2552b50dcdd15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/lij/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/lij/firefox-62.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "63da7c35b9b8281040108611383c09d1c29267971cff0088cf49b1c3a027d057c9d592bfc4e472ef0323c34613fd19f618dc7b238e49d757a7c29b8b3cd37953";
+      sha512 = "e5c30edcc21c2be21f9641e8f63e8b8a9422c9f59f6a6cd22a93f485b3b32a1087d54b25be06d8c4411d4fc75763830fc6ea0afb37f00ef2b4b941448a672d2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/lt/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/lt/firefox-62.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ad619230714997bd8ffb3542ca92d088d12d6984198c613146d8e2883533df3b31edf711fb2c86037ec684eb38f14047ffe0b08213f9e88eecbeae63cdadcd9c";
+      sha512 = "6cf6c1d5dc0950f0f435fadfb6fd50957b9f8d28f9c95654e5bb9becd5dbef5be616b32b44cfcaef34fa8e45023374eb865449a5f4ddc049fe81b992522c0e1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/lv/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/lv/firefox-62.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "a98b3e3a3f020af2344778292d142f2b3c22f11900a3fcb692c378aace90466cdba7777f88a693459a36f80d660fcd61fa382e37774d82aaed1e9e35caf7e5fb";
+      sha512 = "aeba4128b016c1f404037aac3151b570cc47a912d80b0790640b9f21833539be8cd08cbfd3e0c9ad97a922d6e8085f95e57368af4c8b18b8805ae02ef0ba5274";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/mai/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/mai/firefox-62.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "b2bc69eb8b43c06b85463a1b55a1aca1eb10e400615dedaf9c37c7fd6bbb48606dcc6ac3fec19c773560727de7b28027e2001abb60dde9f6644f52a69946a152";
+      sha512 = "3d3721e6b94b8175fbfe89cdc1657705df41ec1cec4f3d41bc9de953db9f1e7c14e4b72d93bae77dd5c9819df005d051680e26fdf284c88b4b03e7e9d999e113";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/mk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/mk/firefox-62.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "88dfd79ea680fece7a0f7847f5ca08535285d1d88a29af13798bb002036bb0dc8ca22d2cacdbba0004205582614440c000248c9321d6647690fe08223ffc6e7f";
+      sha512 = "acc205c5db8d49c1aed33ddc16584c257f526cfaa659ac50973ea7535399cfcae2ae65f6e3fe6fa2928dd717f4e3dd68dc67bb803d4bbde97aa8b9c356be13a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ml/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ml/firefox-62.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "3585ffabd707166d03d42314566783ca1bb67705c5ff4526021024edac1a8ecd0e4577291e184a1593674131fc2839425eaa508687773ebd05b88de49d1a673f";
+      sha512 = "251117f4e329f725c6f732564d1e8ad2d768f9370bfcfb8ce02c59390e8f2950ba9cebfb6b6881d753bdf78942811e927cdfb16fa6e9f59aefa8b9096d59c3bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/mr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/mr/firefox-62.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "5c5ae9543cf0d3002f24a221ef45d1311036015b71709ae5f58b9f34b391ef461168e3c28d831dfba7274d0fb3b6bbad92ffa0e4f2669c05684adfa904ce4321";
+      sha512 = "e999b82d6ccf5b073471ff368b814040e108e3c77e61e1ba4295054d76a7614fbcfdaa179d40b5e3140c1bf5157a8f84766a05ab481de62e8e652ff1dca8bb17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ms/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ms/firefox-62.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "b2f78beb22a3db15c0b68297495c844ea05b640d38512315bbdc78cbaf697ce32b0761215153ab758fecb77751059d6713c3b58dee9734ce6f92873dccd28374";
+      sha512 = "bdd77a30cd42a147a9ed01d892be581d33fdff7045368efe68e41595e0a90af3342a9aa6e5a0f8137ed4006fc312e1341af07a03d29d76f29fc216d2e546dfd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/my/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/my/firefox-62.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "293436a5d80aaebf5b503605f6555b88ca2ef4fc6b3401a3c2dae73121dbaa9c47ab66dec3b206cf6cf41dd21eca77304179108b35fb6bff8062614ea37890ec";
+      sha512 = "571e3cc2ec073954b9db0655c2785a27b8d0f68caa4d5068aa4479c5ab2d8722d15aba9454017acf67ca8aea0fec66134e98bb9e7498b672e1bd5e1e227859bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/nb-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/nb-NO/firefox-62.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "5137cd7ec39c131778e3bd31c7bd446972fe3fa979d7bec25d9a1525a6950f1c6705785c5b51d4e22f735c4e7bc935037beabb656208c0b56e946396bd0c4d21";
+      sha512 = "779f14cded9c57d5c3a17f0a6edbfceeab947d7619662b31c17f0140feb56aca461a9addb8361e966d1464424e980390be2b34f8ca8a8507479df7df6d597dfd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ne-NP/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ne-NP/firefox-62.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "598eff38efafba90b9e647ba2919b47d20bdfa500cfe20091e0a5ba727fdc0d73428705646529023bbc168d4799fcee8b07f7454190f4444579fdc2d162cb642";
+      sha512 = "aa2eac9565d6b9ff8d253700afea11cd3d770617cfaf0704d7ef0f638727a2aabf26c8e7722fb5489e182116cbaf00e11b0af72d1588ef795b9e48352e720542";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/nl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/nl/firefox-62.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "90fefb3678ee43022d26a7700aa2ead9ab553855fa1b710c4a615019cceeac51242efd3dfb92376873493290b69307bec54765f103fb8be7befe29417dfaa0a4";
+      sha512 = "6ea226ee8443f4f9896a83f93265e24cc26dd013948e0d9d3d19c76e3e15e1a434115fdf5a40abca1d83b1a176ec0e57600dcfa4b925ac39c0a61531c780c271";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/nn-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/nn-NO/firefox-62.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c53d02edd38b959a3ae4c49f2b6c9d8d733543689e581ea9059204fd562168664fa198f1a17e5dadc736398bf6801bc9528da5c22ea2213ddfcf58a05ae51167";
+      sha512 = "125bd00e484542d33562baab2c43372b6ddc5d0e5cac726c9d8aa1197009b36f285ec374f92679af2d8735c83ac64e49e3dce66e91699d5085ab78cb3f828172";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/oc/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/oc/firefox-62.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "1807c75e91f695f6eea1a0d247df11b32be7c891d0ca1878e1f3e1d4e8d93913405bbcfec225ae7332358c45397e07c4513c38ab0c8a380568b8cdb4085075ef";
+      sha512 = "637d46a729d97bf89f19065e27a0df509eddfc004e1fb9747d8706e5a81cb08ef44ed4f39a33ef348b2ad1386bc170f87212c220e208d9873b60ffcc25d272e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/or/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/or/firefox-62.0b7.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "345ef8e744e9d19b3e4b7483b8a2a29410bd7fbfb0ca7975acc6e59e24e3fa113781267397a0d140a2025b087ae0bd1201678cc62d491405d03b75500294caa6";
+      sha512 = "37937b438da3aa66c2b74c269f901064f688e35e90ba8f36965d1d5242f9f23662e2b2ed48a2bca6a2ef466993dc5fc83dd3805d481085ab7d38d0df1a8e67e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/pa-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pa-IN/firefox-62.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "5a78778c256aa63d9632f071b9fbe6052308f7300da50218402b0d01a200463d7071bffa02910bdda788261b99141f0ef50d7f863f97efdce6a1ab972ff6d0d7";
+      sha512 = "f6824b350d585753ef731957266b1527153b9ee9170735c49054f230dd5a1c17489c87c9bc462c86b6cad9d24669a897e095ddbe5f07bd5385369ed70ad716b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/pl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pl/firefox-62.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "8b5d3777f2a5e430456fb160ae72fe0849482aaeac64cca9cc96734a7c6e6193689328664aad67d5f8a2d079884af81a65089c80b35d580147cc8f1ddc0cabb5";
+      sha512 = "40b92107afe9ea94a7e4008a8f08fb75b5fcb7b0d1b4b0d7e3c1ad3fbf637c41e9a4529ea894b4f459348a1f2de6cd0c3605c235fec7a1208084b6b902b5d502";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/pt-BR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pt-BR/firefox-62.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "ed84682bffbed2aaaa057f5e4fc215ad52e735bd43a427cde749df2ac1b510962a7886ac019f9a9312a01b29a799860c2ee8368332c6366f5175bf257ef2dc07";
+      sha512 = "0193d7e979d418353fd2437ad198a2a3eb6ea84bc7c1a303d9770ae2225015225f77474e160436386ea9c5de5274a975f29328ae16774712d1ce79b84f5c73ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/pt-PT/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pt-PT/firefox-62.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "904bad1623217ffe6794bb76794242d0337c2f0a2c6e4639458e93e2aa2a9aee331d1129c22a812cd3957780468f9b5146d6217823dda00123d9eee02bdab988";
+      sha512 = "ff3c111f38474f72934c1bc8830210e8af3c09e2ec8ba5375caa823d41a16c025c4eb8d252d81da5e176807c0140e192ec8b8363a1ec8b17cde2c8b9b3ddb59c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/rm/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/rm/firefox-62.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b26d5811f4e9ed0a21c3e6ce99227001f9384c1407e0311bb0def27a3b8edf66e03d8b111825186fd8869a402b12ce636cfa4e37df4bf60d5606a79b85afa80e";
+      sha512 = "c425d9f963c7d44877bb0104d696f3e9e5a1ba5e12b89b456ab9619d3b9116f7029ad586de8db035808d624d2ca5eb3c8ec61bc3d55d00bc6a03cda54ee94c5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ro/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ro/firefox-62.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "7868fa0beadd656ef397d1085df28cf419dfee28d0e2c72ffa6968a734a29e0783cfbe08dd27460786334cea59974bcb5f560ab455097b26ba83bcf38979cb9c";
+      sha512 = "028da63125d09174d040c15fce7f9da9b09fa3f3bf3e186f4a82248193bf5f3b8654feed66f1cb6e499bc00bce1cdde052ba36da72576a53e7e5b34ddb00496c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ru/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ru/firefox-62.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "c93fcf5384cf92ab339e454197d927995a0325c7a25bf3cc03b1d33ab9280c4ada33aac912fef4346763bd94cbca76b5d5a3c4073eaf535f2991bceaf91a442c";
+      sha512 = "55a40b58473f3dc69d6a5525ddd789a833a47ea6d5a7f328ca7badd3089064c726c420d3c208a33f6d9a42c4be5539f361fdf4ed99b82d168785275ed3242740";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/si/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/si/firefox-62.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "0a1a46d63aeeb9ac231cf481e7daa5537f8e716922821e4f3fc7b6948beefd69a217eeaba878ed9f46cd3b5cb28b6a7aaf104aa8dbadc450d99c04dcc3a35927";
+      sha512 = "301926c95511014b7c55a4138f4e0560ead95e2cb874af9e1705f1c78603e082c01c14c0ccce773ba419a536ab7b59e86ce7642cc3cbf6275960a1a13feb0451";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/sk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sk/firefox-62.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "fe9e56e6ae645b22c59110804f4c32c5c3651788fe535ffb78505583a603238ec98a08c36128c0aa2753ab7c6f087c23420685f86b8ecb6fe16bfde23725ba21";
+      sha512 = "b9481bedef44cce5de87460904f2b1f07a8b26fea90813426080ee5a8a3e5165eaa416f0eb2a12117a96ea7293f1ba3175eeaf926258987edef6fad4037836ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/sl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sl/firefox-62.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "fa6ea48c4a3b5ddab611479a23412321519e896a6da2ae83e400dcd80f55f568de32e99aed689a2e2248a2ec609f871394b4ccbf50114469e8d16c1cc496144f";
+      sha512 = "ac15b46ed6222081cc3efd45ec63d21f520b9b7f21497c878c4f92a85e7e220e81b9f0e06cc3e93dbdc0933dedaa23567644f07fd92fbb7b6c9e5c54f7df818f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/son/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/son/firefox-62.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "1819c42a004fef9111cd9340d25a885d374b5a35c77af5b95d2b718ef150da08b01bc422571814f149cdaa5c77569586e391a45ad3410afaa1aff57d8d5c64e2";
+      sha512 = "e8bec5d388d4fc9a188528268bf52a20052cb59fd241c95c5188b8bd10eac80358392b22d06d92a5e53c1d1b73711b988fe6eb330a7e23b3b9f36d73bf69dbea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/sq/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sq/firefox-62.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "fee43ac73a7d0a23ad2539458356ca209f3df671fe3eef022873c408b36567231cfd868636a844d0834bee8637d7b24263e1090eed979782ee7846854d5b7477";
+      sha512 = "8b1ee554fe02b43df5caab092fee5f838ca9b6af08d7d0c0f5ca10fd2933df4a9889ca8868c935997e650c02a24856c4107f5e669f7f2b29dd6eaf14c8b89e14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/sr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sr/firefox-62.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "83d218135681ce787066eb8dabbf1c166f314ef4a81171d3978746231bacc7101dd1d4d83cdb93e618188b3854597d1a4b08d7d3165261354d8ab5f91848af13";
+      sha512 = "9f4969e5aba2f17f7a8b0debec317bec2086bf57b37a0ac5f3dca35e44e2c9facd95b45c71d36ec304d81682a8c5c3d78e13069066c70ac8f98185ecc7a9463a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/sv-SE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sv-SE/firefox-62.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "b544037c9dbb2ab1bd4e4cc6fe9977e9b39e9e98810f97ed9a78bf7d2a509413087897de5df208834e52fcfdef8e4a671cd1c7d570af7c9e2b39dc298c96aeb3";
+      sha512 = "3111191c3b39564bd5a82c709760b68198bc2b9f69cdaadece902416452e103ba046008b11a347bcd229a99016f1addce8e0467f2ad0df943202e01ebd646387";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ta/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ta/firefox-62.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "337b8f04d01680be806b2981b98af43339dd6bfebb6be74102915cc991ed6781917b4a09c004fff4596044739ca09b309abfb2577d6be08471f4fcea69cfc3bb";
+      sha512 = "a27d8d850262a326354dbde3d2d89c1d0a3c5dcebcf6965389942deb0736fb3e757147e0be63b819186d04d2c8e6c990a42e66a45fb87d8c7086cb8e5f2ab51e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/te/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/te/firefox-62.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "6bf25867290bc10bc8012a9a7180d0f498d1a64919de821b0686e29e77f49cdc3fabf7f82215e927e3bd8e0b71ecb94095b418713f70bdaecb408c7c7c041496";
+      sha512 = "d8ff44dda247279a5a317bb46f2c31592bb5eb5265dbfe49395689bce5b1fa5a4e68ef8572e1b22c38adc027f642d568384ee2fe0e617874a198c4c87078f004";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/th/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/th/firefox-62.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "98d001bde11a483c54aa438e666abd7851223af62ce88f827127aaa03eeca8da704c31ae068322491c01fd20863f900945191160ab443fd8f74a32f46a908f59";
+      sha512 = "cf0c879f72af58cb2d5d48dfeaba6fbecc8d7b9da98097bc4c809803abad16637c1cd2654c0f126d338f1293411570e00a6da9859f1fb1fa5cf21cdde3adf366";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/tr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/tr/firefox-62.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "cd1bea4305896f5c56af868672a0139644b5d55686bf1e8bbabcb54119b64f33866efd04fb8947835e655d5e8dee1b33218aa1895314f22872328429a920d7ff";
+      sha512 = "170a004877e6d291ff9806528942e3eeb40647606947eaac7894e1c00f2cb35c86a65cf1c3c43ae6add0dda45394182fc8f490d2ee03c8170ed5de6ce7d11c5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/uk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/uk/firefox-62.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "a6e7b11d8aa7b1172f0accd96405ed2ac5ac7ed7348fb34a52726457f95fc3a70be5d687433fe1f44f1bd940354512f071e93464a0464493492ad70bd9abc551";
+      sha512 = "376fe37bb899f4b55b281ca3de02bd64932f8b5e7ddea118040be782ade87136db0f20c7d4f5137ca4e46c8971c233e08773d182d304050409c15529e9948e32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/ur/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ur/firefox-62.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "3124416feee58c813e95af6bb7b677ec7f223fd6940fd96dc0255a5b9debebf3d9056ccbdefcad3cc1f09061e95b8aa6e2145d6cfbe793bdc07c13a77c978464";
+      sha512 = "5a0e5cf929a746f1c95cdc5f6a055f1db7cb3801cad7286f8fc2576670e11f82515cb585181dcefede8c07c5e28802733951a097734bb8290474844dead84c55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/uz/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/uz/firefox-62.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "cd942e0d51e9f20db538b901af8ed75f6cfa8a77aee3b4cd59c101c02364118a2bb412280dbe12efe4e3a19b48441c50deb226a8baa6cb8c01267e4b4b745c0c";
+      sha512 = "247e462b76fbe292c324f6f53ae1a28d6bc0848571d294727a7428e97585e78c3b9e6f5be0b475abb2fa693b714468b89501c9210712954a2df3e81ef879658d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/vi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/vi/firefox-62.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "1f5ecb60c1e7f9cb53047379e6f028a8042bb8eb5521531c4010c644020953dc39da1e6902e6416554aea0a2abaa90740eaab050bf5dcaab381fa5700c4db4d3";
+      sha512 = "475e8385c72645bef3b6134d0b0188c010892ed3649059a6901b5d25f0531f0ec128634f2069bb12beee176aad54cee3354870eaae4bc0b83fa89d0a73277f9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/xh/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/xh/firefox-62.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "9135c7d05a9e6031a1db5954fd350967cd5019fb8c55cd8bad2bc79cf1327cb838936d25be94a9e9aa5c619a331427763f5aa0c0901b1a72e255eb4f3ca90b0b";
+      sha512 = "d115b5bfb5df8b9e75802edad2284f76443bac7a7f181f81de57a4b6a50205ab89f02bf0113eaf3229774bde4dc36680ae64cfe0e568da0ea9cf91ecc8cb6ddc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/zh-CN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/zh-CN/firefox-62.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "f6b840e3a0db105988bfd7afb069eb285857a5cf931e05f721fa9ae4150b99aaaffa0458b5965f5726ab2ec6f1800f6716ec61cc9af8f86916f0d190aea6fb33";
+      sha512 = "d5f1b3b6d61682bccdefd19af73fab12c06b2f3504118ffa08f87e79bed24e3bca665a25bbbfa260cef425bf9aec7ea5e727fa4c2c65a0a753fb7cdb5db32012";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-x86_64/zh-TW/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/zh-TW/firefox-62.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "b33ea39b8949d13ef257bdc145ae610e66284a1e842e13beab3b5c39f791f1d9f7b06ff606a9b778c11fccd29ff3c59fd65de4c25721dad8a151b4b07857ab92";
+      sha512 = "fcf99f7f0f4c38bad17549f1a52a420981a960a4340ace887d1ddf33e164f048fada855dbe35062a2051767d5a425676ba58e046836f42228b0b4445ce1e689a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ach/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ach/firefox-62.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "4b1e4a1482257ee837344d07ffa0629cd5870aec6848fdd8daeccb6c10182e855c1a2d6e46b902f4b2a23bcb6d4780bcb7cb53d93e5f0828fbaf4a03dc8b8ef5";
+      sha512 = "975a54923bbfd96026682226a58d1e40f58de54c7e6254b519b0f3911c6cabd52580e079a780911e4607090a8f499c584c8b4394107468918df8096196cbab59";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/af/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/af/firefox-62.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "9bc360552bf3a2ce5a99e0ca3920581078b2fc1f5b4100a960d5b92c073bde8a5663d6989546103d40eac3800ab15d236ff490f51e59a33cbb6d55648dfea201";
+      sha512 = "baf76b7abf35cf08b9472241c9e42818de0c0c0c01d7c6a184b43fb422e4106c2d7ded99bd5d1b2faefa79e9e2121d590462bff0f5af5d7022e07c6bff1d9b69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/an/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/an/firefox-62.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "835335371fc0e5c8edf532c889febe18582f1ba20fd30fa8a6fc8704b90f3290aa3b77a3d8bb7d098fdc464c7e2d62f5b648d35d37c0a386c49fd49b65d3dced";
+      sha512 = "61bfb531071ae9f2605db74093c492764fedceda42771f52cee1ae1230283db13deac806d277fce66914a38f8af21b6b447d033457bd2edee0317352efb82b9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ar/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ar/firefox-62.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "58c4427a2b5b1b0fb6bec7310d49def8860fd9ea63e552240788606a511ba8f8e7444b14d3feadf347298369003bf4e694218acd14a0a8463d9f2da81bdb0233";
+      sha512 = "a015ad922023f7a9b0916ee998a69c0b4df1c09139acea785c81a6ee8f66e0788ed845f671235c96166bbbc3f2d7f815cf76cca37a4d74f9f84c01e11e535eb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/as/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/as/firefox-62.0b7.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "9ce8ca7affe925175fa20a396fd944c1bd208a15baa99a080eba2130ef3c9d50ee6e5361fd22e6c8abad31a49e2bdfcfa6a7541ea02616b784f98f90c88f3eac";
+      sha512 = "7d07bd4eefefc3cc7a9ac5cf042e0e4bb7f1d8e7e62d5bd3e5ccb796aeba2979ea2d57535e3e7edccfd1fad5053e894399664d227f0d48d3bc15de48791e7877";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ast/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ast/firefox-62.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "596af06abe1cc9084dd7bf8d096eb081674b1b97c570165a563ff7128f606be519ae25b15a3445b360f437f7e176ea3dc90f941bf4b456c51ba2a8d87dcb870f";
+      sha512 = "7a2328a8464a845e880c0cc77b1de648b7259c669fd04b9a2845f0711750d4e80af29df93b5a79e27b2343bab851fc45e0ff235b49b5f05b3a8d140e63ec358c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/az/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/az/firefox-62.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "428581a7f4e0036a36f96482463a6412c179eb26ac08396499bb2ae6815461204fc1872118d4087ad28154d578f0f857d3459b72f4626ac8ac98368a2c39d6d7";
+      sha512 = "3597dddf41b44a2668afe9f789db5a172f8275ef639005ff1c92064cf7138cec46abc69e6d1f5f47d4bb2359ca6cc2c00d340b875b187e4ae7868d1db61781ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/be/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/be/firefox-62.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "2d6bee5779d64dfb2bc81bdefa67b1c66bdcb0c920a611c684cd9205bf5b8e2a4d9a92a0f84e6e6da0815f04b2e4f36fc94f4b0e6f06b132f761358b9dd2039c";
+      sha512 = "ec3b9429dadfa050b01582bcc3c5cb3250f767af6caf29a073871c018eaf9769f6d22262db0292b57d848c976e754d04bd8a35eb7ad930f404310c1072c42491";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/bg/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bg/firefox-62.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "fefeac5667aa9dd73a1d4fb7272d109785fb212b2323ba4acda6e5825f875ac1af1cd485f9514ed2430942dde326fd96f68ae34f166ebb20844731a2f49a5357";
+      sha512 = "71b37c2b49dfb4fd31391c0df76e0799a594fe290d47dff5d2302956eb345f087e2c4cb813d4b7dc362b1b94c13f41f7e8426a732fd35ac67cfc590ac6fe4941";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/bn-BD/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bn-BD/firefox-62.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "032df7a8dfd6d544df4b1e82697b3f8bb9e5523af4fe20da1cb1e8d78447a6cb5d19da4d871357e452f5ff05ddf4cc8d7f4047a0d82ad6645b14b065cbc8af5f";
+      sha512 = "315f0731708a1a81ad533c70383911d1f6f895bf22c5cec89a75b94c1c7093b69338e3331f610e9fc636ce1efca8b3ff01571fd33f75e4ee86a840db57ca9827";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/bn-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bn-IN/firefox-62.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "61bf0750763e33f9c0e3ae00163a0b17d5440919930040e7d2eed8e67953f7ec151bb9d94628536910dadd9ba603fab3efce9b1542bd0143ca86882caf673f22";
+      sha512 = "b77c9d3f995a4de3eba4a70cafefb0264c41ff0f2d0e9991c3159d09c0e2ba54e982fb73553309dd8ca5dbfb2b58395f68cbf15da4d44536c572a8facdcbbc1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/br/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/br/firefox-62.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1bdcae96ba9394595f18a8a658c1c7763a9745679f4cab983941ce3d54a45ecd89122fc45d2a15c335de9488bb0941eed61ec0ea3015780a1101d8947993799d";
+      sha512 = "442d858b40445db801b61840a8358c7bb3e41dc6a85bf76fe8c76e17b0d448614c2a6e7f8bfbd523e8f8a77527653caa58c874236f1f7a40de3b7729e482c927";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/bs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bs/firefox-62.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "94844765b1e8989dae3eaa298910294c0b53319eac2a5f9657effe63087428fce8eb966603702b756f1044b69b6807cb428659c35bce8a94f6c5dd56e7faa278";
+      sha512 = "f9cae6d565ce99c61e05a76031499ee5c107e2fc80bdf9a9442d42c7c859267ef8f156129cb8ff40602be1e6f15ec523fb0c974ebb6564da76b11283cd593795";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ca/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ca/firefox-62.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "d4e33e2e3a466a9116efe10864f792c8e3d1ed6e00f2aa8934a570287c08a14de59eedc0c7d6f51a015f60f0d0dbf23b6297c4e488a3087593cca4403afd0d29";
+      sha512 = "9967426788fddc85bff9c4cbbaf2a705798f140f37f02c83f0b775f7feb5e11eeea759a6a50fd4ab35df438f2b412158b5335277477f12cf34709cff4ad247a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/cak/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/cak/firefox-62.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "1ac84cc95ac91bcc7eece9120a8c5c3432ae8b6a5d3ee25fbc09ae175ebfd89286114a1ed11f6b3b5373b857b5ca05d5190d42c5dd284c3426b35ac1d0b813df";
+      sha512 = "5be1ceb6040364565a7ae1b7efe8de17a8eb8019faa120a49e5dc65352e8222b16b870c12499da6f31014af6116df6d9f18edfda5e4b778184ef0a973df460e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/cs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/cs/firefox-62.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "993d17d91ace35234104283f14ab1912e117e04c3bc4e96f14255b426b1bac092396a7ac93a11213a8889c32f86267c696e7c56c83ab417e048b69f951c28a6a";
+      sha512 = "83b8037c67b4bd955df35c9f54324f8b4ab06174cd7109ef395eeaeef0c35913e177f7985f64ad2164cea4c81b5fb84f572ecbd7ce681ed05a4abc8ca63adee0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/cy/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/cy/firefox-62.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "2d6f26a2ee139c5a236e94c87129ea7337a41fdd60902303f019f07921906d7920345d023126f689c685a7927a3766354af71a24f6801b43e45d40ef6e199290";
+      sha512 = "47062ba2911ff2cc5efa7492693f48ec9e07001067a6306fdd9a03a415809e663a46dd8e8e96cb96669383968505f44ffb2792db968c5812a2a34cc105fdf0a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/da/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/da/firefox-62.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "86e7bae828b4420bc6f5ecc383e46e6bc1d2eab79db3aeb6280b776052d37f23954a686a0c786bb8fdeffc9ab761388b70004dbdfff864aad5811a99ebdff169";
+      sha512 = "e898eb251bca4de247857ce2adb678774d610ad80b5f213c1c0475e6f569706faf9233a9ce097b589b0289542b272eb52579d86c58290a80065c4c0b676f0c18";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/de/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/de/firefox-62.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "b3949f587f656dbefd1fb6f2ee26250608e1abeb19ad57de826f54473aed6c78a453e2d239f2f139ba03809baf69df1334d2cbe4216b1a16148a84e0a95d5de1";
+      sha512 = "358bcf61e25132f050579a5801a7ece46e3a896ddc179ccc346f763fb5e1f8f33835dd75e5d202e039b8c566d8f7d2d451794a64c20882aa3f25d95db0bdc71a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/dsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/dsb/firefox-62.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "452e42d07b305a3d3a4dbabaa6f4df1d738d3be6851a7faaf9633bb30b06c61da16a7bf690c3c7b6602de05cb75bb759510f3462066c16eb02dbe88f0cf21896";
+      sha512 = "df3e10bf37b9daa974907068e4a10b12d2e709a9a8f291cdaa5b80435d002f4e88e3621ffb3805756cd9c14c7a5ce13a96420114ec282b04d939686a58f875d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/el/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/el/firefox-62.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "42aa339e0a0b237c66892df22b1510d5ff664ecc4619b414f86780165fe7bb3b0232c38e3ad3c243784b1e35104eed8a11b5e7f07862d8958005cace6d563e86";
+      sha512 = "3d8d6709f55991451b908dc9555f1a9a6360bad4b99404c6a32b715a40d770361026fa238d924d33f8f7f9e0c9c480240e2bcc1d8a0c58328b6da19985c023be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/en-CA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-CA/firefox-62.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "3e1d7bb6811ed5ac3be3147a38ef8aec3d19fef14bf8ca3f8f9f0b999e9d14048b81158e9f65c5a4046e7259465e5124a052f76fb217d4d56ee67ae7ce02af84";
+      sha512 = "34ed55f1aa7ef63c12e21dadc6d26074d287524e51ac1fc36e4a83596fe5dc174744e36dbb54e4e6730918c0b3d81ebfb4bcecd3b831d10417f4cdf2f6a31df6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/en-GB/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-GB/firefox-62.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4b57083595839d0e42199c87a956ef7d943fe6cfe36db2da27e3c329350ea1cbd7b9f8786df326d585259bcb78d8531a41ff993c1b747ddeb2010bac40f2082a";
+      sha512 = "f61e87d90b19818b0bfe0f5a143e2a0eb7c447acdb15cfcd14394cde3b24ef72dc993232717b9ffceaf8fbe67dc840f5c5b0e235c01b9b5299769de35216b915";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/en-US/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-US/firefox-62.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "571ff6128121fba497df445301cd0d42efc2fc80911201916f08466f7ea63486dc56e3fe1e2de89f4e25c5ba57bc1a7d4ffe9e9a42c2edb84901e0c01042fc16";
+      sha512 = "0c790b5b49cbf7f5ef5c17dfd6401dde1bef6ebbe356e9aee9daebaba06e3990e0a11fffdfba0a1e292dfb29800f0886910ed9aa03a9557018c7054c6fc3f1e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/en-ZA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-ZA/firefox-62.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "628cfd8a9ef4d4c1fa115e39c4ecce254382feabd0b071c983eec6722dd68ad7cdd527bdb357b5615dfdb1c8eb072c80cf8b3e4ec5271fea0fd5cae479d80cf8";
+      sha512 = "91fec777ba79906bcd16d31a829308093e04c0459e5d53e12cc4cb896fda99ca8ba2d8d219ef7b8eb8bf078cc26740520290bcca6cd0db884ade9a3210608c3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/eo/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/eo/firefox-62.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "6cbc40c779a2150047d0f7a8852868c984b2b345a8ba1b5e3a8fd2a1adf48ec43c9f8b11580233c4256602a8d3bc191b5f3912788b303533333377396f7834f6";
+      sha512 = "4f02fad274ab3f4df93a23a29585ea4a76dce1a03f4f0a7d5e8662b93bd7167ca03821aab5472e53df6812afbf432489c26d26a9d4971615c60928df80edc79d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/es-AR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-AR/firefox-62.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "37f2edcde6948d05a38464de6f4eccf060a8efff23085ec871a53352562dda995e92ef2f06d41aee9720c27c6fea91c974b20501f0dd7cc5351a831154da1bf0";
+      sha512 = "12e3736ea7aba1c7fca5c4a7588e2beabe4fb48a7f2e544643212bd5ed4fb7631cd194614db57f1d892d19d33dce72177dd382a7a444b0cf0d1e668e877395b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/es-CL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-CL/firefox-62.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "9a5594563557e200f4a621d53668cd5aeccce3944c7ff7c56de6fbfef38fbbe4dd9398e083bfb9d88ef6fafb66f3cc5f4d5519cc007d88576afcf9f2f45c67f3";
+      sha512 = "60925ee4a4b889309d6c06e488dedd0be0268ae53dd2925e798efb847c5ad55a44fc9a721929289dccb93ee71c9beabf02619664d2fefe079c488a8f78a0ddf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/es-ES/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-ES/firefox-62.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "c104c4d045ee66e49499595f1a091e8e676436a5e47f37123072affdc69976adc0188b72bef6c993ec2b06901964c603d61d4bf8968e17b7234d3a789c6e27d0";
+      sha512 = "e0fd781ff41ea473a8c3290a833786ee805b531717ee2ceb4f047cb3be3b28f79de2e72ddabd386818b2edc91752ef7068d01a7b8be9c08ff10e04da7b389a75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/es-MX/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-MX/firefox-62.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "3e5014d692599ae2fcc80f1d077cb1e7753a86887a26a340f08b352dec469a0c6811554a2f8268a2db81d4bb26e19a26650cde974106e17a956db462728d0f03";
+      sha512 = "241570b529b54ac5ed5e11c6994decb7ec150e3059e72c6b3fe2d0364e1b939a5814403854e2b6f304819e421894dc7e428d7b09383393e93bfa2a20cfbd3c1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/et/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/et/firefox-62.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "4a12044662680d1a26d8246bac1595891a89ebcda1b5ce2ade5c6d470758b1a447379169636c526ecc4e40476d124b3099e0e76576f995083b671261616b4f31";
+      sha512 = "dd7b97996d02ea78bde550e8a6e3c8d831783cf973d51bdee64bc4b1faa2788d3894927c7636419d6836076cfee19c2d93c87602437633c619274e17c2b7bee3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/eu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/eu/firefox-62.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "fd0bf3f28a41d544d9931fd9c1b1c2869530b8ec1cce6675ad97eec3cd771654ab75aef16cabfd8a30d8dd1ab2741408b9a26d6078604e7e404f4d551af54b5a";
+      sha512 = "4240417595f1b89e5fc4a4f52ea6df65a7377c496740da7fdad4b2cae8fdf705fce7d8a5722fed6d019c006f9c9e9e90c00050d4406c25e12517972bdcd70450";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/fa/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fa/firefox-62.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "d0b2063ae06465b95e055da43ee6cc754658c446ae3b6ab3c00627d8ed7d4a2e46399c1d11bff1d060d1e216c61177cd51ce93631237d826bbf304e0400fc9e0";
+      sha512 = "7edd528c3e29c429686dd5ee1e1bfa4e61fd205dfdd77fc22b0bd76ba02763376b0c83a63d0da6e692cf95da9d5defe04ae48ad06fea72bf5aea8442e43a84cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ff/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ff/firefox-62.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "89c6507f55e3afc837f8be35465f1a8d3e68d472e47de7d94ee025076579d866b119e493e6de8b04f6b173ae1e735eb9a9c0fb62e684b9fc44eb5e89963b7630";
+      sha512 = "c8f5a5df5e5b0859977e72007a5865f5f836aa8fa19375ff281c5e65f50c398f24108abe7334d9cc5a499af3c853df3e1e5c865c1947ee94dda1a812d73c412d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/fi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fi/firefox-62.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "3e0a1c391715448ed8bfa25a1020ab95b5ae0c7589ae8dcb1373190a86b2c044ded3adbe01e8fdad8ba88e31cbe4159c4e259d9115171d5a1c9538ad331eaed9";
+      sha512 = "0d5ee626bddf4accb1d761035d7cc160fec82a014411f79f36aca58bc70794bf0888e0cf1f219b7531f834adba6234e3e664d612bf837da91a0f9c6e21ae336c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/fr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fr/firefox-62.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "c2f2bb5872d29c43c7128592e829ed9a0227d507cfb38e451e663ce75cc939a62fd4dbfbef73a00a9d8a13c8aacd3ab9ec2f6b24f07416535867fe727d334f5f";
+      sha512 = "c2d339db93df22f0b62800a3eed28ce256d9a2d21f0fa1037729df9919d8d0a2a349cc093caf9391e543f02ae00852209c3aa99142461bcc13e502c7c6e3c3b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/fy-NL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fy-NL/firefox-62.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "3b1322559934ba3b9ade5d54b571dcb2d373995e3756f498622bad86607ffabec52fcda61a0e96c51d9da88ec5c1aee0efeea41306ee0b77e955549ce2ecbcc4";
+      sha512 = "e97bef4735689fefccf858e5e957361c95f7e7aaadbf7f72f558fdeacc9f63c009963d571e6771c148e8a4deb92f52024ec95caa46f2ce1287045c1e1af23a49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ga-IE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ga-IE/firefox-62.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "545bcc3709a28cd984149e496bb5b041cded3fc518eeec17d7a62be4d8ada81010a309f4716d433b174533a941d91b234e630c416a1dbbdb1bb5d1a92d0f0ea6";
+      sha512 = "2d21c9910979782560a664cf47931c270e117c047cf799e96701a2107b319c8536489f953f19ba2ebfcf6d5de5a363b6e8caadccfa18bdd5dc62a73018ca6503";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/gd/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gd/firefox-62.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "d2a7860437d9d7c43755eed4826b4472c9d0a0a7e93cb8764201fb3a58298d9ff2871279888b4cdf9c0249a2d69499ee844fefa5a8b317d86ceeb8ae90337c9a";
+      sha512 = "0a2d662ec3639a6ece1ca03100e31b6059b87b31877a54cae0ae177c6d4cae94a8baf28d7a58701a9071d67a9cc164221ebca1fe271d8d18cdc1563dead12225";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/gl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gl/firefox-62.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c9e266b1579e4bafc3b4e3a123d190806b40b7e464a565d329122a4312d039b4e1ad5e68c30ccde251efff4a86d61437aada8bb6c433bbd19ff96585530335b2";
+      sha512 = "166887bf920823e2a713dc95b31ae76edb3d5b96947842c7887e701e91a2b8898cfd355eaa2b8ba4bd8ba5516ff5c976b4222f89d917d88bb339adf0a60275a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/gn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gn/firefox-62.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "5ffb0f2caa586946d62dc0538a27190ee2c03b8b0752b3e5c3b9cb765636593ed74816cdef3916246101715d546852623dbd71e8e3e3540a7d2480320b111167";
+      sha512 = "ed2958f68188167813e57e15a7aa79e862e5b532b09291b6bc615796efdba2e146dfbc16bc9ea2066c5a2d8345d98666ca1cb5fcdd42f3e9683644f5ca7a8c72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/gu-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gu-IN/firefox-62.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "4b91b3021ecce42380b0b1e4c10481b48e158c2176cb97586e617d2e34206f346d26fa6970f83085444956e1259726c66dc21d4abb3ab5644e0eb711ce807e1d";
+      sha512 = "5579cec90bb0beed38066e1a7177bfa923c6da0c5ff7da43c115eb19ffe2b5ed534f4d77a10297a92732d4ab0d7d43d2a15367520c94d53a49e24aaa47be0259";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/he/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/he/firefox-62.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "d81853d2bf123fdb8ca13a927455d21bfcbdaade6062a037db46b8d5ae607d26f59babc802be8e8a9bd6482106a64882fa19a04f90a7493d7c90812cef8af066";
+      sha512 = "90f9f3036ee8cebce48f095feef2d2e1998b99f7d80226d80a5a2a44426a2c2dcc0cec7eee689025fc2c2b91007b752716928240b39883703b7ca1a8d8ab9dcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/hi-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hi-IN/firefox-62.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "1d5223af6e72f65265beb0db85ac5e58ebe75a2490a903448d2ce363686192daee1bcd4e060a866442957abc1c0d7fd200f9bcdcff87d7ff246fc1d1b8869b7c";
+      sha512 = "ac12919d6356c60f0c9ea5184757b797e2fdf6540b625e9d101bb5b39daa44387832643dee2a7b58099e2a3c38b5614140fb21e8db2b7386e2dfc68544f5009b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/hr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hr/firefox-62.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "15e4089c8106e9a2f14182f8b09af3f0b21503de9c7845aa6d662e0daaf61c8b6ac1a4158f2aabbe816792dd182531284ae13bc8d736d6c88bb1b3350bc6b9c1";
+      sha512 = "e109b586cf5dcd14cf5914367fd008edcd852dcb259f312f15394bbb0fd8a749d3adde245e603be86aa9c61941e35d149ac744380b3592210c448cb018e7d624";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/hsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hsb/firefox-62.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "a0bb0b1a8fad9105cd28653fd371af4863ef5987a60fded0527c9eccf999dcb8c3cd3c9b0fbb64f6e4dc669d7703d4d7a21095399f6280014df362fd0b226868";
+      sha512 = "a43016d11bce865c9cd0c6e5825ac17c949c411ba310aca474934822005e34a6daf650e2a46ed8520c8be7b6e0010a375f7947220c8da4ddbc4b8c36958f0ebf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/hu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hu/firefox-62.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "b0db7689415605abd2d6fd41f900470870294c0f977bf9ee61764d52d10ab6060d02d0e1e9a12512ec10ef5faaeddcd10ca805052990be283efd18289d91fba4";
+      sha512 = "5a55532786569b91d50432dce76a240ccfed3196bbac44de5027ab42644b1ca99b9e94197bf5d645ace3a21f8a449f6bebdf31e2f23ac0afca0e1852155582e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/hy-AM/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hy-AM/firefox-62.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d0b91a7a2c59391fca6493920846d6a93ceeb79248831e5a0b41a4c512ac363fdec25716f259840531ca47498610f2f069bec10de1c64594fd22bad136a70890";
+      sha512 = "129b2988cf27a90bf660fcfb7615c27d282931af8a199fadf2c50bfed1cab8c32a66bf67027fde017297ec7dfb987c4c602350b80c2a0aba046c22859b01373f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ia/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ia/firefox-62.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "bcd820d3a5849121f0b9c804541a4988d282f8eab18e1dfbcf4b9a7aa578035514667a38c07dd4686999b4835101cbf5b8c27d1ef21ca5bbc845fa7d4b34ee47";
+      sha512 = "032eac26da807dda8443ea34d63b9ccc53181be8721e03ee620004f892378126829f79661f23fe59d558670d70bd915cdbe43d82235a54005d2474c84a538038";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/id/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/id/firefox-62.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "ce8aadaeb413fd2f190bd3489664d99223bef3e2c75c432ac8dba58bbbb76918d9e3e2ba46aaa4cdfda93fa97f34f21fd9a7d888639098c7ef3a228fe932159b";
+      sha512 = "e30085d635bcee6059fd5689095b4b5d139d0d99bc5c4a7aa3d56a89dd03aea726151efc2b17f871da526628e6f30d1cd78d1cbe43945d2fa1e26bc861d1ee49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/is/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/is/firefox-62.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6464224c5f1901e85f87cd0f00b17e07f059a79e6790ec0e0d3223972b7507d42d6c70950274b892f786e484f2e96de914a8aed679360bd5095aba3d5cd24974";
+      sha512 = "95818e4b3c919ba2437fe4be5d29b9154a42775f64d0e54a19b7113f1714778f8da7296d7a6335e6a886b37133cc2f77a0dbd23a56efb2a0b70b3f33b9e01d78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/it/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/it/firefox-62.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "683068451477ff1927b62ab8275803972acaff599db595e2416385f0236f616c99fed9775b8c0b3147abf43c1fedf9cd3154493fd3ae74fe02ef466ee2024204";
+      sha512 = "58b9ef0bfd439c98f62050af113612f8c824fac859efa16bd4975162698b34580e80bcf1657851284794b6b06f67c51fa1352ae7e1338de657f751fe3faf667a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ja/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ja/firefox-62.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0fd10801ecd673a55b801b959fab46a8401d76c2a095d38ec6110bafb2a6ff56e3034de153278667d092de627150f392a77ee6321dcf75ec872344adb1e9c3cd";
+      sha512 = "ea7097f03c814e02917ac1e87b1cf4957cd99807b1b67e4f505a9d49cbf259ad630b16d718590f767ce0a965f7e31e51eaf93913cb6d16b0fe7ec5d2c62df842";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ka/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ka/firefox-62.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "c647cd5c7c3737e814ad297b2618c99a84ee02229bc09ae915984d982bf6971cc14a42240bb4f2b22f8f8e3cd6252d4fd2b06138da9038bf9f77c315a11ffcce";
+      sha512 = "e146702b09e49bacc799178bf926a26f2d737ba19577742ec200090340e3f9e96aff44db12d3075312d493a993e16e8668642bc7f0bfcb01785175be5594b7d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/kab/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/kab/firefox-62.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "02d497d279202473cf7d61b1d6304208518a8e703861dfa4f8d54636098792b34c44a18e93125f51e99476e229832faa2818ffbe1eb72aa0bb694f4e59549ebf";
+      sha512 = "395878260f2c4bce8e853bb0b7fd8c027928c0b56b6e3ccf40fe012d8e2326cbe9425d077ac8bc8512026c56e629a532524a32119a92c8d9dc0fb5ae2a75b9ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/kk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/kk/firefox-62.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "b9722ca9a4ff07dc957be01537699a754fdb15c17512db7d6e4066398a4d560deae338d2976453b60cf6775e1a8fa32a1aade8acf303b7930dcafc2c4706f748";
+      sha512 = "3c1912aa0cd4e673a3838e4f903c0f4ad5867e21df55074e574e34ab4b90d86ce50fb9e0bbe1df63b3bcd2e66f0c260e2b4c4c299f9546d7cb0dacf0c5639112";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/km/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/km/firefox-62.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "e1a3191d7582867f3b2d9a195e316a84efb634b926c05fdbb24cf99555ede98230ce8f5b2039589872c291d05c13730c2e9320239773bc2e3d4ef4cd08045a94";
+      sha512 = "4f37dfef1903e401c13956114e30f130ef75ac511146b35da0748c1cab40eee23ccbf66496b6f1d4810524b8e2b349d9d0eb89b50e0a41b85f2d612e4c42bd91";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/kn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/kn/firefox-62.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "c4b8214c88c3137bb82b270042685a6220f767ece6b69ea138694683ac76cd68cdc80d5484a44dfc30b05c946c0911adf5fbdf4a7f6970ecbf27d84aa5610a7c";
+      sha512 = "9dcd039eb9686e03fb01794f24180f2de401eaae1d5249ce5d508eddcb9534919c7b03be4b28619ea877bcf66527425f3cb0ba29b016fe7657fefdd9cbe1d7f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ko/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ko/firefox-62.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "9000e15501e514b9eabeafc0424f7959964d980866cdbb84c641f222b17785ee67f3b12d43c1f1c00dc74b0567a9c6a4278432f90b8661278bcb3dc2efad2bff";
+      sha512 = "044c2cd92254bed7540f357565e10ba3904da78a97ccf9348034580a347dd3925b120cdc56e6ab7fdc48d42e353db23748d159fe85ae77c675339ccfa1b96c57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/lij/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/lij/firefox-62.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "44d1f6219d96b7ea5b1cbe369478fbc1a2d31b1cf84d6b2f8321a3de8e24931fbcd3fb67be91bd8a4e81e39addada2e724050becd0e636d8fda34b679513148c";
+      sha512 = "e8d28f84f5529c2c87ffda9d9b2f7db70ef58053e45b36d5cec75fee9260c6be02f25d119121f0b88b3fbd38ee372210ae169fa7f4f5cabf83b3eacede5dbaec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/lt/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/lt/firefox-62.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c0bc8debc93fd945a8b74895a8023edeba05b8204694abfaa327c46532180e3a565c5b2bee969c061772813de13ac06f42221752701250437bb452dedcef943b";
+      sha512 = "0382cffb8af29946cfe770833d17a679f6dfe9a6328d696400207412297bec12250cd76c9918bb4d92bd2093295313570a75c4a885d40db0f4ae78182340f5e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/lv/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/lv/firefox-62.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "68e8f466305659c67ecf0e0cf4537b05bf5b37ba2478cc6e67298fa0bccf0acc786e2980061940b4f91e3dfc8cafa1dd0a844604af24c96d783fa6732ede1288";
+      sha512 = "1994c95642922959157f3604d8691f7d0dcac0ec28073e4dff29ff32243c54c5760b4ae757fead7d153dfb5f21774c482c9fa0a1b09c04109af490cdc2371e93";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/mai/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/mai/firefox-62.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "4802b59be008f8d8e28029e8ab2450df74a730f07594523fe9394587a678e8f5408f56f9d26cabf3c7b2abbe63645fe21f14159eb3ca51472ad249db22fb724a";
+      sha512 = "75c462bc0fb0cfcebf062e3d3135a966f7e4a3b3f490cd85fd6839d9dc7906ed426a5516d1ac281f3d053de0fd1632c38eaac70fb3426f53075bb8c17a82d59c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/mk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/mk/firefox-62.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "523e44d892b41ece7f02d1ff77cabec42c5fe61cba6efaed3dd12507034ba7abec03237ea91d3d953429533c683253039c76fe9bce2f93b24d202ee241b5051a";
+      sha512 = "cc1296d94246b063d87aa6805b8eadb3fc92d84fb7f51796b8880f6c4881b62ed5b5ed6e5df748b208d354ce2bf2835421cbfecd2d3e1d32200162e8308adeb7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ml/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ml/firefox-62.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "c26af07a046cd9fa3083ac946ddd73c852546eb7efc13ac0a569f0c2600082a0536d49aa58644e164c40b9cbc1b06ee8af4435f3e14fe75c64dee2cbbe6cf3d2";
+      sha512 = "82227e46042b0b6fe01431df21f4352f711dbdb83d23a18686778045e013ecfe3d23c99b8fa3ad54f3dab3ffef4310528e6f33c38549971f524a2b35bf632b54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/mr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/mr/firefox-62.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "2d1db3383b5e57f0e399373f57ba04c3985ebd94e42e9a167d18f07a06dd58592777bef28968df99e24469484748e844042570bc57092eb64e7f46a5b861cfb3";
+      sha512 = "4e55466c4930b2c3e04b6448fccda355e881e1bc952828a64774767f0558cfb5ab62fb5bbc5025f723018cc9f77983ba930b16eee94a42a7e791de91283ea8d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ms/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ms/firefox-62.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "3e6d316e0113b41f5f4b123714d5ac3165fa43ab056ec0bda516be49ed4ef0cb08f23d2a19f1b55f1aa940b1339915ba662e1e7f036cff3d482aa1e15041c4c6";
+      sha512 = "5e199272f433765ed505abd5e973f03f8b651249256072b7e3c9c5f3fbd6d19fbba2212f63fd77598c862e021ce2a5a5652fd2c290edc2ed06845fc0c26384db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/my/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/my/firefox-62.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "15a36c51799640625b2c6a6b39d0a7897cd70ade94692b2d7c5e88d5835ccb8ba347ecc9ea5a27d319ad11fc6dda4aec4f11de465d7507b3dde2ce791edd24aa";
+      sha512 = "0b6e1f8b5503590cf357c398e24851d751a8f11e4dc11e9332a8c270bcc2250fc64762cc8ac8d5d31fbdd1c8370536b0fc9c4555992cee7c1780983282437afc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/nb-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/nb-NO/firefox-62.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "f03a2da7bee0c5f8f13d57fcfb31c42d1cac2626bf46efb71416a823954697b9e12d52777c75adadf9bee9800cfbae4021e8296c9613afc2594b164c1af948b6";
+      sha512 = "de93e7a9f4d7d0b080e461b2019d563d7808487f05e0fe8f1fe629deb06989c9a855f62e37d4b6a29156771f5f9e3c5878ccf554611f868602f93e32a7226f51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ne-NP/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ne-NP/firefox-62.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "c77a0670e657f3b06eb0196ce5e31df2dc316fa4071aac4759976eb6d7b15019c8596910fc5a1f732ca705011b0c59dad875421d8246c08fafc9efd9ca1c95b3";
+      sha512 = "c2fad6afb58300f0254a48ff15b4b2cc9c7340b83cbed601d8bf04f2ae4751a3c44d88d3cc25d4cb6a84fbfdeb833da73b926433028aa38f51d57379a63b812d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/nl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/nl/firefox-62.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "04e39ecf04753d67dd7aa34bbd423d07f2c85d6ab4fba20d0ae7aa169a8e46dee98dc979782db96bc656a29195e8b1dae810d8096d60253c6a10a7b1352fd899";
+      sha512 = "92214e4f739b269cd22f0199c69f4a412d201810d2d3c2db9ae14ee7313cce13caebe6bbb76fb761e5877557c161f157d06e8b00c99d6427dca19d7c66494e4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/nn-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/nn-NO/firefox-62.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "8c07d3bc9c8718624d067fdea2f26d8a3f01203590f996f431e62815dda5ed13bc53f0c2524d8f784a3aa3c5d14982169bfa0ee976b59c98c6e53c7e50cf45b0";
+      sha512 = "53af052d5eabb1df13610df29a861480a280956481296177ee9d7a23bd2d13aaf25f43e7ddee36578c6f2ff9d4720e6a23b02881332c398499f40b5bd4aca111";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/oc/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/oc/firefox-62.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "4c0a24b1e4c00d347b9ffb3e8c95fd8ab69d47886bc11b7b34d1a1a33b1143a9402dd55973abe1db82872e56e3b59280a957946ddb2b3af6325ea9d2a18b275a";
+      sha512 = "ee1d736d5dd6ad580d6c9f4306efa40c17dde30f4942ef69b3fe0ce5922394910989a8881cf17a92c8ca04b8fdbdc52af3495a29cf6a4db98e563d2b57cb7437";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/or/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/or/firefox-62.0b7.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "fbae096aa5a62f004ca4612f89199149a8a2c6e418f5e1a6fdd7e1493bc39261f6b7e09115aba5d950c8e999443d105acc6671f68585c7bc69b5d65af76dbdca";
+      sha512 = "dcec55dc91b45c0629d312e12b6967b9195b8d5fbb3a14f894eaaed751c2c207c3a534d7dea2cb8395801d4541a9a8206f2faeade2cbf8c17091a8f5cd1faf53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/pa-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pa-IN/firefox-62.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "668964525703071892fa9001c8d27a647ffa127a36c57d5bc6b9386b02fceb5d82a340c70e43f8f60aa92d98f78f37c3fa45451f0299cac70101a48745666959";
+      sha512 = "4d26ba158ebb7a7a8f13f629e3c9ae9e50d7271710daec503a89ff962269ab4ddbeb01e62fb2e2cae3b43426ede9c98a2f5857804e44e473a6e6b6f97f3ba72e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/pl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pl/firefox-62.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "60ef715013bf40e6d26fc36d7a710bab50f627fcf18b4d8db38999f3f5b2b51dd23d282aeb5dd156114e8567df762ac005b90a6b29a4eca2b8c44c27d55e92c0";
+      sha512 = "c289eb22fe70b0e75177dd5bcd8fdd9f73a9215e06d9ee1de7b17c1cc5a566b801491a2ff3370cf565ff4d8cf4078300bb87e58a3a8eee81b6993f75f7d1d767";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/pt-BR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pt-BR/firefox-62.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b03b454dea7e990fcb352f9aaaa15269c04d3a5d455e6f128c7e373154d54a406057c301b1fd4cb2bbe80d89aff27d91ed39b8bb89ab4301de18269a1e75c510";
+      sha512 = "3343bc7d0c1b9ea2f4a36e2b2d91e8681348409eb92dd694d692502cba2dda4a3a8e90a9639508a4a954106f86b557ece96348b216736b262e59d7907dc02c0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/pt-PT/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pt-PT/firefox-62.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0d3f7518904a055b80d9105df21a32458e380f592c7eea4cf7a7e32fce8ebc87df6090481b5dca76a43990053ec9dfcf9d6a49350c893fd977b2d0832371750f";
+      sha512 = "dd482faeac423ab8c1d8721930e1c1ba56fc37a7f8bb263098bdb41bb54c9bff3835e774290f7ec1de494c922dd800454c3405f893d942b0f813d8e7ae9459cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/rm/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/rm/firefox-62.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "3b7b40f8a23b7cb47d4e7b4891148786a552d9aad97552ea5ce9258ac9ee5b45ef091bc8ae2d66e47a88252df31c96dbdb63c8c11141dc977ae99a741f7ea502";
+      sha512 = "50dc6a0e06eabb8ed5bbfa5d5cfb8672c429b1d0df858723225cdf14026f86746b4b3e8b43da9c3c3676c475ad4fcb6b8eb9ad6cac3321c3c891c57706518ceb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ro/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ro/firefox-62.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3a5393c64a5b01ed1d6fa5c7836b44a107aa9b38b8e6ef3c3668c1b56b5723394a0e4e5d6720eecc1728d7f151d318f5c71d0d1ddb0b3354ef829168c67a0dc7";
+      sha512 = "e657a1a1860357b63616a8d3460ef68647681cfd4e379ed9020d050e7301e8ed3ec03b55b390fb62127cb42cb5f38f44c550be27b5ea596ef344f6e678723aeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ru/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ru/firefox-62.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "7c5ce112a41983a69104704cbc3d69ceb68b22ec1be357eb0aebbec0b8288c2d820a6786da4d9b50d594d0d5b30616f80779b1e84d45546bb1d18ca2b7af762c";
+      sha512 = "301a985f4f8141e6009301f33dcd0fea04e5ca93b3e90cb04bff8335dbdcf24c0ce620c530ddeb1329fcdc4d2f0302fd377bd5c6cf9d084427a2ae3a9c93ca16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/si/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/si/firefox-62.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "44ef8d1c7422a8f5ac26365b394327d30a972c31a18224f2cfb10a48da7eff32247823306ee5025d39b241cca8e6bf632cc45b8938642c02eee049d055fa9529";
+      sha512 = "a614e7c7ce0c0a7adb3be20caa1c14c8149d62d2954ddecec9f93aa59e04d19a99430bdde16f7b6bfc4e9fb08baa3db4f18fea9096af5d77aa1978e046bba944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/sk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sk/firefox-62.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "74005730bd3e3ea6347523fc7490ca74caa224de38e79cd7c1f13fc3e687d73e279ded19379142e1ecc2e7662b6a6808999ada7ce8f364141c0974e0c5f37e8b";
+      sha512 = "e057fe25cac653c8ac8fda77a7652304e41363c321c558d3f259f34ffc28495ce4ffd4f262715a9dacb4fb4cefa241679062323b3f06518f4f98908453375de8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/sl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sl/firefox-62.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "87ea123ee9d34ac62870959e8590e3e37a044066c482282be1f354c7e04a1349fd9685bf65176e73bcac650d665f09883ab607a853383ec083e27a10e6389d73";
+      sha512 = "fe9dcc8335fe0fb9f0192bc7b8e36316c0cc97788b5f0faf07c2df7eb7074a5339a05155c8c2bd750869d4bb48b43769b1f291697e5c58a1361426ab09bd8b25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/son/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/son/firefox-62.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "5001a37162e8ea34e9a615d5a4c7450804bb36fc2483fe8f0dba004ebb16255bfb40e9cebb2d163cd2eeddf2a2f234dc1b54b7811137a28ce940bf69c67ed854";
+      sha512 = "71ffdcbf18952c3d74c380c827e09985b417554f9534e6900af88f8b2eaea63d88a5856b5b0ebccabbe61f03136863ddafc6ee2e25a677a37eac367163787716";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/sq/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sq/firefox-62.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "9c2af1ad6facd039a8baedf244f4f477c307a4f7670be618544441a4bfbf2ab918da804208f1627da797091253bf0cd4e6b97c11d0b86961c05925eaf696bcdf";
+      sha512 = "cd1c70628d454b36f784ffcd5fcddbe8706efdbdc8e4f2787383d6abf21fc7389df535d8e0cb56b02e8ba81201e96be72460338c164923ca98db2f0560ebadb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/sr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sr/firefox-62.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "44c378eb391fea589c6e629963d4bb5d38c35288bde9185d5ab84a49fa50ddd2944696fa843a61c9549a8cadea436655a09cb76868f5e3299a49c83388da5786";
+      sha512 = "b651ab59602beb11b770078fde359018c10fb5daff660bbac5001659d702eaccc378089ed70137534d72405c55a7adc779e3718d5af9ed65708d6c855a0fd564";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/sv-SE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sv-SE/firefox-62.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "f034aaf0fdb7088b03cbfe6e252345d3fb485269e592989bac43b843fa15b2435f2906c74a030dfa9af0e2c21727b098185ae0bf983f21aee8b96683b7e6e09f";
+      sha512 = "83978cbcc69ce53398792e8a45771c0546120921d6692424e6f5c224d271deac960adbea2427335d2f02f3aa146372577d545905ceb3e7e05919ce0679858bcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ta/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ta/firefox-62.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "56e31f64dccb352f3bef5a4a321829165b50cf91d18421493b13c107366cd09abe924aa8cf4cb95921e8adffe699841f83d8f72ae8f5ae92ca5a7688d6bb2e82";
+      sha512 = "00f3ce929753843a2dc702e5a7620708426cfa76447bed7c1c35dc621d3963ac96cdf9fc6148063011bd71b78cd21fb1cb250f35e3da0de4e82ddc4fb39b0a03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/te/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/te/firefox-62.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "3ffdcd81cc6ffbe310237f9f029e25db360df6ac69ac194d07f614ca40cb47f868075bacdde733924992be2c7959ea7bbd85514f9ba5f8e244d83bebc1b5ec52";
+      sha512 = "a3c79939a66aa443a9507ea9598b8e95623b667df5a7b164c40f399e0360ac4e01e62298558f0ef908954152eeed029935a2ad56723848797486b889699eaa61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/th/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/th/firefox-62.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "70f8fefc0d92389b8f567625928e136c72652a89ef19b10505e2c519d5f58d88be955397f9cf45f5e393f10483c377d6f5da80f0eaf0da3b211ac6f47652a2ac";
+      sha512 = "de4fd5d543517dcc20d2001a315a9d5b91c95de2d3ba7effd155606bfe49b59c8f3289b11fc8843e5923b2d897a7fbd069246f73d463055b30e7c77afc1946c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/tr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/tr/firefox-62.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "621136059c44105354e8359fe638b27078f2c64cdf31d3cb94dc50da0284b0143ea1458974bded4eb70897f5a8ce608352e272db21de27c5e45a744443291862";
+      sha512 = "3bbe97c3ac6c99364346883033bc60535a897730a24e1b102424e6a04729367bd219cfddcb6b28ac61dac8cac12bbaa0a70088afd38f9fe96cc865cff838ad4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/uk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/uk/firefox-62.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "c1ff439bf8c2f942fef0ce36589abd2a3d67a4ae163c1a1831fede2fe3354111f2ceed21fe8c756133691d49e7ccd97e5f022f9bfa9bf6b6c11048fe8f4f25c3";
+      sha512 = "eb2e0e2e9a4d9ee565a4f0a70e7c38802de5a97ce03ed29f7a3b75db24627433007fa905863e5c039e556844bab78e1533868f8c3b0de6df7ad433c75adf260d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/ur/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ur/firefox-62.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "fba463b271d98885804019a016853ca13dab5d488aa34b7e86ba99f190bd2a0b3b35d65721e38e95d16e8bc54d91380ed1600f7f4bec6bf77e7980255de34ae1";
+      sha512 = "c20be19ffe828443c21207e2fc7c0384e784ffe89df4ca495e8ff74a2c0a8cdefc3b5184d274898f9e60347138d8bb93051068537066d229be12602260b3c8bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/uz/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/uz/firefox-62.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "a2c9c0b611650c1fd84efff7b479ba434f53c5f26394ad5ef2a339c403bae15d62ecf043626677c4034bf5c8a688f504a1d731bb55fb3311ad3a858fc7a25919";
+      sha512 = "aa72e03bdb97454165d65dece955a992a99060bbb0bd5442abde44c9f5c16a150a46d2c4c86df25545c45ee6eb5a46957336b1ea5620d1075ef8f854de1167de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/vi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/vi/firefox-62.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "2d9bc985793d3400d85b40be4910f04b60a0070f3f7881f30cdb438af4e96be5a1187e5f598d3b6f9b4edaaab086877b43dacffe0125b46035c9ebbe7a026a4d";
+      sha512 = "7b675b04a88431c7e30499bef4d7b686f82c78ccef13b736f608fbe6d2679bcdf2775617b373768bb8522fe783a6d188006c6bd4331a5bef7cd704c003dca64e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/xh/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/xh/firefox-62.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "240199a9dbcc64d6a3eea93954e82911de3a32e45a3fa679d81e07599cc609cb8ccc11f53ec6731b13d57c6a1896fc310ae94a7946a2cbb5eb4538e1812a85b6";
+      sha512 = "c01ef2654fe8c6ca63a3fc60f1e8ae0c60f210aa369ff162da14efd5893c508f01fea15010393be524b4b8eaaca4904bd744000c079cb5ef4ff128aca7f98918";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/zh-CN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/zh-CN/firefox-62.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "b1841f293446433848d0645cef9de9e3cf1e351d50b0960dff9ca3237fa3a2cdbafadeae9e44293a821ce3d05ad361ec3c3ed05a3927ec49521b411e816fd259";
+      sha512 = "a0715b49ff620ffbba8387032df76359f8921de3bed66a1f1151dafb7b2cfde5fe9776e6826cc189d3b4292042bb32bc008eec7f06a572b8e8839e1e32ae4098";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b6/linux-i686/zh-TW/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/zh-TW/firefox-62.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "0d97a34a5b3df17e36588046afd6b8f937bec466b3e093ae066eb4bf4f459c465f462f8b692e8f78c442aba799083273be84c4b1452f1bfd07803c24f6246390";
+      sha512 = "2e9a9799e6f3da140f557c58ebaad55a1492ee462d622dd256370a36e5dd6b82f122fdaac7642265debdf7feb97fd6ae741293bdb3e7c1b142e1f90b06817cba";
     }
     ];
 }

From 47ecb64e43f2c3245e4aae7fa203a589d0c36e73 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 10 Jul 2018 18:06:09 +0800
Subject: [PATCH 40/46] firefox-beta-bin: 62.0b6 -> 62.0b7

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index aae86ecf0814..5bd0884a2960 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0b6";
+  version = "62.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ach/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ach/firefox-62.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "2147f2a452deb1f7ee7c5292a218075b38b541dddaabc6ef28c3bdf115dbfe415b82b3400da057783d13ccc53d7eeca0d8b7ad8c416409acd15787d9b9f9cafb";
+      sha512 = "163788dbe3058283a1212beb8dc9a5003b738eabac31972c2cceb55f37d7c264facc6148a176b5f44b03ec70824a58fb66581be42960b6a225d53ae6d96f3d62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/af/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/af/firefox-62.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "563b003eeca4180414ef5e78a49cdabe4defe39cf4195b2c4d5b677536bfe05d6532c0c204164fec630e61cd4aa3191fcc1734bb7bc509d32e3eb5f748665a3d";
+      sha512 = "908c4e95c73ccd3d57c519f3d97701ae65b0a29c1f7789b93be93a0ec1f28f6b728b147fba1cb56718f5903cc2e5406227c6270d8d3e7a1684a8e220a283de86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/an/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/an/firefox-62.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "f976dd3ec18f06640673d82285855fa0762f5a766613dd36551ce6c95dff3db42bd476a5fe161dcd6329d65bdc67ffa3b20b4237e1287985296deb0fbf0f0c92";
+      sha512 = "6cf6f5476a9ec179cb43e4d4590dbcf9a2fb8c321712ab2b73ae417e08b8d345da19571595dd62b3514b455e16bfd2cd25a60df50538186487985f090cf5a6a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ar/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ar/firefox-62.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "5def85c259f86f8db459cdced6d402ae7e496b252d79c9026bbcaca4f59fc82bf16eba9b943d5d60d9a4cbc3b17efb80d160a2ba73c2b8f7efcc65b0e87e5676";
+      sha512 = "95e7fd5827b1788c9a6ee8a4aa74affa6f02bab7347b42a3346907569af650a0a7675099067c1a135f8682c2107604802c0ed7e09f7901985296a63f546a5f86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/as/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/as/firefox-62.0b7.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b451b0aef748e3254305c79bce16c3704741be446c263440c1909dc07983581a929cd120ba40ea2bc53b10d730d0e11addc95207556565ce655f250ee7c9911b";
+      sha512 = "dbf0a12922b0c9ef719a1639394fa45bae0efcd7d83e62698b31cee4f3ac1e07991ab73a11f70ae3998e86451013aae3573f0b962f7d30084e896e07fcc00f75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ast/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ast/firefox-62.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "9877f0d57e19d4a03bbedd510371b510fdbd56895df32a6a462effbfeeb9976be4094a265468b31c7ed1248cde87839be8d13becadc7349209c43a4b3a0c1061";
+      sha512 = "e73ef5e7c8845bde672bc57a02e2a39fe9114f773e62a6eb6b5d1bc25e6b34195f58d2622d58e72760f8846338ce7596c3e6b4e5b6632cea93b259701ac6d92c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/az/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/az/firefox-62.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "fdf483968c7b3db7396d457b2bdab7ea6065401b86d130c517924bf9b9a5349fe0095e21414c8b384ace05c01af293cd6edb1296da00f78de49314c199b54245";
+      sha512 = "b09318a9680625eb2ff5e2cc78db800e7864b1fdd590243aabdfd666e63e2286b52a7fccc7e8b4c725a97932525cd41ee177d467e22f11eaa35699e2675c1397";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/be/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/be/firefox-62.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "7bc2381e9816b9f752c0e149b4fe7f4829c6f395a036ad2d7a5575ea4df3a6cb4d8a839d71e8e5c80ea13880b40f9fe0489ae0886206c8ff3451b9d28103eba2";
+      sha512 = "d23236403a839244d5a7f858b361904ffecf054c3b72a3412f6b9c93e501a553099d15832ede79f4bbab2a4a1e83357d32739c766b4d45f3fd7628f2febbf859";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/bg/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bg/firefox-62.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "865363231a7b216fed235fda3ae8d6a9fc51924bbd2d078244061210c308524988f94bda7a6e230a0d55a07baa311d96ba2070ad6406770bdee2c7bb93684a7d";
+      sha512 = "46d8bb69487b784d73ee4f2932506790bee6176c0f733e3e6c256305616f2ca063dcc1188eed7d832d0d8d7759bb77d3195fc40e27b8776cbdbcd2b8d6b77dd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/bn-BD/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bn-BD/firefox-62.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "dc2853e57393fe160e3107cf5e98a3b80756aaf752ac8e9e3f5a0fbabdfbd70a2846619c50f3394ec348a063dd284e982016c8f104757669b6a2bb63546c1dfa";
+      sha512 = "f3cfc19e285ff3c1a529c6326d9f75e2aace9ba90630b7f677db0ce2cb35a73041860391ae8df0b3fe4c70e1e43db0b846cbea0faa8ae98ca82cab2640bf9ed2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/bn-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bn-IN/firefox-62.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "f50073e98c3785f23b9ccbd277b3b5fcb0e884bdd229d44bf92d7a986eb2a0f67a61e963b45d94862a5d38e31495a75eef7e214c1243072140f2ec237f54c389";
+      sha512 = "4de293fb2432ac8b482e5a1f35c40f3338ed234fe241f12273e01877232ea6a9e1519a77325114fa1b7f65f6cc03f7fea1216774c258c07708d1046dd637875b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/br/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/br/firefox-62.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "1b1f5d209c0222166ece01db05030e69c3f09fe2234349074b4a5b7d238aeaf7440a1966d8393d6e9198b6e881388a6f316e613918ee87483733b98660011c75";
+      sha512 = "e26030c4844e1b8948f1ce67743be895ae5f95ff02bacc6867f8c18bb9ca550d53d4db60eccb57f7e0edab2173d3982d8b04c7ee562fd0f6da1cfb8cbe444393";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/bs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bs/firefox-62.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "2968b25e216442f493a538ae2921fa87c1443a0f8a653dc48680492e725b5ee35d10960c27e17075fbea70fc9eccab5bc90f388f18b1cd90fab5eeb71cee18df";
+      sha512 = "cf21fe405062db8440531d8d2f2a0b4d59a570306e31206f364a73bc45ed5cb0f20fc795b337283c0422ae0c85f18052d26f446bf2804296afa40afa8f092d94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ca/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ca/firefox-62.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "76bbf9696976dc734d82cf02468fff0c2ad148815f992b7944d4297f98ab3976c92827154cf72a8c3701ef8aa41ab6c2a0747fe689d212b4be5e91f50a3c6888";
+      sha512 = "8d53d833069f5fdddcc07a2530acd5466c9957da1f9891824aa379d1e519083c4dae5774ae6624369101d7ca80384bc7db1d2686c0d2d8ed5b4a005d7c0a1a84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/cak/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/cak/firefox-62.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "257c25646ced4ac6951b16136dd4ef9fc0553925b627b34888c76278cb2a135cd611e64975b7eca9082205d3dfc7b876b0a34126e977c87f75cbb5348ca852b8";
+      sha512 = "4b21030ba573735a370049fc97a20a857ea9b2fa26047403d00a13ec05f511584bda5553e4a7205b0147d86b09eba9cb74599005918fd85a77f06ed4cbe5db1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/cs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/cs/firefox-62.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "5acc01429c4f04391b5d76508c4fe7a651a4f1059eaa682411fa86f6d734b143ef698606123170c9efa1163b5ba2e75784b07701086ec8429920e51b3fc1242c";
+      sha512 = "e91ac0cfdd8c1e63496b26b03d11695ca983b9da148dea1bea64e3069b43fd9b06fb35e09ddcf51ea296d86854eb5c7982d64134c489f75afce9738055ad1e72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/cy/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/cy/firefox-62.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "1dfb39c6997a179594b7d96174b73aa2cb7a51fd0bc0704fc9cb3fc7caa2e7e484c09347464e9a0bd2112ea94ccdb33d01cde6f360d6febb0befc30321313173";
+      sha512 = "0133d4d259ed60ec44d5cc8e8e97b7dd984af1dc303232435a0df4968b6a437bcd0bbdd15c7affa69a82374ca803ed913cf1105fd1008b13564de4fcaacefa59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/da/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/da/firefox-62.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "f327c774f30d2dd7f734c03e35c3cdacfeecf24e834b9173e5879a5f7b8fa329a2a5b898dfc9fd1f5b9b1e84367a0ef51f94e2259527e5bffdfe31960c88acf4";
+      sha512 = "c63d00b7526fa981ac59fef73ebb237c205e6b47a8f7fa55790914e65f1893ffa4be3833fe94a83b1a372943bdcd1aa7a6f88dac5fe0c99e28eeac4c9af6eff8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/de/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/de/firefox-62.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "ab7e2486525581015028f258f467bd0753e120f9eda3bc5caab75b54c420c05623a094ca9f0c4d00415cdfab78577ea633a68df8c615d4f9f55fe412f3df88ef";
+      sha512 = "03237e7837e2796a74e2789372ebcf10ffcbbc86a183741db65d361d705a6f39d351555a2c05496143b507fdd1dc7c48606bad45111303eccf07e12cb501970d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/dsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/dsb/firefox-62.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "fc8fae62407ecd58eeeeb05757048d07b46a8b31fbe4f44bac4d4491b375a1b95fff29df3fb390971750c39c89edd14a8eab4710c2d61b73d88a4d79913a43c5";
+      sha512 = "64a484ab889d07fb58eb017f2bcf59d553d113cdf5657ed92ce5730b137edd71f333a80adeaaee01381701648e30b59fc04d4827ebb25d67c763284fa698e54a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/el/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/el/firefox-62.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "1e7a5e7ffaf62ba2bbe71e3f2e3bb193bc9e56d9d80a097454dfb7643ac83125d2a4174b9ee300ed969dc325620042aadeda3a71ddc4c0a236b0c23b3926dc6c";
+      sha512 = "4272c946e86d7d68f901ca9c8650f43bff176b77cf8cf29aba044e0d74e69285bf7546fdffb67636e91104d694d201eb4806807348799ca5a4d3248083251a31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/en-CA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-CA/firefox-62.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "dbe7e2d0c0f8d3fd28aba140aeeca3846e7b30095adadddc1dd1dc8997f9c74ca05d6aa55b08401616f8d41d1b08cb8c0d2a2094a22a218256ff550300106647";
+      sha512 = "df82764a4c1ace4e6b7e03c0afb27ee63f4cbfb3c487c15ff62f7d2d9ecbe9b7b4cdb92d84e59da3b2bd937fbcc2487fc3e34f12ab97af2a1f701c9db796500e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/en-GB/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-GB/firefox-62.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "da9dea59debe5f8c2b018d5484fa833f8fa8f2744eaca8f8ead37f5bd1474db355b48b602575c6492c29ca0b74058ffd8bafefb2ebb6675e9994f4d9b40d4bc7";
+      sha512 = "2f23366dda0a8dfd4e24e1f1fe8bd503d1d77fc2a8a2d289c87b020b7154fe5fa5a2348b6df2bd2bc204ff5281d0537ac7a41f96b60abcfc3bd24cf6c24704e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/en-US/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-US/firefox-62.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "510781450cfabd229074fd0559a7a2a1a02adcb92380fc586d9fe78fb5e6e78873c32983b5217bc8ff5659e46caa5e772d3dadf8172dddfd633bc5b7c52b9c63";
+      sha512 = "56da10764e0da764bb69c790bb98b2f7d12e9dcd4d6eaf37ae876c9b360a8a64136cdc0fb3cefadec225ff6d32cb138cc5c0e4d8b50a4bff9944feeb268504d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/en-ZA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-ZA/firefox-62.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "22441551ab5e631bfc8a4d77274210abd8b4adc0bffdc3330addf271a36ecfca203399d5115ac659e8dce7cf8b4c91aab6ec12823ed4003b5150ebda5eebb1a3";
+      sha512 = "477d0b2a9841094791338b52e735f02f5c57321caa0ab7f263c69b55e36be1d75c2ddcc58e3d698eb3a62ff62f5d6d3f1ccb89b07c54ecd43381634a13ee084e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/eo/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/eo/firefox-62.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "c32aad38b9f0fd4b49ca66b5df747282840fdb22a87f932fe69c438bf3bb258dcf00f1bddad4d47c3a9d0dcc79d61b69167a475b027fdc7dc246b9e737d6ee7d";
+      sha512 = "66e0c1af22d23aa1f5a1b7a85ecaa454a5108e9f5b6efa74ed665d8cee16461a202905d245edbd634cc264694b8ac7a72a4bff3bf328e4b6a5920e6a200492fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/es-AR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-AR/firefox-62.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "6ac4a08217edb21a998dcb97110996419a4f259d950da5122300ee3628d689f70db15856c79e7fc0ca0f2ba2820032bec3cdf976acdf2b1c49ad29f2e55744ad";
+      sha512 = "a70b475a1bc355ed327603244ff3712ca5861d4ea02fe5656790dddf150675cd93dc75c3b6d8313827f4387c1bc77e51658dd5bc4c05937714ecc89563e57b2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/es-CL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-CL/firefox-62.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "161617206a1ee6176c8d0b46239003d839c34608549f14ef6db1d5e20832666df4ae412aaf5e6e61af0b00b840cbaec3492958e4438a39243549e66c044ca8f2";
+      sha512 = "1f084de18558cc48c3132b92bf9f965f046f22be3b372abbecc8c66fcbca76353e9ca6c6a129d2cfb33d2e1c992d0c84d0c6bd675e563866209f8d7b62f51743";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/es-ES/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-ES/firefox-62.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "c135ef87f3aea2e3b553c8a31b92112940b8e9d963bc3f28a8de9cfe09afe3ccc9473656d8ca974c8b8f7b99beb515fc20609d7ede8eabc0d2da9aa435891c11";
+      sha512 = "3cfb98b9da207c38fc9cf5a2a137dd16c061563fb6d1c753c07806844327833051f873a68dca556a7b4c34177f91b8a68c2816dc90d59ee5124f234eb619f6e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/es-MX/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-MX/firefox-62.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "76fcbe203ba565e28817000c3b946d04452adfd3945f9a6f0be0c589be96dd93c9cb18f903f97507074c073841c30fe5821cc69d2ee084352af926bca41b94e4";
+      sha512 = "52c1bb0a2e0c14ca0181e9686a32cefd618cc0b3e5e03220debf62786902309190168616278864d15709232ec72ba71f6e35b84009ee654fda7655879fea064c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/et/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/et/firefox-62.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "924245634c34f1ede690ca9cf35381a9b41f8d04daafa2bdbddfb5a538949f1c0ad653a8043e9ccda6d8ac2f5bbf4bf1955442b43f0fc388cd110534afd4caad";
+      sha512 = "80a5f0b7cb361c624a8e2f78ce57cd44162bfed649812cabb63f1730ce8127903a02969e8ef9ed5216c7e715cdd5163c25d4963b4c339c86bf13449d1079a4e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/eu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/eu/firefox-62.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "d5b2e6a624f1279cdcde7a7a9724a4b0b0d8bb534e86ff6ff70742b3b7efad1ffc6163afc523a89f20020c0ca2e6a59b68c1e5d69366c8c620605f3b583b41dd";
+      sha512 = "e82abfa642497881fbb6607ae36ce6e5bac8dfae6ab83a4af375fbfe8182f6d1c67e42eee07e3c9e8c447a6949b9cb68e76189c8f15d0726b28cd902db92c62b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/fa/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fa/firefox-62.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "7dd5013b3a4564e831ebb16237171602f44021eb0571e023b2b0ec80ba644894bbda368e9c5277c81912260bb1192e3b136f5dc0f5eb2df8d1a88da5d3ca1727";
+      sha512 = "597293fdbca22da077653bd3c8a010840d93ac9945b416958010e6db04c81b1b77a1ed75e10fee5eafa192011333f4e4a8f00e81ad67a56536c61dd0eca65d4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ff/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ff/firefox-62.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "7e18d170f08ba88580a866473ea71a5fd537f32d823b5276dd5fed7c0d3443f850cb072b664355bc084186e3dfbbcb1932bfc0a47abe207b5643f1fe95ceac97";
+      sha512 = "5b6cdbfd0abaf7c869f254dba4243d74fca2539fbc6c84346951b3bd48178b40a11f6358c586540906f441e34d73f3f5e959fef13ac6f608291969baf75326c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/fi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fi/firefox-62.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "8a1786c26d06dc0ca2142817bc567184c9fab51ae828f1a73c2fa9469af3b96fbd82c108ac79f8b9b17ad88938d42d2b8725f7071e18cfa592bc46895549daa1";
+      sha512 = "018648237dbda5f882be57991a26e5752b6696de0b4a1b588e4a09323bf8924917a92c409ebc89f2c0ca3b847ab9f41bf5c86c51a4274a0d70f17d40d005b678";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/fr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fr/firefox-62.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "3cb3d4a0dd79ffce94236237573cc4342fe2c964f9d0cd7517b8e794bbda7ae3e6f9137d42ecd6c4b0448c9850ca239b3eecd205ca6f79be451b23d826a5fd99";
+      sha512 = "5abfb4c2c7bbad0cad44cbb48070da1ceb1bb66b6bc455b09ef1041fd3654172f0913854e22fe387c012cd13d2cf531acebfeac7ec1cf710eca0597cdfc55d9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/fy-NL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fy-NL/firefox-62.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "f6be9cd11b188522467be3f19079ac9b51b177a63a054fe8d0b8eda074e86529effc697b0f300a8a32e7e2315192abb0fb8aa738bc33d435b9325f34c8e1c67e";
+      sha512 = "275673916496df06f99368db20c5d0ec6d5ad0e53471581c371b7a10fb34860d97a183db480150c07bc3ba09e46f17cd07656e170379e8e54b583d0009654fdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ga-IE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ga-IE/firefox-62.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "307dc0aabd3f78c36aaf61b8ac3c73429064ec7a7c2cbb3425e38db3795d1f487822f5f5296daf7475dd4fe435228b95939c3484929a019d20294715ed2dfa62";
+      sha512 = "1b30e2ca70c40b20875314a7c76556609e9b575f79dfdd50dc6214d6857d5df9f1db35056b5e861abd7a073bed346b5c00aa45d619b582e0616914265e88708c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/gd/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gd/firefox-62.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "d9ab888b2c49d047a830aa27126c047dec1cb95e899ff8080a62cfc604fa723109c30c7fd3f5436e59a42cb84ca09d3c6f767106b9fb8ac833902de1ef1711b4";
+      sha512 = "11a13ca82caf8c2310747e2fa11c9433be2eed5fb98978dc64b4603df4198e6bac8e0e6588b0c4d67d7b93ae76e62c6354fc69abc08fc5fcc9f58c90a18402a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/gl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gl/firefox-62.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "ea9625e927919e3b0ca70f39081057d914239862c6c7342176f2bb8313343bf92ff7e11048025626c56ae2bb78f359bf5ceee6b063fc19028358a4f1ae5c6c2e";
+      sha512 = "855cb09b641c7bc2a91fbc92907033a2fd9d4bf8d3ddf8984d9f5f1f3a92941b3608383fcc29134d13cc2a29b7e3bbfe5c3afc278713b98c21df9e5e6e1c76f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/gn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gn/firefox-62.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "7a113ab677dc5966bd25c1a37c69f52e2bcff153e2d48191098e66fbed753c34323e5bac8ddb04f628518fcc42e47378b4bd8c31f623c6661b8d1e09a6745ed4";
+      sha512 = "dcd36acf88daf14d1426aa87cd3e41d69de08485bd28a88634c774a287f82ff297876045e9446d95da355d195a64c4efb7071a1338de8fe61c281ba5b65067c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/gu-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gu-IN/firefox-62.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "acac069542bffd6e617c1114e8134ccd5defef82e7d7199ca3f1940195f4240eaf60cf84b47f7643e79864bbe31727968b74ab5ff0603ada1b32109c2e2e9ccf";
+      sha512 = "3f9f4bb9d0a290f3ead61c2653451a0837c85a5defafdb0cc659366d4eeb49eaaca4dff7ad7422451eec4a4226ce41123b4a2cfbc94470c50d90b25206c8c8a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/he/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/he/firefox-62.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "05e05f701767ce9c96a1fc7fe76b2352ea56536bfe4076faa3fbd80fa208aed17561bd7bb523f37255ae4b6e3e64b23f8b89b3efa979ad750fb1fa44a6737c8f";
+      sha512 = "793a7eb7e8e51c3d9156a18e65cb3edaf1fc63137cd586400796b57ae8b94051dfd5efaa52ddc21b54f210afb5b5fe876f9085700f272e320306ad10b524c9b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/hi-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hi-IN/firefox-62.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "aa2748ec00b54cc1fa3fc7767844eb5aa2dc1016bd121200bda187bdb5fec199602808a47b7389453e00f47c4f2d53603d39e003678b83f330296ed07dc65694";
+      sha512 = "5163b07c25fe96d871091b52d39f98f72251e3fae54befebf378a40bb0e85c41ed60ce75949e6cda2c54fb5c9769bb3bb6cebf36b5f37fd59f0f0af0232fc398";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/hr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hr/firefox-62.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "aa350d27cce9a5f6e6ca02102e62616547da8c26213689dbe27c1177f6d4fa55ebd32918256d82f1b7b8039cc49ea8345a1b90bfb331a565185792f0ac6bdeec";
+      sha512 = "86f988f062f11dfa3f8f4af3eb759d9cd5ef646a638bea05d21a6f1f7f4bda2a12f21ed9fb7e6e999e473cfb77c4d3cca40f56700c450b8f041537e1998008d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/hsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hsb/firefox-62.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d287cfa002d61d3516b0b82eabf089d940450edcac75ee3571bb4f2f505a19c43330c749b67f85ee1172ce06c19094ae86dd717c6368a23c0489e8f92898c8b6";
+      sha512 = "836e8eea11d92d6ea6589b6f0834b37e20eb8a8d443a69a084ae3b76b83d520ff1466774f31ad5ad25b9372246021dff76915c64b2d54c43fb934fa88da0cd2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/hu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hu/firefox-62.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "c9626c41d5d31660b7c7cd2207e5be13ccceec458208a7caf7751789b62da4e8b94f0a4bab861bf355b73edc903fe473ecaccf69ce64ce7a84ea09634540f3ff";
+      sha512 = "d92e72d360e527f061bfd140c1a59e8c3dfea20d5f2b8f4441f89cef56191f5b9191d7699750c0eb8d712b51be16afcc077970a2440f3c8875edeea7fb9f9800";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/hy-AM/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hy-AM/firefox-62.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "9e86612bb8b7954f1abbd3015addb190d6b0dba1e75b3bb98ea786d0ae66ba147a4d77e622e86abc3c166c0c61c398e6a8aecde1ff6cae608225f4a76b6e5b69";
+      sha512 = "2ad12f07f43ff4d472a8bb035a30a78e9a1dc03ac51d10a945b65bcf73f19c65c343ebf95128a3071b257ba84c516b15eb7f52196be87aa49c264606a3df7086";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ia/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ia/firefox-62.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "766be39c3d30d1a0a1a51d1cfe59fa7651bb9c5e79a2027919240b3a0e005cf1e919b5769d02cf57c6ad6ffb49c09fb96c2daef80a325d2703c58d109b54771b";
+      sha512 = "655799696c3f6ffefbc9cff612daa94b2472c1c648525b5b60a07964bbeb626d5e388e816b45dddb8c9df580333faef3d8164d5ee73ac83fc6fd07c9147b14d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/id/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/id/firefox-62.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9cf9e9f3079da63f960ee6c23a8c3cefd28ffcfc3a701679d00a58842567ae348bac07d557b718c88a5cee2755cc89b1ea134500664a6640800b9d2e196349ff";
+      sha512 = "f68898442d24eed9018d504b913e7e22bc6c94dc7ab3668ef90fbd47a9854701b33d17b5620e4ccbacaf5937019c3be4a81a07b29a45e36be91c086551c5987e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/is/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/is/firefox-62.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "f1b772f79f362a4fa1864adca160873e6057777524f22c3f4bf20122d3711943c0e3cf0f711efbe075e382fc95d93db2afb7e4b7ca1821339233f4ce7483a653";
+      sha512 = "63ae3c3130241be36c10d4e7684b075263b85bab6e8086366210d9f4fef1a5f6fbb3b89689b5e6aaf38b1e18daa52e91726788cedc08c94800439c1c2f5e5e30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/it/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/it/firefox-62.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "e1b2182af2136bcd1df2d8549329f95affaf84072789a7230d0c96a8dfa55ac5f0ae4df32928ae0cdb62168766427cc5fed8e11656d0bfb5ac4e8cb3cfc1ea29";
+      sha512 = "0815588cf40f9b9f86f032172d8dfa65a37441fd976b3409c5081587fdc8e04d5010575ae2452e93330dec9fb8feb198deeee2f5c40c0df008c98bf46799850d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ja/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ja/firefox-62.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "1938d5f7a78fb4003a37145980f8d2b8f03e009e671ab8c6356bd7988eca71673086778e4b03eaef1584ec9503255876ddddb625d27ecb5a789c23012790be53";
+      sha512 = "456b9433aa48a84a02c1a381b33b2304854d4adaf240d920a9166134d61e1e44112a9901c1a5f3470bcad959dcf6c2a244f2c2ff312536e35b1baa84d47d7f5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ka/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ka/firefox-62.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "6db6f3a6a99908b1aeaa2d9de5b2c70eb8ffa09654640a083a4ba9d85836aa1f0ea01d515cd90912090975b5163c5ca9179dbf7d69a6f6ba3662b3ac7e451dff";
+      sha512 = "f1d5edf66a327aff637df686d98c375646af0a0d81932f4a213fb256c3e1abfa28fe9dc3fd00d7d0b035976383b3d31a2f29afd2535947fbf119275daa9b979d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/kab/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/kab/firefox-62.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "39fd2f579b36fc341f3d0a3342c11b71a2ce4b1b48e62e9bce78c4ade3eeee466bc6988b96e4242bbea453ef70e266e013112faf377a49fd5060fba29b54413e";
+      sha512 = "ef93cd462d40bdb0443933f646248c21bd975bce81488f3a3d7cde05d437127382631c426ffaa0d258eaa3597a5f825c58a7b4910c09d0187c6e1aff64aaad3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/kk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/kk/firefox-62.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "b00a1318c2d091fed887325b1c846f28be0707efb33a732ea19333ea3f27cc777be646d8e826480206f6800efadbd302600e399d43146ffea8fb8b07ba1c6f73";
+      sha512 = "e878a95e358a570094fee5a737b3bbc7e21e7070d21fac8d1749ae18ef68b9d3e78cf945c66be20625346d72a915adb62e2983fac27e0d615b603fbfe65c8e26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/km/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/km/firefox-62.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "47090ab2bc0821a0fb666206c417841512c32036205b52258d3f9ad089325210e1199943e93d820874e14421fb7e30b6c6f43b17cd3c91d9b760e03cae70593e";
+      sha512 = "036ed97658e1cc1db16f25053f5b21b8767d34f570132fa00061059f4d9cedfbd620ddedab98b1dc452f340b4769724c30297c5d823f0963855a4f0063d3df2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/kn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/kn/firefox-62.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "023848414fa847bc216d1f9961cc83bfb20ac2adf2c1821804fdda2b03ca216dbc628d5f04b7914986c345f053a1d9aebd6c34d59f2c2a6c420d4af81b0af06b";
+      sha512 = "293ae3048231261a13e988fafc9f9ed0d830065fb90c54a9a4a9bcf493fb7e63229baeb1a9902374ac18eec2376aad028645b5a9efe449f99b24f38e7c2f7460";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ko/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ko/firefox-62.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "73a348c0802f57ca08f36c76b723db3842c72a0509381d1156013381ab2385ff68b14c2ab08bed998d01c809dabe5901451567fd45bd1314d8cd301171ca31e4";
+      sha512 = "e8ffe4b2d34a5d62a6d102d316bf4976922b283812a73168309b4446da76dad68232ed6435e84f3c33eb142af69750baa0c8e567457041407a05e604284240d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/lij/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/lij/firefox-62.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "1d567d2d917af6bd7164e86033eb3b9de8d3969c3fbed9f64944592232a5220409e5d6d03eaae81819e3fff715ce2289f5f8bb97486ba3e6351c2bff5fca07f1";
+      sha512 = "51b9fd1bc3b5a0b5649dfe07799b3360026fb5fd7b1757c1d5f70287d669d81ae1d867eefb1feb2b160f572b5edbfb5531e8872b5fbbcf23d80ef81225730136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/lt/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/lt/firefox-62.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "7e4a26f8a93b83d276590245eee4c502615e37aadbbf2d214ce28f9e3ea6908d62b05dd87bcc42882169e11dcb0dfac9acbb44eb0011f87051586f926de085dc";
+      sha512 = "17e43a5bcab3a544f2316648dbd18340654ba6ea4c46d465524c7434ddaa21693d6888ccea202c00f110876bd8b55c1f005b1e8a2e3a19bcdfac6ef1b225a1b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/lv/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/lv/firefox-62.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "f1ad73deb2f56427bf90efc1340a972cfbb80dea88bd47c56ac66231e107976190128e108bf6f8c8af954ad354e79b3dc37373f80a3d3f4fe10454bdc10f456e";
+      sha512 = "8546833a6d639ab4645bb19c0c0345401757249a4d56e8b65e842627b3df6bcc3a69c71ebc36d1ae34c07383c84f8ad0354b206a4c9bbfba37683d1c562a671c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/mai/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/mai/firefox-62.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "61943ceb60fc575be455c5ad0f4b404f8cefacff3b7340de04d1b1efca72d6cc050e4d9100e4370f11a2b03c122877f16ef98f4cd0969d05959fbdaa06e2e86a";
+      sha512 = "4dd992c044b26ed2b30d633c57c10e4a48778b8a2f4998552d14ea795264f2ac8011a3b0485ee8f4beb5681dc150fc65c39457c2b126a755dae0c3bae86f3a8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/mk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/mk/firefox-62.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "0b9e6780fcde1c88e7b15d276970b838b6f4516fd773d121b28b4cb672523151815feefcb0143a6e4ea27586bf93ab67bc6b600ebacd54574c74ca1e91f8ccc3";
+      sha512 = "a4354772e0bcf5e6fda455ac7a0a61d7d0e3de4a8786da1c8d2c0fa16539cfeb19b44abef2df6b06cfae3637fa2886a40f1a6909fb882f35fd72e26e0863a56d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ml/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ml/firefox-62.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "5c4dca6636294066bfa565567a2db629c4ac61290a88e6b0eb96af7f42e4445ba704d1f15739dd6b33b59d906cf7e725128acdb5bfbd7444d780ff67cec1c49e";
+      sha512 = "df0f4575acf0c454b6040f4bd94cef0eec36abe493f6895e34b18b04c22469b2d2b4a38ac17b110a03cca5ee7da1de655487adc897f6844e26f4e7a3aa4ecf4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/mr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/mr/firefox-62.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "0aba284ef8d8e649b38ce28b10319ef8ae830dc78c7a4fe3deae0cbcbaf3dc67273170e7f532f71e0cb05338a9155c5ae5d1aac5c0319f465a055d2f040f0f7b";
+      sha512 = "62452e83264def43c2e539081b56a2d56b5f9f99f8d737ed04eca42fe3c52c7cf91dbe47afcee88388b1dd39cac7ed90d0f8dc95c0cb72a8b1f6a80859a35710";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ms/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ms/firefox-62.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "59040a67e72546d5b1e28f60a249939332083c7abbc7bb1b20d802f0bf21f56df0a0af55e7c12dbce94dc05a352ca86bd43e65cbd813a12f8a928182141aff4c";
+      sha512 = "3c08cfb8da1e4d363f4cd7475fc987e0baacc0886e546c4010b4fc96dc54c205acaa3fd4ee1a784183c646e27cf946a397ca43c734c1515455ddfd8916ffc9c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/my/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/my/firefox-62.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "3f6d0418fda4c0987b83ee30cca6724435b0d2e27a21eb6d2259d86b5ea3759a665d775b7cd08d195029b8b23331f6f96c38d4159a97ff1b07266e37231cf814";
+      sha512 = "ce231b8697330902a556d0db7bd5e004e4ec646ecce26db21e8b3e64c2d0a474c8bbb3c09cb6331d964269c602285b84f09c0f67e5a6eb6c752b8d55b6d700f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/nb-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/nb-NO/firefox-62.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "78113442f591bba6ea6069b0d19e0c70942b11c60d55b74086b6e504c145da13e10e337276b9d985b7018cf92b13bcd4da3ef2e05684430ee7a8f2c15c453187";
+      sha512 = "027c1baeb1ccc1dfcfa886a5b6e5a9b27859b0d0cef877aef88ec2b0ed2d17e47adb403e4851813ad019482af9f0f116e7741fe650d63fe559281ed14f03aae0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ne-NP/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ne-NP/firefox-62.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "43a4457dbc9362c93705a86e2ab8e963f54a04a0901d2a007e2b54218a065b1916a5d4668ccdab95b772127abd050fda3addee9a2a794bddf1aa75a00edde894";
+      sha512 = "0599f7d04dcab8e42f24b2e5c898d8fb5d2e4f0a160c6cafb211d49200f85149b4726504e981ecde345ce19889933c5a4340f6739b4db8a1b000a02417168134";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/nl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/nl/firefox-62.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cc3cc68bd79707b201b5558ec1c502e0bb9e48573aa93575b330c8701a30804466568ddf9428203f5f84fc964a540fff8a46ad4bc4949a1cb9a3126d27b9dcfb";
+      sha512 = "71d9bfa62eb9a3ec4edeac28d57e7e027668fe120ca85b88590b3c1ba063b1247ccba8a0a5ec8fb759bf313b61e2bfebee60dc74716f0ae28650e4bba2410e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/nn-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/nn-NO/firefox-62.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ac1afd5a32eac6e4b5036f75633f8a2bb2b3c41a3b0c2eafad057ee96dcd0cf5fa42a3fc5ab4babe5615d7f3083d8d74327afe2d121b7f56d280822169d16042";
+      sha512 = "2b459865097cf722a0a504e6c0bc8cfd6bfe2c6782e90d199695f786b380f1aa6f0758092ec25158d0db9297c96900938231c3d029d45c3ee1b19f3d999c2791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/oc/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/oc/firefox-62.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "f209069e796f703279face8695ff13ccede328ef478b07c807274ff4a1022e11cf23af3f72ad3fea56935a99fff40058b905c5118332010d52ac073811b130f0";
+      sha512 = "f410848f048c5916a16e1d93f06856a4223f39622d85499ecdf1b3ffbeff18454fe249d28d8de29e18127b7e5608d68f200b2fe7cf0707040da126fb1c495c0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/or/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/or/firefox-62.0b7.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "5691053b16b9c7dea5624ac3f03b0b9c4298e01f8cc67ff29635e8d617ae430e6bc597c253600f9594b46fd821f9ac8692b30180cdd35ba36e671c119b0f1e82";
+      sha512 = "5caac24b1a0aec7198c141f30568c9273181092d14fc53b729dcd85ec3d1585f1cf4751eef4d8f28a15dfc96912c40ffc7e80c4c499432b23276956a3955b515";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/pa-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pa-IN/firefox-62.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "fb13b64912788a00d29be4b3ecc00eac152a9ac3f1a4bf70bfa10995d46efb1af6ed15beffd2c60a67b97fc79be9adf29b097a53ca8b38907063bcbfe7fa0684";
+      sha512 = "26a47c5d699a02707b0210b840f780463d01b4ae421e0e0041430a6c34209a530f0b0f1e569ded6b9f623e2229259729ef63342744a2546f177f532f661274c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/pl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pl/firefox-62.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "1202ac44a3ac1be6c385c4a01d193a19b9aafea37af7e7fbb1da430437eba298dd3f720566f73c34c36f3f9a9c4879cb5ceff75dd56544ad6f0413937e036ad6";
+      sha512 = "caa98ffae028c7d8da9411593383ed98e733a41cd57a5bfa79f01a4b489222b7e0dfa741bf7d9bc272a69b0168c8c70a91b82c411880c7e179335b62915cdf89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/pt-BR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pt-BR/firefox-62.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "674402036a07616e12542807e7fa8f1a32bab89eea6ea7aa1e8b22273ca9e6edbaf2051f0dfa97246764c10cf7e0d2b838a8fef3ef7788ff39ff61bde08b71d7";
+      sha512 = "612bf06ab00b00f1bff3494a8a312e1d828c9e8f01bbda02afced2d113357a463f2156e89437fda59edd32ccbd87e057d020a538178f72a73522cdcb004ca3fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/pt-PT/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pt-PT/firefox-62.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "94a7a37bb56211396f8518de8ad782072b1cc1ddaf3ead54d0e6d4ea93d996e59cac576f57f75c2a815305bcf076e5f0fb8b002f6d6d4fb6a57ad31b9df7a56a";
+      sha512 = "01c7e07d373007efd05601e2f97ba3b23fe9f48654609021f65147dfe374681bd7c5e1aef2dc29308a1eb2ae97063f6bdf703b1ae277f6c004587d7023511d7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/rm/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/rm/firefox-62.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "eef8c8a3555fe9cd7f58e85c411bcfbd3640775d7c284dd83001a9bb4ab35ccd608d0f9b7ff9a2037a1dba84a5ffdddf790ca8a116481d5b76aa7ef4e1acb51c";
+      sha512 = "cfede8ffbbb1984a2c16a1a03a08b869c54e53c8aa439d2922acbea443c917721ebbe3f18e4f7b7e209a728e32d5ba6525a72e193be63347bf72196fe5b74b0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ro/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ro/firefox-62.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "a7de92982c0673f5c3bfb02363fab6b6306b695db3757c72827936dea7ca0266e9e197cc95288e502ce46fc20bc53e20d0d5a8de53a7da2eed17e680d8f7480a";
+      sha512 = "45a38b086ca46d6b0736f45db6dd7c53100b600792f2d41a4ca1ae01774670402cfc8085b4a2e2c3b98b6856b57774d40784f84f5c94093496937d6f88b8e6c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ru/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ru/firefox-62.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "c18b67df689ea3eeb9a4b3f112f1a40a638ef65057014962d6a711d99fa0d95ba93e8d5a106949528739eef8fe5f804c08a50a8d972ab4d5c6594f5962b92374";
+      sha512 = "380962c6ad9803a0b13a8eb3ad56bc3ff771f877a9956b08f83852d78fe0a1bb3eee629502396a3276c270bc7d5aba366d78973e8e69024bb02a75c8747c6a49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/si/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/si/firefox-62.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e551cca0534cc104c696273407c67852b0180606d40fbfc572e3755496d1410c80d4a265536a240c13d30d4dd8678f800a42e4500d7ec0b425cf08f45308994d";
+      sha512 = "9e128c2055ed6a86e657277cb0483baab49db309b249372866db1c2752aae2586061d2e7deedcae33b3cb466bf6ee4c84c28dc0f29d3dae843cd78758ef7ede8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/sk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sk/firefox-62.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "fe7cd7d4048f58a54e2f1a9e1d2c6bbd6a454b5ca17a61c16cd3bb90d75cb2da9b4be6bf28c96a0115a7556fd9ee724170fe8ab328bbb6948e2681853e72aa45";
+      sha512 = "81382843684963c89d75c68e585d111ca1b46884e0e0ebc057803beb76009517844685204d7165add0c77a64c57d2be011cda4add3408269dfdc3aa01e82975a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/sl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sl/firefox-62.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "3bdd06c8b773df3d332913ff11856c4a063e9755aad426670bf6582cd2cdd6b1126feac972f224080eabab0f2855683a7953864d745b62788599e873503a9e88";
+      sha512 = "919f74cbc696074dca88fcd9b1c60eaf462d7224d7eabdbc7572630f57f7c88b3ff286b9dd183138c5f1b028ed722ff53fb21cf353c3a4f05af6dc9b94947319";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/son/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/son/firefox-62.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "58a49d8c8235db458f98326e55a484bd5f56979df170dc90a87d48e717de1f8c3a958b43c056305658cdc08aee23faf91980cbb2034b9400faba789c406827b5";
+      sha512 = "3d6d9ab8ff6dd01b7491bd975b825de2c0286c1f46708afbf546107566b588149a65b9a3335e9f25b25ecb2538392bd3fc2eec10c70fe5763cf06c2eb93f8c99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/sq/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sq/firefox-62.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a960c3b6f4d252033a02dcd57b430939ed72b8d2e49f70493e78dd7e692b385b5a082b5719d0941f0a9e640f1f05cb8ad8a80ff4942184ae896da76b14037ada";
+      sha512 = "e05cc50f50c62dc74b09e10a5453947b2aae02100211ab7b21b23deaf8a1db1c8dc49ada3bf4899e6a11c2d88a5bbf61f7a0bbb33073f101a5c479490a032fd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/sr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sr/firefox-62.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "9270a5797cc142def2538b7f3ca154c814d46ededaa6f97b08e74fb82cb0d7c92849eb1911fd2296570ab13d4e5d9d2e1c0f0868896d514047a56a7a10f3c978";
+      sha512 = "66e0fb2fc46da6c02d883cfc93cf29d0a3fcb2b4a5e679c617f22e36f60e1ce15d24aa5ab333620567e82de86e02723b350a15fda32075092fa0f952962d1656";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/sv-SE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sv-SE/firefox-62.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "d5b66fff2875a789efa6237bb57f56c1c5dbc4220fa459337820091bbd44b94116998887170fbe6db8e98cb0d6ebdd67907f21df69fb9c8cea2304223e9544ad";
+      sha512 = "54a18095bca5eb55c34c1083654e25ddd97d7a612555542d3d233db3e85f0abca2c5b61813ffdceeb5c2c984657f75fcf72be2bf47a7fd2d45b6d52a5afd1165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ta/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ta/firefox-62.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "feeb6afa24c230c95ef5db75a937edcf75dfe47a760bc2cc3e134a7f558fc0f3823e8d77486f7a291383c4e8343cac02c9bb9079c697e1545c1cc2b06be7c375";
+      sha512 = "e7b604cf9da3f08348bf61868ba9562d149a88c9fad8c878072b78cd901b5a123a16ccbca9868e97a42f6babdca0c29f2844ed68d2d60782a6a7ac773f6f973b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/te/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/te/firefox-62.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "1f9f09a086ff7bac6f05d20140d2ead3bc89d24c94607f505619de37fca70be9dc34e7d5ca5dfa2852bd952683a5372f5696622102e867ed27b246848250f5ae";
+      sha512 = "52434cd13b171b4079befc68467d348d9451069d43e86cf8d7dc0386aa93278edf27dbf4685e28c86053fa8acbfb02eb1bff6c22ebb9833976e38e11543610e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/th/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/th/firefox-62.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "bb58fab759b4f26ec7115c025ad5427f031a603c76edca46a065ca5f9f22c5b50403ee71d115dd8cc207f585b54f294e72488aa27f586c3964de3f8d753d7760";
+      sha512 = "502cc0c08064999005783df87bb046fac32a1112e2968fade51ea36cd9a61289b60f731d3a755516a3207b414d9fbf4c05a4310518bd2081a1458babfc8ea9ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/tr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/tr/firefox-62.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "8dd37f1b0b4b6dfdd839a94527fcf4ed4a95853836b33ff798d3cb3e86f609cae688dec18432ab77182fc6726ef9c5f2fdae13aa327d2bd09af0a7b6750d0cb9";
+      sha512 = "57b2e478b6fd4193e57cecd97effa6b57867618de33aad7222ba62cbfd5dbb60fd900ce749792bcf2dead854e7a65b5a34f2d739014c374451d4d29713bad857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/uk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/uk/firefox-62.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "650591a2f7f60e2f1194f593e372533fec11b8c8cbb8bcdcf8c03c215f792630920f556f7e19ece28914ca72f4eda871856849f4d4a30180dd7716020c0945a3";
+      sha512 = "e50e5a4b98e8fe6730c2c74352a47ba233407ba86ec179c6e4160c521c045dd84111671b0a69fd410804053267e8a83df50d3784132d80a33ebbf9d3bbf8aff6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/ur/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ur/firefox-62.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "db35f5aee9939134956ea3a8e9314952a6db0fee39263c923a825c556056c8fc31f50dd54167ef38208db0aef563f8b82580bd2c8851b07df4739d3519c1dc8f";
+      sha512 = "2244233176d738724129cb456996708a19c35dc3997b0cdd1bf12bf3986fe05475b78fbd631c06d65177ca93210a48e83006c3f0836a71e225828464b954d94f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/uz/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/uz/firefox-62.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "f163cbeca319f753f2bc42049c33f6111538ce5835886b96a0ac862a36fcc9a41fbc050603f0d52f4cb7fd29396ccfba655479c3cf62b7da715ae647a80a85fb";
+      sha512 = "4c209e7ae412ba56e1caeff1147f71e81f87c8de1cc1e2267d40d186a3cf5a3c76d4162564031b4d6576b695f92875056b884ebef3c4cd56442f0813fa9e87c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/vi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/vi/firefox-62.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d7bf954b046a19ba0061f6b191186d0facac94ce143fa44f1a3ad024226f7494b70fe0bd22d4c10548b903ec00d28a6b5877ab4cdc251900d43045ca4565de8c";
+      sha512 = "cc4acf1841516e4cf9b55e19aec82c48afc458c195615f8671f32dcb43463e7779080f2c22baa7a7d0f3c03e01aada1ea905b328abc21f89383e04fe51f00d34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/xh/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/xh/firefox-62.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "2ed6784ff67a7080285acde6148bc9a99554600298a31b1a08813db0ef3ba33b4d11a6d5d9fc58c0fa432037044c3d451a82d710a26886c14c8b3e7b28bea93c";
+      sha512 = "9179e06a009d7ac684ffe97de4886206671201248fef26065ee20a99aa426cdaa9e5b435666d9b27b74553e9ccffff2a3cb883a77069cd2c2a92adeae361d134";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/zh-CN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/zh-CN/firefox-62.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2ecbad0536854f1d3721e553c8af084cdb3c2b964797a37b11432bf0f8b2ab404fbf59b936fb176dd1e994610de42b1cf8bd4e855e0b42264d960f2c1b4a1508";
+      sha512 = "bae813c2f99909bcfd6919c0dc7c882ad55258718464f0ae5e4ba3e7ee407e860787f64b2963fd1a5c65a799ab2e3ba3ddf1f89bb08c87e0f7b168394e0ea3d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-x86_64/zh-TW/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/zh-TW/firefox-62.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "dd9c5d813ba5403e475c394606aaefba311684d01d4aa6b7dc71eece931ae0ad8c404265dac7f4543a2e93179c8905595bd530caed6a12918c375660617d40b5";
+      sha512 = "2ef30a38cb1f6e798d111bbfe5193802870a612eb0ad4b0bfa9a5d019d52d26153d67ce251ee8d0171b9d814f1887cc26d94c4fdb9d8715045414a605cca9ffc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ach/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ach/firefox-62.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "bbafb47f2748ffe9db586a3106dfcc90994c17f2e516e95d35d8e7577cb2ed6f735af731f8da06afbbec111381e29a9485515d133aeb7a797c14349f2e43d43c";
+      sha512 = "0c69502fe5199f0c6beac78d68cc1c6ff6e76e770d7f578edfa2d59feb34ee6c8218843d5f436b8a8b24a928254289cc700e66af2a1ae80419acee0d59006b08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/af/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/af/firefox-62.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "39c74d816acbe1fe94f87b9b29e1f68b2f0f3c8d477957cb8c02f0373cbe217ce0a93c94e5ca9cc3178b9f71b31da649e55672c653eeda2c2cb5efed7c9030cf";
+      sha512 = "87ab03305050be2925ce5feb7e642923ca7d49d5db69f91f32ab0e8f56be650c9b4cbc9076e5c3133daee97303fc41080bf1efde6ab9d67868d2709026798216";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/an/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/an/firefox-62.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "2834d2a86fbc9c1bca1d00a4fc983ec26a4a8c7746cfaeef89d41a013f447f5ac3e9ddd036cc3259169fa027ac8919d8e2d8be6ca56f61a6e6ee9349140e0135";
+      sha512 = "01d3ab7fae3e3ea7491dc185a00fea377705b7f449d139a3f41ab1797f1af3d8f089be8354fbc325d599c8331474ec49e07f35dd691fe05367b04148cc84022a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ar/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ar/firefox-62.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "592b6f06a33233de2224130b1c99078e8537bbb3170b1dc9d2ed0d6c74ecfda8c004308c093b9fa0029d86213ec4031cab1bd6bf51892760bd5ce7325a803164";
+      sha512 = "e82c0506fdd1d3861923e40237b90b4ff255849e28b97a197bfb34db41b6d207eac472ad465b2198b1746d3cc7a71c4632a9a7dc0435be15ef05450254f1ca50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/as/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/as/firefox-62.0b7.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "43b36d294703b1a88d424c1548339a68c81c27d42b3242b6e95b9a9e505c0806892a194a3adccfce8c439229caac9a3f373bb0b283e080d9570f3c16af20d8df";
+      sha512 = "af8e5e8f282b59133f6d931cce5204e5c8f20bb445c31e9eb9bc9ed69bb0e174ba98a765aadd00939099f39c17c9bfa103a50900a26cb13436aad0ec3aaf65fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ast/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ast/firefox-62.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1972fb4e2263769b5ff7db666a526521c16a545010b90ad7bb326e011c16cf307bac54b74486b6c5102e212ac2ef6ac06fed52bb4b4d27729e5ba922e7835cbb";
+      sha512 = "9937e0691041619a96ceb5ecb025ed018daec3a66a66face1c19f689b5ae30a9a6d0072857d1a13ae1df6513bcbe9eb930a85f255dc73ad427a81e5a3f4c2be9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/az/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/az/firefox-62.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "a720a29c05609b20c3d9b5280ddd7016d06903d3cd831951e85d6c942ceb3ab96b8b76c68c66f1107aaf75ce01e5c97effb81e50f29a7c040840da63e471ce2a";
+      sha512 = "9f5458b871325283aeb6fe7ed1c9ffd24c271a2d984d839fb9d032ae7c309bdc30e67f6fb94b6b57a9c628adec208f4a03c773b9a58ebb2b1507d029a9e029ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/be/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/be/firefox-62.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "7b7243f067b83258a10d0246e7fc34503545c1014ac325c71c3aa23fa4cb3de85696eef0888fd5a6cc1ec6145b8411395dfd01d9c30b8b2af3b00db8b2b4f477";
+      sha512 = "f3868fc238baea1ec7a082123f319d056848189825f217ef6a32330a0d206801221c4f7c404acbd99140fae2348ec0fe16a8a3649bbdce2a40258ed9ecce8ec9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/bg/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bg/firefox-62.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "466b90a9a02205673f593e461c287559b6a5d174f4a84492d784bf7d0c7d6ec009ab3522deb1965823d26ce26af2f91172ae0cf37ebbcf2f2e199a3591ba603b";
+      sha512 = "29e6bb0cfd54ce0abc2fa41c0d502662eada03b2b060361e78c98ea7cb0c8a934256ed97e506c62730e97cdd13ba1488bc2ca3f442ddf52587377d2524eef409";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/bn-BD/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bn-BD/firefox-62.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a02416d0531aa6f67d93eb370ed8c194c27fa642bc015474e0a41f2cddc03bb32227ccce455662f8528a28b61b327a7c548d813f34d83f24e26968d6d14bf031";
+      sha512 = "7ae3291923ed221e385c7ddbab8cf7dbb5869bf56ca9ca974e58776b5c74a1e35d308194587f1c5c2b03aea862522c4f4e11825b59b361a672e94757694f8b88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/bn-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bn-IN/firefox-62.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "a47064442714aed9bbc9f534a4bd3fb74b81a08c20ce9940f6ae3285623a406f7d808b39a5610dd33d5473a19aef2401c5eb3268de408dd70c0be1c3e04619d8";
+      sha512 = "6edbf653375f379e8afdc928adee95c2200fba35e0dc24fceefe5bc949750e225bf651b3f7e07542c4fb8972b07be2cd5f4da01eb5f2e15a1f486bd9662b2d92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/br/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/br/firefox-62.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "241c87bc2e7368e6cd640295b2d27de6c59fc82086e62cadd178310931604f0d44dce304ce38f5a9e30a4917a7164c7ab60ad243930a211775475767b41b2044";
+      sha512 = "48e08fa086b1dca15016ee717e64d54b595e0c0f45d0b74cb2c721da05eeb1af4265999d27f9e944ebb11a8a3f083903e6e4ee1ce4af4fcfe4f5c888d56dadaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/bs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bs/firefox-62.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "10d6f7f225b58210b58a8add87759061925e6b9bd6c462437b1535acf9236d1536ddcd8c51a7773e53ed2b5f0c8ad217dd25824ff0752ca9eb7dda776bb6a7e2";
+      sha512 = "0f843499695a9e9c6b99e3cf4395b2100c6936346fc4e850b9f044cb3830c91c2f335ae1539bc3c1c81e74942e28b115f250fb29c321dba641962573adaa66cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ca/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ca/firefox-62.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "3530869eefa626c1ca84506078eae960050757f9048923b70d9591e91fda6dafb02134c882ae77ae2c8d39975d491c285845e4f693350e99dc741dc40cc383e1";
+      sha512 = "7ea3d66cf9b7054999fa2c3d0752e17becd3c27815cd9eef5ba41f4c2d390faacdded76f19f96b1e74c8c46c13bb47baa9f2a978fda3ea3d0592e41bb2e739ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/cak/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/cak/firefox-62.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d72e1f701fe9dada4a6a22267e76f2d550becfc7cff0a81fe5f020defdeb5fcb26501c647ee2da861652f7a911341a512b959c19ab75a3defd772e117605679d";
+      sha512 = "41e779e39432fd0c2a379b7283fcd45a08f27620217dccfba89c1c20659c89655485d6c610c21f18d609203bc3ba63b7c8618011ce6092d7420a5f3b96464685";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/cs/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/cs/firefox-62.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "eea5cad463bf29c010058644649d05d7d73e0cbbc299e7cdc0e9c6834401b21a94d5c7128ec732601325753137eddfad97dfc82431e4123202bf8788d65799f5";
+      sha512 = "76a6a981fde70608d3c4b91539a964b1e8ee6eed5c48d1d308a0d43dd908b717311b817e791925f3ba5ac39253096d83bd8ebb058f52a96c4c82798af8167b5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/cy/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/cy/firefox-62.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "3ff4b6c91301f20e1349c546ea1b25aebbc749dc98537b1e4f458b2ebf0f6b969411e6cbbbda98ec7cf201426e730facad1b3ae08a9938f15bc1202f00860eb3";
+      sha512 = "dcd83b0d842add07977478986d575a386e5014f7cc448d58cf542d2a281f367180fc40b9ab4f6147a080aa498afee70bbc18186117ac9e4d7d1450858a7bf8b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/da/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/da/firefox-62.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "31479b7fcb44030bfab7b79bedd780caeb9ede05516aaa24bf08d2394daadf61d85bb98274adc869d7a813f68d2d885f6f95d9a8b23bf1ad62a0b652e7c2e03a";
+      sha512 = "9f7f78cbfc160b478bb00091741a5799154ccd1579a49b1f1fe569214d1af36edbdcaf78348e6e335fea5b1c8300fff81f966bcddf6aeb15b7da18760a25fe67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/de/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/de/firefox-62.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "1d464348a3b1b34ef798c46d6e31045c8d60847b95b78f3ec79b8d75c203f9a573ffb3044852ba1479eedf6e27483e7fc898412d8d71eb058bf1ad0553203c5e";
+      sha512 = "701017008775320fb15df0cc1aaf4a41b924c8c83c253876f41a3ceb292434681bb5d872184186ca98cbc81fe2b4fbb10a51533a7bf3e46d29a93464711f9a67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/dsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/dsb/firefox-62.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "10ea4a23bca7ae17798b6dc79fb7dd5009abe80bf78239c5ac2bada73037b08e750a277fe05236dc8db012d6db4a0cdf16c3dd0032fd45151314c44f2e2e09d7";
+      sha512 = "28807b8e968dcb4c22d91b034fc5dc7b68200a381b2075925ecbc408c74fd52a18620ea8396f468b423babb4d3cf97ae429d2c2cf250de4818487bdae315cc52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/el/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/el/firefox-62.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "77fc30da70ed5c59e81a2128c793938e01b8a635efb891190b645f2b53e3305d6fe433df0541f2b20651e96bd1353efeda8ef9f3d5305c2b7e4ab5defe523f76";
+      sha512 = "e8afdd33444ac87c4f606906e8b754874495919be5225c1e40ac214cea1fec8079e725baa8663bc56026a9fb5a1634f7c4bb6e2478ee70b6ac0a29ef42bc219a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/en-CA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-CA/firefox-62.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "fe610117354227546cdc87cb390a960adc27a637d1288d3d27f600d1ec6e34f37e90ae863a6e4cccbdcbb3bc1a20754e1fc6f9955ebbab1195963d2af9b14c59";
+      sha512 = "3c29cc564cfb2aa0bee5c37f68d21adda0f9ded69548490171c9819e084925aea36c545082db650296d8ec18801b249068239855fce58889278337e80242cd8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/en-GB/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-GB/firefox-62.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "51cac3ee93008b3cb0664ad8a753ef3567693f34354683ff8fbbc5731250d52d991edfd900e72ea36fd82f5012743a58562639a3188df5d33fa662a3c635ef27";
+      sha512 = "18edb463f860511a12751513277f5c3cbcb06871af3f99fe264c4472848ce41b9cfd5048d36530536e838c5b7f8cca8e65485e84621ea84dfac2e40d949fd726";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/en-US/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-US/firefox-62.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "b60005090b14e4e474717eed46c317fd8903db61bd292bccf675aeb72178c84cfc620e9dc753604422eb95928f014e609b81dc6f9b443e86584cdfa0d5931d07";
+      sha512 = "5874ba5b1fd079cc7f3a29da85d120658ed3490f834f84c876df814ee8fbee5f17ede54df5e9305ed5290abe6fdd62f664deb41cbdcf8e91b4a4f8e569af5c88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/en-ZA/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-ZA/firefox-62.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "c8840d0a7acae823dc4e1cb6939f7d3416f2fdc5a8f1e5478c76d99fd54f0b0451dcaeb1e5af76fe6595244baba7b4d74b27edcab57b34232e9c70a7eef3499d";
+      sha512 = "449f6ebae62c4d7c3a86fdc057dfb2ba1285ae4e0e44cb66ac63d063e26821b573d8f5b65f1d16b45cfc52e34ce485d189bcda6fb41887db881af8b5a56c77d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/eo/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/eo/firefox-62.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3988fbaef4afe5c17854b2b72bfd205cc110f1517ae7ab69e84e0976a143ae3a74fb6f3ced7af67cb13ccf8fdd378d991f47925944b6f2f276b9e0adf8e30da8";
+      sha512 = "7ec1e94bcf6029754c8d0824d93014a6577c1b9984d82c4a63ffefddf90423caa0d6958032588039e745861a86bb00da8edcfc935598024ef4c90119ce3a6679";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/es-AR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-AR/firefox-62.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "ddf3ead6ac33df14c5a79e92a0f632a6e38f815f0b96301467e4f9ee0107dbbbbf485ede0f3077ea95ff16c8008c48c5110b6374005a022ebcf9fcf9ffacfd07";
+      sha512 = "512ec359f4bef01780aa70ffa22d81dbc57173b7bf01865ab3efa0725c86f25c87182fd868d87125627bdadcf38c4f90f30bacaca2d6f9b8d52324586a1d8854";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/es-CL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-CL/firefox-62.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "5c3b982ace55e12261b611a28979a1397fe3991039915fc7a438d3e3270357172913079b5c806c6f32054e7f9cf2c39d542dfe22fe26d5171293d64ead8641ae";
+      sha512 = "4c6f844390f7172415d14108ff58f1b132336b9bfba080230f386dcf3dd3ae580db97eadd32b53b5c619b8fd9f1cd783059bfb4b5a0e17e7e596b2c81fed0f23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/es-ES/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-ES/firefox-62.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "6c4c1af1bc226bc242d849f416389b43df03af93d48e4041b9fb0b599906810865caef1f767bb0b72c979cc69471ae1ee9d765c757fc6b3f525beaec6efe6809";
+      sha512 = "368ad1d3d6608e24feffb15b0bc4f6d7ed68f5e18d8abc0a3e6918c2ff87cb7080e3bcdd9d6fdbc756dfda66bfc5ac1a61e54df4dfc63b32669ee8cfbf8d72fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/es-MX/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-MX/firefox-62.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "96bb8632ef435903d7741587a56152b73e5ad83d0cb4e868071e7bdaddbe104e9f0348c19620acfc1ecc15f85542bc57275465ffdd3b08fa6c43adc572f7ab5a";
+      sha512 = "688e68979a560a0c4821582e609904b71973dd752598739a0c6f4906dd09e7d060549feb4da98879b1d4367b3774c80d464751827ee5821af43810d1d5d9c461";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/et/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/et/firefox-62.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "567b938cc3b592cae52d0a4f4cfdac79ab46b7927c1010f1d0e74d1401669cbdc86060496db700f72ce41ddaea2c12ce49e7304a60e17308df24692349754d43";
+      sha512 = "f905eb22aef1af6cac00d1275c63dc59265cf2695ac3903e78d70d2614d2234fe7cb46638338d82afdad952187741a7bd44936f84dbfa8b9abb792493f401fd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/eu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/eu/firefox-62.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "c89344781967c671ac5518aab5f263dbf027b74b432de9a10f3aaebbf5e02c8a729a2083221a8bbcb58fb40e2466cc66a6ec3061fd7d154e999f5c9ec2243f92";
+      sha512 = "6d48654cf112beaa9efe871d8ea3a82bd5adc8a965c1ea9a0ebb79411328fc721ccdaee0a162db48d0e470aa3cd268243dc5a3caa81f71534cd13ea75e36a99d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/fa/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fa/firefox-62.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "bd750438e25d1c22fbc8098b108706badf1a5e8445934be120aa226820f746f1d91fca05d2aaa80cc9641fae38d5ad1f16e958b3fd47a8734eded6a9c6c572b6";
+      sha512 = "648c3c9303c04db0d0f948f7d437ce257565527dcec281a1afa199e337ed8256a56be77a801cdca61beb4a2df07167a7f2cb8518759380d9598b0b3a01c47130";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ff/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ff/firefox-62.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "8894c1abd2b75e11b36ed0842dce462f2317cec6324fc107acbda019824faac68501ce145bd630d2718142fb8a8db64ef8cfc0f309c2f52938caa3f1b8d7a91c";
+      sha512 = "9daf695063773d0be8cf1af9217d0b11a611efa177ef5a9ecef7c4559a02fe744e4589f73df9af292669dab93ae30278ce4eb400ba66383545beee1fdb0fe7de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/fi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fi/firefox-62.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "732c120bdfd45ad78af3233296b506a0a41105499e24049a65ab0675fbe914063df52709f2d815ae7f46105092795b7a4399ba7d213f55c1a94c47e49f97db88";
+      sha512 = "4a364b4a63f61612c47a181aeaf52cf540c8d96b0d8ff0553f45d57f6d7f4360e7cca61e7b0c1c4e3dbf8b3bce9846f8cafa72124e917fe061c9b30a34ac1463";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/fr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fr/firefox-62.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "eaac5973d1d3dd60918c770e4234b79e4b7e1d725dd489ce6065318af3adaae7e2222aaabe6c037581a05907a94af83d55d5703afb380a8ff94704ee4d61493f";
+      sha512 = "306b5d318e48ffeb1007be64c2ec6d057b77ce1d4045f9d1474c7169ab5a6ea1baadf77605b643bf77cf33b70fad2c6391fa59e415800ac3f9ca23bbb0031d50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/fy-NL/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fy-NL/firefox-62.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9a5174208592ae14b81d066d70b1856ce6a2a48a89513f3e8dc404dacffe411d95ac34b797bfebc260a60e1183539368db4729cfa7608f5d37cb32b7b370e3b2";
+      sha512 = "29bb659cd53d8e7cdaca387ceb680fdf528068fda2ac96f759fff1680d3aced7d7665655e1887be2509648446048682d64fba97bad15ac4a9d97a53ff24cd9d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ga-IE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ga-IE/firefox-62.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "6f9085adef844dec498fcab8c520b20e89ffc11bc9972e1987f1e9e951f6ef5d597ac9398d6ab271376196be4f17b6d10f2fc911ef64e4184250c12114c6d167";
+      sha512 = "e57e956edf7d7cd13cb240c3548cba0d1057a08eeda40e52fd74a8434ba4290d6b1512a7f5a857968ec48d7d08f713c0a948c25de729b1c2e47e64871a59f981";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/gd/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gd/firefox-62.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "10bac7ae13ef11f0426404e56e7e0e64aedbcb65760971da53e399f608931da6f92b32bb55ba35972562ed9bb38d7d3c08af93f040a96650576b3b89854fa3ef";
+      sha512 = "b8c3a0ec09377de865b31e18c0e6a102e95dace7f59dfb69c0628021e42589732d8d1295fd7a1cab249a8625a387d74c8f3bfb5d4e7f7372e32696d745e93be6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/gl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gl/firefox-62.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "a1838ff805c40251c3267ca857121339ab142add70fa14b391ce584e771c2d1edee4ce45036b02e9b30239909c3bef0975f58470d798ee44dd71392f3e89ac4d";
+      sha512 = "29d236318df1c79e54492d127508b5334ca3d2de7b268cb66112506a1839179681fd4148d3cad8542a61e3e10cf6d0d8a7b065e4124056b7fe01cc7b7b13bbad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/gn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gn/firefox-62.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "c646edcb9770915f12a03d95fc5380bc376f44c0a5c0cf1da127b6d2e0143320ea47a469f654d93006bee0ec59b19f9d73cbb75887879c049e68ec791be723dc";
+      sha512 = "59121c75f7cebc7334f122fc8c416ff028773baccdae567eec765e0dfc1e1b68a855a32c62044dd75fff8a9970e1637a650f734e0e815cb0909a9f932f5709bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/gu-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gu-IN/firefox-62.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "e0a11fcad2771a14a1b40dab8bff0c1d36417ecb6ae8c69a2e14a77fdd82e3b58cf2709d52e4e9164c9c3a72b2021fc3e0ac1f3d6e3614450144eee0e210af83";
+      sha512 = "4b47a09596c358cfd3acad6f465cdf256d4704aec7960abaaeda60616328047d9baae87d8d85d325021c927af2023a3b18c86f3cf20be03f1ef7253d1e25b4a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/he/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/he/firefox-62.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "d036c40d7a4f24ac6a48dc0c7f22a4382f3d2b7531cd8ae68156285624c0e52127088149bc0840e968eb2b10f8a7c40b8f5ad5b5d2422d168814289653e16d33";
+      sha512 = "603b4ca7fb645f5f4ad398ea22003c7629a8e56852bc72f016439c82a76d9af8892f192987ef325cd674bb7748893f41284ce330aa036f2a0bd4ad8e67404429";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/hi-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hi-IN/firefox-62.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "de3cc290e390676a1b19183011dd5557c99ccd36cc443b1431e69edbcc2b9613d4400e06a2d9f6940d148732bd72f8b9fb88372b3c48a8423695767f96ae9e10";
+      sha512 = "cc18ba05a3728ed8a7d223684c9a173523e7b5ffb13d415ddcd27c20af6c01b04cee3a4f7f7404e13b07a7bda17726fb6b8469ab856320e89f37d87a6348e48a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/hr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hr/firefox-62.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "6cd5bd1ae0daf67991bf997a30b1c5c18a34672ce7f907f8afe86ceae0aeb8b540cee7ee432bb9d3bc3ca32415bb9bca74e253a68f033efc1d30980f99359329";
+      sha512 = "7e8e66323cc0163f4f6618cf23736c8334e58bf6ca3c1facbadbf1ba1c8d305932cc8852fb3923194e03b9584db55748592ef835a78781f7ea6a97fdb5616b3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/hsb/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hsb/firefox-62.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "0e2bdc18502945767def994dd2142cecf41c192040b1c71d665ac932a11ab04ee232182c8f9861580e1e2af8f7e475e327a448fd9b0c65c55d6bc616db8660c3";
+      sha512 = "be35075667c5399bed80e20c6a48ba6dae1765780587d506e33725ea7d1c27a440791f02b4a309e3b10f8d8e6c3dc6914f16ef1014c021112f0ad0c1594d3f88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/hu/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hu/firefox-62.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "3993724b6b40bad6bd446d7d45000b4a61eeb8351da8eafd072414467fe5f4f144d69acf6fdfca85a90f388a3eb5a663c461acae26ef79da97029d4e89941730";
+      sha512 = "864e3fac4a609e7737a3a6b7562166878097156384336df50bf7434d9c0b62d2f18806adccac32239e71128ca0d04f55937c53835e81793b4ba9032bfed77568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/hy-AM/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hy-AM/firefox-62.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "094a08c57fb31b176c71e515b7ed26648adb37e8b31f4005c7ffcc0303c67d7ed208914bd199198aa4adee81f64eb66bf038df7843c9fd27cf1a7ecdb5e40fcc";
+      sha512 = "4e36a70a53750b8f968c6d5cd3bcca2cb76e1d7973ac21a9baa8ebe2beba66855770849c3a5b047a05a6c34f7e4d386f83ac15d9e850681fe50224dd4c27c1ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ia/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ia/firefox-62.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c77f50d4d64c86688deb08d9a2570428ea766ee59dae1d831eb9cc0b22cd79d50269006721ced3e2cb612bfda522441b3726202affe134eee0982d8caa4489af";
+      sha512 = "f015d4615f2d874cb9f6b7813c8155df7f84c35054ef5725aa3d2516be02597c942ef93b768717fde47012af165ec68c0be88d1232deedea1b1ebe4e2ef7b274";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/id/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/id/firefox-62.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "a4dff1537ba0f769a07cf67a598470e4b3c75ac8f520806120cba03d12c33d23c497a94cc85f8a4a036023e82f6ff85a534b41ff8ae650eaa9ede83eb810c1e6";
+      sha512 = "bd5bf8e4a222ba9f9c732b9a1a591d15f6a0613c133398d0346618a5f111d94ab6023bd1aaac4a965466c5b69eed5754b46e1bae99ab07a9890dc48d06b5b6a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/is/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/is/firefox-62.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "d05f165b6d7edb25540ac2af8dadb42f6b8bba679f1e5ce98694fdaadd52a5af953e6417a40a6484c1a65f3d31c29c3aedc98e90076357f6e0150e350f4a5a0d";
+      sha512 = "1647df57a3c3314540554994a41871818c69f1387c3edf3581d7da0ab622557fc414bb4ae196b11bd85450eb15a7491b35f5b9c5991c3165e5ab1260b1392aae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/it/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/it/firefox-62.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "b7468642850c48caed9ca61891aa4a7e8d286a8c5a7bc4402b980874f37559d66cbf67b564a21e9842c050d727f0fbb719b793e1a8b59ff5f5d72752f383ae86";
+      sha512 = "ac016422261329c6ba649a5422d494058e017f56917d0fd900792d2288f36e80d9683ba76a0a1c374591528752ded5ed12ff187e20c7f9bdf4e1af1f288b54b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ja/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ja/firefox-62.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "2034acfe17d2374d1ceeed304ce99685d33b6e3d65013a5ecb4c3fecc456956a5a217577d94b24ebdf546aedc0003888b8c1da3c90716e3103a3402fc91fc90b";
+      sha512 = "b2f0a079d4d5131799bf84261cccc9315d28aa2ebe87df4de71adb6eac5fcb6e617f9719d6931503a8140d2a388981f5bb7d03e5e5cb0e7dadd9550e3b683012";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ka/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ka/firefox-62.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "0bc179fb01c987b80d3f7768f3f99b4b927f7d0e9c11083089fdc99bf42e22a2ecd3fe062f9b24cac2bcc8e30231d782e120b3dd7db7c68663192359131c28db";
+      sha512 = "3eda5516aff464f99b773acb0b1f0926196826893d89c6b4b03826579b5bdbc3d74cafb6eb5959b396aadba36f86a0479f1b2e38243387f363d1683db9fd8d82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/kab/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/kab/firefox-62.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "cba43ab691f795b2899ecd00a9924f6f7a54fc7df8232ef9905d406514e8fc665a7847099f4f4d1bc6c0766e8ad4ee69bb4c62ae95fc20b268d9ac94c3de46bb";
+      sha512 = "f8308c1c406983b7fac046d41650b39daeeaaad36107b08b7ea4893ee22c52a5bbe6cd461494bec9d68c94bdbc66b4bfca7e80bc1f85079835f8d725df90c5f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/kk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/kk/firefox-62.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "57e144438b766212d231e4a6ec706d716bad0f75e74fe67189ba3932a97e13a0055d68510d814f76264642f8d7a67efd546214efc647efdd301c7763e18ffc5e";
+      sha512 = "5ecc64545b5940115259ad8f28e3e4165cb9e1e652f9a290da3445856eb2f177f48b8a4199e01287e301f4e5b989e6e53aea82cbbd788bf98ce7416070fda1c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/km/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/km/firefox-62.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "dde198da4f0bf6ef539304c463662d021c071919e79c9023f90e9bafb6fa43e49575bb208a3235cdeb78573fa4460c8985364af03c8787c3613c2f93339d9d87";
+      sha512 = "785dfd23e7c7c150d4eaeb3611e4b32b224bba4d71e39358eeebb231f7ad7563c62c13f342eb6fae9d7177cfece868034c91aec7f1f7ffb195249a7e1e16b9e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/kn/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/kn/firefox-62.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "baeb1bd2321c283c20e7568b34f7fc43d8b5fe19d74db0e4cb9b0a8e50f7662d298eb34277da9e6b1c8e9d3c17d05872c2b8d76b6c951efb2595f35577b2d333";
+      sha512 = "0c676d8a44583d84c8decdf4d9488e1502c50fe7799ba9e06be43418eb29fe5671019ca0c4c464905dc96272d23fb4c1787cd09568077dbfddade03be7ede7de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ko/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ko/firefox-62.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "8f85f7b009338f581da82cffeeb9d0a4d0b50c76cf1e6fee307104a18b3e6c0a367caaec4a16a1743948b33e4f3a8edbda230f30a4d99db9a8c1746e1ed9bd18";
+      sha512 = "a34f030e0319a461e598423c1bce67cc4d0b9cc1ff9dca824fd18d979607310334501bc253e1e0f31a507e5cb87b5859cd7b8fbd28931f529b31faf013a15856";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/lij/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/lij/firefox-62.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "866af34084d2bc37fb05cbb660478d5f8d32f43a6aa81668ff72172e9bd6241b424846f34e927c1414da929e54ab7573e3239f426c58c481a76941d57f6f17ca";
+      sha512 = "79e61163226b80ae38a3a9a5afb9fbfa3b726416a4beb75fe82250d7d4a6928d18635168aa931a2038d2e22dfaef4952ae2698fc9a1ec4b87892057e5671b988";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/lt/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/lt/firefox-62.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "008ebd0b7c55833155de03f6b63a6ad5d7d323b73a46f883e0f04273653f8c6e2588302ed3b01aefd23eca6b44d20ff4fb41b2d74c64c3e4f9133d5c859b1153";
+      sha512 = "2a389b77faffd515603bd1645d92f8667f55093ec9b15d0a941e895de171c6f58b57e502ce2a9ea2e046eed6cecbd28faa6d3cefc262307ab4f3a52917966eb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/lv/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/lv/firefox-62.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "433b9894a0b31ecf759b7fb2904207479e49ef8e474254b632bc4087c69e4005e4598c2bc7b354fc0741a9f2d4520033048e845b4da20954f5b5cd2070833e96";
+      sha512 = "6c3ab29a647dc774c122d9970ad57f6d3d910f57d8a6dc280f37c2f0a1db1f7be00f04f97fd669b59dc5170abad29fda7132d847cbddaa18f493edbc1df69c62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/mai/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/mai/firefox-62.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "96c9a6c1e733ab40c5aed29d3719db778a41123ef6a64865b06aa3694876477c94d1394e941e62d33078ab3dfed6a63e3db132e07fb62ce0b1f2fccf8fac9846";
+      sha512 = "a839d0a30cd1910bcaa50b2e058a24ab1fb9c3463337d6532b6563e3596bd6009c38e67ab41be3d8928e8bc9a4d5f1e303b281a86de0528846d38877b2edcbc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/mk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/mk/firefox-62.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "0402a6bab5d38ead2307d01bccab012fc4fc3d89a516600ae3a2a31a213459b7bbc2588b2d04921b889905c6625e49d1b4304f7568b9e6e9c29e0082baf66487";
+      sha512 = "6af410fdb5afb807806c2660fd819b386fe16d465e83923cd2c3a9c42ad6a8e9c235d4083fe8cd45684cf15a9b0e194e6231d8ea847005c3e241c542ee785d9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ml/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ml/firefox-62.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "9e370e3635a92f1b5c0ad0b81763971992b8b9dca199fc5e649bfae51644fb3cce263d55525bd4c2745a0004c8274772fac1bb26ff5baacea19afbc2720968a6";
+      sha512 = "2da0ef0ea4897b84f8c3bb5c62b318b59006ad261cc6d77b7e3f7d3ddbcbf855b61906a608f94f6ceb868ffe1d8b20e476427aca53e785ea2e58b410d3bddf30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/mr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/mr/firefox-62.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "5237a900304f533f6993572d8ecbdee62207a742a47131a603aa5b3475b8d02595b568bd170028949a866d5499b9f15d9e73b00c7a67a158eca5c8870e210593";
+      sha512 = "517c2ca0b2e2e498a835ce830fe58771264221bd443a4934ed501f68cb4b55a6ffc9077a3ea3f0b85ed69df17a4b2bc7c9ae626a2d044985aaaa005e5b804e76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ms/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ms/firefox-62.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "6a2a9634758ac3066b80f08e872ee31cf28abcc60c20ca583ed8b5c379be68b477ea127252d1b1d392b5e0bcae1aecd622c24062ad4ea60330f68cd6add667ec";
+      sha512 = "ef61b1bf5c6f6dbbbc745d9569140c5881e1052a87126ea56a8a16c368039aad33b06886a3fe984cccdac9770a472d4a6be9deb7ecd0aa1c08313cf749d11d68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/my/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/my/firefox-62.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "44d45045f85272025a2bfde0a7a11137acf321edc1df1ebc4b5d5b6171a0eea3b9a3ff84ea190e95849ce85fa8b594b799c047208fab365c65fe7ea1ea07a58d";
+      sha512 = "83abaa558342df903d6b09870a452d3d89ad1be8bd41dde90830c0f035f9ccaba15e48385369bce8f2ddf77715d51d17e152baea8ce2b99e3c439ffd732ad1f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/nb-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/nb-NO/firefox-62.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "236352256e3e9c34ff64a390a6c325066900a981a554382c7193523507b4eb3ba8aa3b1b5176f0d8b4c56739ce95aa6a2e52f2fb32a849eb817590c1515c3636";
+      sha512 = "33c4f6551b1f418820b6b72d06506494e578c9f370e196662370c58ead866edcec5e5d07d1fe41eb5b9be886bbf56bdba0f6bc690909f45a4f4e938a460f2260";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ne-NP/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ne-NP/firefox-62.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "b2bff115c9469028d8b9e8998c34fb4da1bf2fb284382fa066ab1836fe8216a72623b6ee74dda3efecb2fc9ec0b962c529661ef2975012762acb0b374cc37529";
+      sha512 = "4eaf3b386482132c346da954d94b99036e4a743a1d2fb9a745f5ba6ff2d337ab58935493d99f9cddd189730a273be310f4d477afe7f578c53f4b4a7afd61a576";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/nl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/nl/firefox-62.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "3b02c50ec334f1555f8845f57cd7ac8becdd4e17a163c7347dbb10d78973eeb10c88cb147dd9dc2487fe8a142a70d80fa0e22d7773949d680e6574d1032db5c9";
+      sha512 = "b6263343512af71fe04bdef3254f6370cf30c2a5e262c8b262017ca00708271f539a7acfa9eec2fb360b5606811fa07db69212676c10dcc492e75337322f29de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/nn-NO/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/nn-NO/firefox-62.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "d0b1335a7c84f617fe768df181a4a17fa50a497652bb107a69429b036cc6f0cfcf10b0caafa8a2223a92c8414854b8cc69c5a93f3b790bc11e981de2730c2913";
+      sha512 = "afa0c1eb1348b1fdf2139668e07ea83b2459ff81a34204dca3e592ea5f4e91893b1dcd9177e5fa94b1521269ca0a02de81c87d22e076d90249704a3ead229b82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/oc/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/oc/firefox-62.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "ab1a13dfb5d31a4efa6693698099a4f19513acedb85e097fc9aa9791b3826240f87923190a56ef75cc43cfeba27d0d0db9f105203a0e1fb7c2fe4f03701d2f1a";
+      sha512 = "d61133d5762d0cafb16a1db8c5c38455f9788287eabb1285ec081b9343de9a4e2637f6496c929cba4f6f870d78af5bd85f9905fe6d2d2e5824b1b75a7b29caf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/or/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/or/firefox-62.0b7.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "1f3cfa992184aa451c00f27c812b9678c2a20d3da7a79d286acaab2c9e3d284b98d28cfbd271b8ad403daf0817bbc83df82b6c0b43cd10f730f81c31092e8a10";
+      sha512 = "3a4d65a1599c16942c2b6254a29c3a05a7112a65b107ffcc5eb02b48f3b4f94b2b3ea788608d5d0dc8a9dd6c0fb7d1dd66217e6e2efc378bc8031bd66404abdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/pa-IN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pa-IN/firefox-62.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "f0e20d18a2247994cbb8504698ec30ae08bce8bc273d3cce0aa3ca501ad036a046ee50dac50f03cd54bd4ee8a0620f64d3b645f995af04ff41388a880f32f845";
+      sha512 = "0bf8ae429521d36b16e9ce7540a07e8c576085504747b0408f85ebf66b8572b9179e66ce29061f02bb117fc26548e1ad3b7594799d681ea4ab0f571decf5f606";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/pl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pl/firefox-62.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "66aef09199feebf8e3dc65e2f8815221fd9beb278c592e005af3fe5fee8e0c52b784265bb248363d77d4678b68b8521b9d48a70266e247782e15d5e2ea740c8d";
+      sha512 = "371ec75eb47ed9192a9bceb22633e0437bc910097dd77b45f4812ffd63412d1dee931a6f6d379ee916a9d17a0e0802632539de78958293108194a4f5ad08b432";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/pt-BR/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pt-BR/firefox-62.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "977fa6a69cb486340945a98d1d1433e9f00c0912863ba1e69f973a1a42a8b2cc14f683142765863e3775f6e98831d156a1cd869f9336d56c51d41e9c2c0f1969";
+      sha512 = "3a8f75f5206ae4608c3632e9afb11d287613e0bcb10d3407e464b89a0c4349602aaab1a1f9fb061148baffd82aa3a6ff18eacb9e97ca9ce423893ebf0c4b5245";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/pt-PT/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pt-PT/firefox-62.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "1eb4e94a5a0cea9298dfabf5161b304b77805acbb6dd89969d1c2a02553389c940e1210cca0283bfd2da8a0c3a78b11b26247e6c1965419bf5f9c4daa959e396";
+      sha512 = "fe2fed370b11767dcef0e13ef06cb28aaf09ebf9e52cb1e00d4faf384a109d45f377307d945c66eebe9f22ae53b66a89e3ed32520b0d7caf2612cd724a77252d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/rm/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/rm/firefox-62.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "fc233ea55f397ad545b57fbaa06fe68996f43f2cd17c4de8126a694d681d8d7c5cfa277e78640d77f75d1df6c1dfc0c359174968de361eaf30947d98b5547a56";
+      sha512 = "4fe958da772641202de6093988062ef1419fea721f42955c8702d8a170080238066c6a1fa13fbe154d2e4318acb357e9095c36e95bf5c09797af3461178dd41e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ro/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ro/firefox-62.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "beb4013a6869751b6a2e7117f10ef9497394bad4a219dbb91a6d279d71f1d2f741dca6bc5cc8d2ee2d44c8c812149f242408f6127360853025c2a999990ffff1";
+      sha512 = "c2486c813acaba9c1143ec33165a6c90d1b9743235f71df77d89b38ad4c8081331b3c7c117bf34adf1f92855b152f16be5155731ae378e3f309a28b94909b730";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ru/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ru/firefox-62.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "03ffada2ae417907db62b9abd1ec43304995fb7664edbcba9a3f2cdf4af711fe43e38201f23690b404bdf4f421c4aa31082cdf35dcecf36a812cdc24d86dd4e2";
+      sha512 = "6ce925552d6ea223e8876697c868b806e5e63fc8f2926f351304b056a58fab61c31ec7b983056e016af17fc5fd33b095473ca8ca50f175a1202dd9e51a20a517";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/si/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/si/firefox-62.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "65f6818d3d29099abe368f94fed8284a58cb8edd2903673a5f4c67e576526445a8fa9ac267c7482793141e59af57f73b5a34233aa8620e983987c0315d70e8da";
+      sha512 = "33f7a39cfbc581a5b39b7a3f4cb3ac156603cabc8938e69331db44932f5079061348ad1546498ffec36c27c06247ee91d238d7bbcd1e5ce76057cae41a1dc3d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/sk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sk/firefox-62.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c48c9fc297a0a18de048a64670608688c02326a2c4de6762f883d60c37899dc8c6c8463c400af4c5b279175db6ccee8fcb1f08fbf19e917aa11f5a647281b08c";
+      sha512 = "531cb610457a317e4d4a16221d1fa8d87e01cba34076e1e4834fc9ef695b57d2655e8239c86f41513a150bb80bd17e9362bfbd3cd8874f3dfc9ee2c3dd0b1d69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/sl/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sl/firefox-62.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3f85d313359e5ee837dc7b6644c4b78a1b189b5f36bf885d053beb4a3a96dd4eb07a03c0b100ca1e7e7477dccd82706219bdb468e03ef0bb4fdf55781ab63ca3";
+      sha512 = "fd8f29cc2139c19d6bfacf06e0548b0bb051bd77f069f19d1a322cd33d2888f1c11ef490ac27f9de19581619a79cce2cfb661c5782e13baa9276226918940c0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/son/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/son/firefox-62.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "fd3df0da33029534f60ca7a17a1c816e75b2853207223010633113e4d440c0fda342d89f9738bf18c3aad6d747476622638fe52f5dc3cfb9a9a6060959e3ac9c";
+      sha512 = "1a747d748dc9cb0207425cb95f3543b7e9815f5a9d3b273dda9cef5c113aa1f2d7fcd1a509a2dd0349a3245b82d8e52f427806c79131d0db12076ab23b672e8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/sq/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sq/firefox-62.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "274b27d231c0e9516ba7ee46cd9b7ca9f94a732df4b5b4c794dfbf6711a858b6ab3be59b6d75a8938e3dc6da2c6d74afe340efd903f9cedea80602ca8fa48058";
+      sha512 = "4ac46e81b383374597983336d50432f47220983d90bda3c1613dd558ba7e8c07b76cff2b1f8a5697858c3a13ec7f12295b7216208fb9188eedc72016b4613733";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/sr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sr/firefox-62.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "4ba64c747a6cf9aec8b10ea0d83a35a90d7c460b523cda92f876fd7846455175396caef38003f535d32592239ac02111fba9a14f81ceeec40ef48286c42c7229";
+      sha512 = "052b28335957b0ba25681d05b4c659b976986c5557c700314fdc9fbafc84ce54a768221e16f0e0bf8bd5f7f7930188adcea25740c810627fe3807db7661b2136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/sv-SE/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sv-SE/firefox-62.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "49b4222dba68c8a86e6d75d2025b0c0a018ece1c5bcd4781b56222be1ff9b115011623e33c86c43b485c030906fa04112381035fafdb08af317486d214d1ef97";
+      sha512 = "9bd541cb07e177674933d3175616e90661d647f66f0dc93823f8bbabe1ff16954eaa84c8ff35b1ed6f42b258523b67cc32159574aecf927d8c6b9df75778b66b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ta/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ta/firefox-62.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "3cb53fab67b010d40dd165ee087efaf9027c654b307eda69fd0eb69c30453a0df26481763d6ff78d769e5552ec49aaddd6ad7dfd528c59a2848e8678e95a07bf";
+      sha512 = "fdd312d62ac37159cce489a18929e6a93663fb1621de76df984da6ea32f560a39a876706224ab1589b3c18837eeb5ce921e3ac63eab7fb217af7b99423c2c5e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/te/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/te/firefox-62.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "a8c545cf3883b07cf9d2d39f39a000a62a5323d2aaf570aa85f8c8c2217081492838bb587dfc77ce6ff6ed5a0327dc34e38755dbbc05a5a08fe6ec11529f1887";
+      sha512 = "7c3b5997955da39dfe33def93641cae1c4d5657fda4acc1fcf5fa153f8c7c7031303b05c5a38350acab61fe66f23b083f601464b45d31859834fc86fecbac78d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/th/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/th/firefox-62.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "814c8c28ce43fa6388a6a1e3aacf3b076111a3ed5f990630a269f1e001d2341e5912f259a32bb3df4dae27554ad5ef5e7dcfa9ad1857bf1cf11e19d197f47bf8";
+      sha512 = "6eec3ebc39d6937326b13e667518e94259e0b69c3298e5f416fcff6d53562fd952af37aa42698ed8e2197afc1c2706f1a8e7e687982aaa5a2bf82012feec2c36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/tr/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/tr/firefox-62.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "6af6398160fb0d8dd8151ddc8dbdcb60eafa4ecf16ee532ce3af4ce63fa6bf9246dfb95e49bb423a9d3a67d7b7ffef010a7e19ce4fa4dac69c1d27820dc4733b";
+      sha512 = "febc45bb79ba34ca0cccd17da4e43ae9b6cc584e4ab4d3b2f409706b05218720203b924fe37563ab97f4b73ad36a395c7787347a418f5d333740cafa94d89ef1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/uk/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/uk/firefox-62.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7f1c1dfb45149e3909bbb863655604bb6ff1ce3fcc9888c3b5f1661cafd027c19a08d00d591ee0906a8aebb5b5e7d380d6b38589a2c0419c5744c19f4e69f931";
+      sha512 = "a46452a63ca19715b5cb192b8e97849b2411ea6e388532b943e5e4d201b62322ff3a709a17dc5809065ddd8cfc03089dfd3e9a2fc18d96635eadda4f4edce44e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/ur/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ur/firefox-62.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "073519ffe631d40216421f9d82f8b7d1e61f6446d0da54e61921b9ce0b1a70acd02f7c678e2496e5c507285f14920b27eee123b739f74f2bf153cfd24c38a587";
+      sha512 = "8d5b350ce61c5fbc399cb5e90af69ffe7c3f91f3f37557afb7910a717a2b971d73cdd6863c248f6f75176253ec161729991b64aa15e3fe9b0a47797b7e5ba3d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/uz/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/uz/firefox-62.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "eaa7510ba14232a015fccb6bf3972abc962d2f2acc0ed95b73a9f68c1762c7a6e3cce50f867b730f00d8dc3f754906e537c08b948df8078b1df524f45c23faed";
+      sha512 = "bfadf3b66e2f7519c36b3802cd7d4f6fce570efa686d8e1d5289cb4137bb239c47f2dbbf5fd805eb066a0991b934a4efc86dcaf54afde532cf81f792169f9c0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/vi/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/vi/firefox-62.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "3b98158d33d5a9ef10c3567a6e2f1322df1529f1e71f690753c74238ef87f72d65724b96e91ade88862268dd2845911b02968cefff722971ec57b45de595dad9";
+      sha512 = "32563147947fd1b125ad23181c4238053e5d54fcea673810e273adc6ff5ce1d0b264d94bb25ee22c0912d76d3e4481752b76e1db8d8bbc5fa8eae99668b86fff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/xh/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/xh/firefox-62.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "6ca2a7d9225cebaae4ca9ad53d42435331b3ff26e7989cab8bf2dadf861eff30738ff26083ba5277b0b82a9ee00f9f937f103df312929c9dc2291c0d9482ebc2";
+      sha512 = "e7faa6b585c6a93d09ed19ce53bdc287c1573289d3778755d0f9556c087793b39e8121fbc57e89e3a5403392cfd1af59c09c8cfaac203c61ec239cba185586fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/zh-CN/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/zh-CN/firefox-62.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7b40a5c6bc9bc06cffa77b5e87a8de9b447e883bdfe99077de340d4f90b3a3a78b4f0b9315c072e8ff7a41b0c4c7b434e9146393233ca3eaf1655d547dc7ac5b";
+      sha512 = "5a5aac639dd8a16a1731918032402aa6165ec345cba6864588284df936ccd4888d11a9232e0ecbae461731eef16af1ae7a3c9d8cc024af5502851c765a625aa6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b6/linux-i686/zh-TW/firefox-62.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/zh-TW/firefox-62.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "be7ec2532e4102aadfc88d3722646fc6c7c5f8f8c5c502bf5ad95ddb9c02aaaf2142caf364587a537e1282a7e35a6c6f5306cdde01381d08156688c97c497d5e";
+      sha512 = "c796452d028cf22a1386f1a0c650452fcc2d1b74fb4c23358a906bb790a5dfb54ef3d591451a199a8b78767f0280970a90b48ab7e444093df20e5d0578b3cc26";
     }
     ];
 }

From af64892fe6ea04e79675226a0308249c36892482 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Jul 2018 00:12:14 +0200
Subject: [PATCH 41/46] pulseeffects: init at 4.1.3

---
 .../audio/pulseeffects/default.nix            | 90 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 92 insertions(+)
 create mode 100644 pkgs/applications/audio/pulseeffects/default.nix

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
new file mode 100644
index 000000000000..a62612a6e0fd
--- /dev/null
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -0,0 +1,90 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, libxml2
+, desktop-file-utils
+, wrapGAppsHook
+, gst_all_1
+, pulseaudio
+, gtk3
+, glib
+, glibmm
+, gtkmm3
+, lilv
+, lv2
+, serd
+, sord
+, sratom
+, libbs2b
+, boost
+, calf
+, zam-plugins
+, rubberband
+, mda_lv2
+}:
+
+let
+  lv2Plugins = [
+    calf # limiter, compressor exciter, bass enhancer and others
+    mda_lv2 # loudness
+  ];
+  ladspaPlugins = [
+    rubberband # pitch shifting
+    zam-plugins # maximizer
+  ];
+in stdenv.mkDerivation rec {
+  name = "pulseeffects-${version}";
+  version = "4.1.3";
+
+  src = fetchFromGitHub {
+    owner = "wwmm";
+    repo = "pulseeffects";
+    rev = "v${version}";
+    sha256 = "1f89msg8hzaf1pa9w3gaifb88dm0ca2wd81jlz3vr98hm7kxd85k";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+    libxml2
+    desktop-file-utils
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    pulseaudio
+    glib
+    glibmm
+    gtk3
+    gtkmm3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    lilv lv2 serd sord sratom
+    libbs2b
+    boost
+  ];
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}"
+      --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}"
+    )
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
+    homepage = https://github.com/wwmm/pulseeffects;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf13b0a86264..35219f638b5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12927,6 +12927,8 @@ with pkgs;
 
   libpulseaudio = libpulseaudio-vanilla;
 
+  pulseeffects = callPackage ../applications/audio/pulseeffects { };
+
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
 
   pies = callPackage ../servers/pies { };

From be382109ad01d0aa8660f2b19a20e345c86d246b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Jul 2018 01:17:35 +0200
Subject: [PATCH 42/46] gst_all_1.gst-plugins-bad: add more plug-ins

---
 .../libraries/gstreamer/bad/default.nix           | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 122285da99ec..96e02c605f54 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,8 +1,9 @@
 { stdenv, fetchurl, fetchpatch, meson, ninja, gettext
 , pkgconfig, python, gst-plugins-base, orc
 , faacSupport ? false, faac ? null
-, faad2, libass, libkate, libmms
-, libmodplug, mpeg2dec
+, faad2, libass, libkate, libmms, librdf, ladspaH
+, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
+, libbs2b, libmodplug, mpeg2dec
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls, mjpegtools
@@ -42,6 +43,12 @@ stdenv.mkDerivation rec {
         sha256 = "0hy0rcn35alq65yqwri4fqjz2hf3nyyg5c7rnndk51msmqjxpprk";
     })
     ./fix_pkgconfig_includedir.patch
+    # Enable bs2b compilation
+    # https://bugzilla.gnome.org/show_bug.cgi?id=794346
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=369724;
+      sha256 = "1716mp0h2866ab33w607isvfhv1zwyj71qb4jrkx5v0h276v1pwr";
+    })
   ];
 
   src = fetchurl {
@@ -56,6 +63,10 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gst-plugins-base orc
     faad2 libass libkate libmms
+    libnice webrtc-audio-processing # webrtc
+    libbs2b
+    ladspaH librdf # ladspa plug-in
+    lilv lv2 serd sord sratom # lv2 plug-in
     libmodplug mpeg2dec
     openjpeg libopus librsvg
     fluidsynth libvdpau

From d133362c185c9459d914d1a63f7ca512b142630c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20H=C3=B6ppner?= <tilpner@users.noreply.github.com>
Date: Tue, 10 Jul 2018 12:19:59 +0200
Subject: [PATCH 43/46] gomuks: 2018-05-14 -> 2018-7-10 (#43277)

---
 .../networking/instant-messengers/gomuks/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 5246f8d3d1d6..8e85be831a01 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -2,15 +2,15 @@
 
 buildGo110Package rec {
   name = "gomuks-${version}";
-  version = "2018-05-16";
+  version = "2018-07-10";
 
   goPackagePath = "maunium.net/go/gomuks";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "gomuks";
-    rev = "512ca88804268bf58a754e8a02be556f953db317";
-    sha256 = "1bpgjkpvqqks3ljw9s0hm5pgscjs4rjy8rfpl2444m4rbpz1xvmr";
+    rev = "68db26bcace31297471641fe95f8882e301f5699";
+    sha256 = "0dagdvsvn8nwqsvjbqk1c6gg2q1m40869nayrkwm3ndg2xkfdpm6";
   };
 
   meta = with stdenv.lib; {

From 7b6510e455ee83f22aef8deb9ff493e944ffc901 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 8 Jul 2018 16:35:10 +0200
Subject: [PATCH 44/46] nixos/udisks2: use upstream unit

Simplifies the module and gets rid of the following error:

The --no-debug option is deprecated and ignored. See '--help
---
 nixos/modules/services/hardware/udisks2.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index ad5dc8e8a49b..ed8703be921c 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -40,15 +40,8 @@ with lib;
       '';
 
     services.udev.packages = [ pkgs.udisks2 ];
-    
-    systemd.services.udisks2 = {
-      description = "Udisks2 service";
-      serviceConfig = {
-        Type = "dbus";
-        BusName = "org.freedesktop.UDisks2";
-        ExecStart = "${pkgs.udisks2}/libexec/udisks2/udisksd --no-debug";
-      };
-    };
+
+    systemd.packages = [ pkgs.udisks2 ];
   };
 
 }

From 35d4640b0309fa3580f9a2a973f7c43bdb6560b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 10 Jul 2018 14:48:36 +0200
Subject: [PATCH 45/46] ghostwriter: 1.6.2 -> 1.7.0

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

diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 7a0399ea0f84..594f4ca8704a 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ghostwriter";
-  version = "1.6.2";
+  version = "1.7.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "wereturtle";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12";
+    sha256 = "00nlk5gazlfnndanhhjj5hlvkkp9yfx5mj6jq0jz37mk8mn6rzln";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];

From 2698bb461fe36069a0bcfeec52d7c99eb476b134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Jul 2018 15:23:20 +0200
Subject: [PATCH 46/46] knot-dns: 2.6.7 -> 2.6.8 (maintenance)

https://lists.nic.cz/pipermail/knot-dns-users/2018-July/001409.html
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index d607389b78f2..ef99772a082d 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.6.7";
+  version = "2.6.8";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243";
+    sha256 = "0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15";
   };
 
   outputs = [ "bin" "out" "dev" ];