From 24f176f01691f3d350f64272bc5297a8400d4b99 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 11 Jun 2018 09:47:01 -0700
Subject: [PATCH 001/117] nixos/mattermost: fix JoinsNamespaceOf config
 location

---
 nixos/modules/services/web-apps/mattermost.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index be74a2b1955..277cbe35b78 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -203,11 +203,11 @@ in
           Group = cfg.group;
           ExecStart = "${pkgs.mattermost}/bin/mattermost-platform";
           WorkingDirectory = "${cfg.statePath}";
-          JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
           Restart = "always";
           RestartSec = "10";
           LimitNOFILE = "49152";
         };
+        unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
       };
     })
     (mkIf cfg.matterircd.enable {

From f8cd0cbc9c4e449acc8c3a72643643ce3e288f32 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Tue, 12 Jun 2018 18:54:44 +0200
Subject: [PATCH 002/117] asc-key-to-qr-code-gif: init at 20180613

---
 .../asc-key-to-qr-code-gif/default.nix        | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/security/asc-key-to-qr-code-gif/default.nix

diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
new file mode 100644
index 00000000000..e04b4155748
--- /dev/null
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, imagemagick, libqrencode
+, testQR ? false, zbar ? null
+}:
+
+assert testQR -> zbar != false;
+
+stdenv.mkDerivation rec {
+  name = "asc-key-to-qr-code-gif-${version}";
+  version = "20180613";
+
+  src = fetchFromGitHub {
+    owner = "yishilin14";
+    repo = "asc-key-to-qr-code-gif";
+    rev = "5b7b239a0089a5269444cbe8a651c99dd43dce3f";
+    sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r";
+  };
+
+  buildInputs = [ imagemagick libqrencode ] ++ stdenv.lib.optional testQR zbar;
+  dontBuild = true;
+  dontStrip = true;
+  dontPatchELF = true;
+
+  preInstall = ''
+    substituteInPlace asc-to-gif.sh \
+      --replace "convert" "${imagemagick}/bin/convert" \
+      --replace "qrencode" "${libqrencode}/bin/qrencode"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp * $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/yishilin14/asc-key-to-qr-code-gif;
+    description = "Convert ASCII-armored PGP keys to animated QR code";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ asymmetric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b034411921b..283e69e54ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -680,6 +680,8 @@ with pkgs;
 
   passExtensions = recurseIntoAttrs pass.extensions;
 
+  asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { };
+
   gopass = callPackage ../tools/security/gopass { };
 
   browserpass = callPackage ../tools/security/browserpass { };

From 2c78c378b7c45b8b59fa420e9bac53655dd9164b Mon Sep 17 00:00:00 2001
From: Kevin Liu <kevin@potatofrom.space>
Date: Sat, 16 Jun 2018 08:38:32 -0400
Subject: [PATCH 003/117] helmfile: 0.16.0 -> 0.19.0

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

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index b1dcfb809b5..7f07fcc486d 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoPackage, fetchFromGitHub, ... }:
 
-let version = "0.16.0"; in
+let version = "0.19.0"; in
 
 buildGoPackage {
   name = "helmfile-${version}";
@@ -9,7 +9,7 @@ buildGoPackage {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "12gxlan89h0r83aaacshh58nd1pi26gx5gkna0ksll9wsfvraj4d";
+    sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd";
   };
 
   goPackagePath = "github.com/roboll/helmfile";

From 37804741b518f889eecde85f8c5cc17f0a83d640 Mon Sep 17 00:00:00 2001
From: Kevin Liu <kevin@potatofrom.space>
Date: Sat, 16 Jun 2018 08:38:50 -0400
Subject: [PATCH 004/117] helmfile: add helm to path with wrapProgram

Helmfile makes direct calls to `helm` as an implicit dependency. Now helmfile
can work without Helm also being explicitly installed.
---
 .../networking/cluster/helmfile/default.nix            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 7f07fcc486d..358f4cdb7df 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, fetchFromGitHub, ... }:
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
 let version = "0.19.0"; in
 
@@ -14,6 +14,14 @@ buildGoPackage {
 
   goPackagePath = "github.com/roboll/helmfile";
 
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $bin/bin/helmfile \
+      --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
+  '';
+
+
   meta = {
     description = "Deploy Kubernetes Helm charts";
     homepage = https://github.com/roboll/helmfile;

From b0909cc394fce2695629ce1c4412e5446e6fe2c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Jun 2018 10:37:06 +0200
Subject: [PATCH 005/117] ghc: drop compiler version 8.4.2; we prefer 8.4.3

---
 pkgs/development/compilers/ghc/8.4.2.nix | 208 -----------------------
 pkgs/top-level/haskell-packages.nix      |  13 +-
 2 files changed, 1 insertion(+), 220 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/8.4.2.nix

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
deleted file mode 100644
index ac8d76c63ed..00000000000
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ /dev/null
@@ -1,208 +0,0 @@
-{ stdenv, targetPackages
-, buildPlatform, hostPlatform, targetPlatform
-
-# build-tools
-, bootPkgs, alex, happy, hscolour
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
-
-, libffi, libiconv ? null, ncurses
-
-, useLLVM ? !targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
-  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
-  # build-time dependency too.
-  buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(gmp.meta.available or false), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
-  enableRelocatedStaticLibs ? targetPlatform != hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
-  # platform). Static libs are always built.
-  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt
-
-, # Whetherto build terminfo.
-  enableTerminfo ? !targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
-}:
-
-let
-  inherit (bootPkgs) ghc;
-
-  # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
-    (targetPlatform != hostPlatform)
-    "${targetPlatform.config}-";
-
-  buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
-    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = YES
-    HADDOCK_DOCS = NO
-    BUILD_SPHINX_HTML = NO
-    BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
-    GhcLibHcOpts += -fPIC
-    GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
-    EXTRA_CC_OPTS += -std=gnu99
-  '';
-
-  # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
-  toolsForTarget =
-    if hostPlatform == buildPlatform then
-      [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
-    else assert targetPlatform == hostPlatform; # build != host == target
-      [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
-  targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation rec {
-  version = "8.4.2";
-  name = "${targetPrefix}ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "0yq4y0smn92sksnjjva28b8847krxizns6rm50j3pgq69br35k01";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  patches = [(fetchpatch {
-    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
-    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
-    extraPrefix = "utils/hsc2hs/";
-    stripLen = 1;
-  })]
-    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
-
-  postPatch = "patchShebangs .";
-
-  # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
-    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-      export "''${env#TARGET_}=''${!env}"
-    done
-    # GHC is a bit confused on its cross terminology, as these would normally be
-    # the *host* tools.
-    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
-    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
-    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
-    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
-    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
-    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
-    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
-    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
-    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
-  # `--with` flags for libraries needed for RTS linker
-  configureFlags = [
-    "--datadir=$doc/share/doc/ghc"
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
-    "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
-    "CFLAGS=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
-    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
-    "--disable-large-address-space"
-  ];
-
-  # Make sure we never relax`$PATH` and hooks support for compatability.
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    perl autoconf automake m4 python3
-    ghc alex happy hscolour
-  ];
-
-  # For building runtime libs
-  depsBuildTarget = toolsForTarget;
-
-  buildInputs = libDeps hostPlatform;
-
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
-  checkTarget = "test";
-
-  hardeningDisable = [ "format" ];
-
-  postInstall = ''
-    for bin in "$out"/lib/${name}/bin/*; do
-      isELF "$bin" || continue
-      paxmark m "$bin"
-    done
-
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs targetPrefix;
-
-    inherit llvmPackages;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.4.2";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c5f0378049e..ec471538095 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -66,12 +66,6 @@ in rec {
       buildLlvmPackages = buildPackages.llvmPackages_39;
       llvmPackages = pkgs.llvmPackages_39;
     };
-    ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec {
-      bootPkgs = packages.ghc821Binary;
-      inherit (bootPkgs) alex happy hscolour;
-      buildLlvmPackages = buildPackages.llvmPackages_5;
-      llvmPackages = pkgs.llvmPackages_5;
-    };
     ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec {
       bootPkgs = packages.ghc821Binary;
       inherit (bootPkgs) alex happy hscolour;
@@ -100,7 +94,7 @@ in rec {
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
     };
     ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
-      bootPkgs = packages.ghc842;
+      bootPkgs = packages.ghc843;
       inherit (bootPkgs) alex happy;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
       stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
@@ -151,11 +145,6 @@ in rec {
       ghc = bh.compiler.ghc822;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
     };
-    ghc842 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc842;
-      ghc = bh.compiler.ghc842;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
-    };
     ghc843 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc843;
       ghc = bh.compiler.ghc843;

From 9fb27679deea0697c818fe908a382ecd74c712e1 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Mon, 18 Jun 2018 22:09:14 +1000
Subject: [PATCH 006/117] nix-pin: 0.3.1 -> 0.3.4

---
 pkgs/tools/package-management/nix-pin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index 89342953705..10afb1d9097 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,12 +1,12 @@
 { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.3.1";
+  version = "0.3.4";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.3.1";
-    sha256 = "1sldbrz33wz30d3vv3d2clyqyd6x1y6h6xjz1xv55fa97ig1h481";
+    rev = "version-0.3.4";
+    sha256 = "03wdxai3hpv2v9jp7r91x8y36ryz6v1cczmx3d26g1bf0ij5svb8";
   };
   buildInputs = [ python3 mypy makeWrapper ];
   checkPhase = ''

From e905a3a417baff1aa7b25c61886cce38b99221f1 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Mon, 18 Jun 2018 22:09:52 +1000
Subject: [PATCH 007/117] nix-update-source: 0.5.0 -> 0.6.3

---
 pkgs/tools/package-management/nix-update-source/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix
index fe3cf33b46c..e7eb497b4b9 100644
--- a/pkgs/tools/package-management/nix-update-source/default.nix
+++ b/pkgs/tools/package-management/nix-update-source/default.nix
@@ -1,12 +1,12 @@
 { lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
 python3Packages.buildPythonApplication rec {
-  version = "0.5.0";
+  version = "0.6.3";
   name = "nix-update-source-${version}";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-update-source";
-    rev = "version-0.5.0";
-    sha256 = "13icwk249frddsmn9albasikwp8asmgvp3jf9xj9adzh63wzh1i7";
+    rev = "version-0.6.3";
+    sha256 = "157wvv9vnaszzwbj68jpdc0imcm1hdab3z760bx2axbsgfpqqilz";
   };
   propagatedBuildInputs = [ nix-prefetch-scripts ];
   passthru = {

From c068e1ca9af3e86f56615aafd705fbd851f466bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 17 Jun 2018 22:28:23 +0200
Subject: [PATCH 008/117] opensmtpd: fix interaction with dovecot-2.3.1

This has been merged upstream with
    https://github.com/OpenSMTPD/OpenSMTPD/pull/847
---
 pkgs/servers/mail/opensmtpd/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index e562fdc88a6..60c517230b4 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison
+{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison
 , libasr, libevent, zlib, openssl, db, pam
 
 # opensmtpd requires root for no reason to encrypt passwords, this patch fixes it
@@ -23,7 +23,13 @@ else stdenv.mkDerivation rec {
     sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81";
   };
 
-  patches = [ ./proc_path.diff ];
+  patches = [
+    ./proc_path.diff
+    (fetchpatch {
+      url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff";
+      sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa";
+    })
+  ];
 
   postPatch = with builtins; with lib;
     optionalString unpriviledged_smtpctl_encrypt ''

From a669574a908561737eeac2ba7eb05c505bc02a79 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 18 Jun 2018 02:16:52 +0200
Subject: [PATCH 009/117] patchwork-classic : init at 2.12.0

---
 .../ssb/patchwork-classic/default.nix         | 106 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/applications/networking/ssb/patchwork-classic/default.nix

diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
new file mode 100644
index 00000000000..361aac4f122
--- /dev/null
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -0,0 +1,106 @@
+{ stdenv, fetchurl, lib, makeWrapper,
+  # build dependencies
+  alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
+  freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
+  glibc, systemd
+}:
+
+stdenv.mkDerivation rec {
+
+  version = "2.12.0";
+
+  name = "patchwork-clasic-${version}";
+
+  src = fetchurl {
+    url    = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb";
+    sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj";
+  };
+
+  sourceRoot = ".";
+
+  unpackCmd = ''
+    ar p "$src" data.tar.xz | tar xJ
+  '';
+
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R usr/share opt $out/
+
+    # fix the path in the desktop file
+    substituteInPlace \
+      $out/share/applications/ssb-patchwork-electron.desktop \
+      --replace /opt/ $out/opt/
+
+    # symlink the binary to bin/
+    ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic
+  '';
+
+
+  preFixup = let
+    packages = [
+      alsaLib
+      atk
+      cairo
+      cups
+      dbus
+      expat
+      fontconfig
+      freetype
+      gdk_pixbuf
+      glib
+      gnome2.GConf
+      gnome2.gtk
+      gnome2.pango
+      nspr
+      nss
+      xorg.libX11
+      xorg.libXScrnSaver
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXrender
+      xorg.libXtst
+      stdenv.cc.cc.lib
+      stdenv.cc.cc
+      glibc
+    ];
+    libPathNative = lib.makeLibraryPath packages;
+    libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
+    libPath = "${libPathNative}:${libPath64}";
+  in ''
+    # patch executable
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \
+      $out/opt/ssb-patchwork-electron/ssb-patchwork-electron
+
+    # patch libnode
+    patchelf \
+      --set-rpath "${libPath}" \
+      $out/opt/ssb-patchwork-electron/libnode.so
+
+    # libffmpeg is for some reason  not executable
+    chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so
+
+    # fix missing libudev
+    ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1
+    wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \
+      --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser";
+    homepage    = "https://github.com/ssbc/patchwork-classic-electron";
+    license     = licenses.gpl3; 
+    maintainers = with maintainers; [ mrVanDalo ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37acfa65025..11d996d38ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4365,6 +4365,8 @@ with pkgs;
 
   patchage = callPackage ../applications/audio/patchage { };
 
+  patchwork-classic = callPackage ../applications/networking/ssb/patchwork-classic { };
+
   pcapfix = callPackage ../tools/networking/pcapfix { };
 
   pbzip2 = callPackage ../tools/compression/pbzip2 { };

From e99a869c197b511949151d02562b29f27dea332b Mon Sep 17 00:00:00 2001
From: Mrmaxmeier <Mrmaxmeier@gmail.com>
Date: Mon, 18 Jun 2018 19:21:20 +0200
Subject: [PATCH 010/117] prometheus-node-exporter: 0.15.2 -> 0.16.0

---
 pkgs/servers/monitoring/prometheus/node-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 497f20ac55e..02a6197d384 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "node_exporter-${version}";
-  version = "0.15.2";
+  version = "0.16.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,10 +11,10 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "1vxbkps80ba8c0ndawijg07am5gyc8y49h8fd0ky5h05zmkp25qv";
+    sha256 = "0rm6ahccgr1djpwvsa3p1kfal3mpy4a6g5w974pra84gk3krli5a";
   };
 
-  # FIXME: megacli test fails
+  # FIXME: tests fail due to read-only nix store
   doCheck = false;
 
   meta = with stdenv.lib; {

From f8ec07e836dfd224c41216cbd82a8cfc3de50b8a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 13 Jun 2018 13:44:16 -0400
Subject: [PATCH 011/117] haskell generic-builder: Always use separate pkg db
 for custom setup

This decreases complexity and ensures setup dependencies are properly
specified with `setup-depends` as they should be. Testing will say if
this is a reasonable change.
---
 .../haskell-modules/generic-builder.nix         | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1cc38586458..7f3ddc48103 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -166,14 +166,8 @@ let
     "--configure-option=--host=${hostPlatform.config}"
   ] ++ crossCabalFlags);
 
-  useSeparateSetupDb = setupHaskellDepends != [] || isCross || isGhcjs;
-
   setupCompileFlags = [
-    (optionalString (!coreSetup) "-${nativePackageDbFlag}=${
-      if useSeparateSetupDb
-      then "$setupPackageConfDir"
-      else "$packageConfDir"
-    }")
+    (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
     (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES")
     # https://github.com/haskell/cabal/issues/2398
     (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
@@ -270,10 +264,8 @@ stdenv.mkDerivation ({
     echo "Build with ${ghc}."
     ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
-  '' + (optionalString useSeparateSetupDb ''
     setupPackageConfDir="$TMPDIR/setup-package.conf.d"
     mkdir -p $setupPackageConfDir
-  '') + ''
     packageConfDir="$TMPDIR/package.conf.d"
     mkdir -p $packageConfDir
 
@@ -284,14 +276,13 @@ stdenv.mkDerivation ({
   # dependencies for the build machine.
   #
   # pkgs* arrays defined in stdenv/setup.hs
-  + (optionalString useSeparateSetupDb ''
+  + ''
     for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
       ${buildPkgDb nativeGhc.name "$setupPackageConfDir"}
     done
     ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache
-  '')
-
-    # For normal components
+  ''
+  # For normal components
   + ''
     for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
       ${buildPkgDb ghc.name "$packageConfDir"}

From 1b08966db94df553d282d8f5eee2e27e0e212dd3 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 17 Jun 2018 18:49:29 +0200
Subject: [PATCH 012/117] journaldriver: init at 1.0.0

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

diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
new file mode 100644
index 00000000000..58c9ee770b7
--- /dev/null
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }:
+
+rustPlatform.buildRustPackage rec {
+  name        = "journaldriver-${version}";
+  version     = "1.0.0";
+  cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k";
+
+  src = fetchFromGitHub {
+    owner  = "aprilabank";
+    repo   = "journaldriver";
+    rev    = "v${version}";
+    sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc";
+  };
+
+  buildInputs       = [ openssl systemd ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with lib; {
+    description = "Log forwarder from journald to Stackdriver Logging";
+    homepage    = "https://github.com/aprilabank/journaldriver";
+    license     = licenses.gpl3;
+    maintainers = [ maintainers.tazjin ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a3bbc772ed..2e175c1a2a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3225,6 +3225,8 @@ with pkgs;
 
   journalbeat = callPackage ../tools/system/journalbeat { };
 
+  journaldriver = callPackage ../tools/misc/journaldriver { };
+
   jp = callPackage ../development/tools/jp { };
 
   jp2a = callPackage ../applications/misc/jp2a { };

From 59e5aabee6b36b998c7ac47778dbe6c4bf245ed9 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 17 Jun 2018 19:24:57 +0200
Subject: [PATCH 013/117] nixos/journaldriver: add module for journaldriver log
 forwarder

Adds a module for running the journaldriver log forwarding agent via
systemd.

The agent can be deployed on both GCP instances and machines hosted
elsewhere to forward all logs from journald to Stackdriver Logging.

Consult the module options and upstream documentation for more
information.

Implementation notes:

* The service unit is configured to use systemd's dynamic user feature
  which will let systemd set up the state directory and appropriate
  user configuration at unit launch time instead of hardcoding it.

* The module depends on `network-online.target` to prevent a situation
  where journaldriver is failing and restarting multiple times before
  the network is online.
---
 .../services/logging/journaldriver.nix        | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 nixos/modules/services/logging/journaldriver.nix

diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix
new file mode 100644
index 00000000000..74ac3d4c236
--- /dev/null
+++ b/nixos/modules/services/logging/journaldriver.nix
@@ -0,0 +1,112 @@
+# This module implements a systemd service for running journaldriver,
+# a log forwarding agent that sends logs from journald to Stackdriver
+# Logging.
+#
+# It can be enabled without extra configuration when running on GCP.
+# On machines hosted elsewhere, the other configuration options need
+# to be set.
+#
+# For further information please consult the documentation in the
+# upstream repository at: https://github.com/aprilabank/journaldriver/
+
+{ config, lib, pkgs, ...}:
+
+with lib; let cfg = config.services.journaldriver;
+in {
+  options.services.journaldriver = {
+    enable = mkOption {
+      type        = types.bool;
+      default     = false;
+      description = ''
+        Whether to enable journaldriver to forward journald logs to
+        Stackdriver Logging.
+      '';
+    };
+
+    logLevel = mkOption {
+      type        = types.str;
+      default     = "info";
+      description = ''
+        Log level at which journaldriver logs its own output.
+      '';
+    };
+
+    logName = mkOption {
+      type        = with types; nullOr str;
+      default     = null;
+      description = ''
+        Configures the name of the target log in Stackdriver Logging.
+        This option can be set to, for example, the hostname of a
+        machine to improve the user experience in the logging
+        overview.
+      '';
+    };
+
+    googleCloudProject = mkOption {
+      type        = with types; nullOr str;
+      default     = null;
+      description = ''
+        Configures the name of the Google Cloud project to which to
+        forward journald logs.
+
+        This option is required on non-GCP machines, but should not be
+        set on GCP instances.
+      '';
+    };
+
+    logStream = mkOption {
+      type        = with types; nullOr str;
+      default     = null;
+      description = ''
+        Configures the name of the Stackdriver Logging log stream into
+        which to write journald entries.
+
+        This option is required on non-GCP machines, but should not be
+        set on GCP instances.
+      '';
+    };
+
+    applicationCredentials = mkOption {
+      type        = with types; nullOr path;
+      default     = null;
+      description = ''
+        Path to the service account private key (in JSON-format) used
+        to forward log entries to Stackdriver Logging on non-GCP
+        instances.
+
+        This option is required on non-GCP machines, but should not be
+        set on GCP instances.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.journaldriver = {
+      description = "Stackdriver Logging journal forwarder";
+      script      = "${pkgs.journaldriver}/bin/journaldriver";
+      after       = [ "network-online.target" ];
+      wantedBy    = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Restart        = "always";
+        DynamicUser    = true;
+
+        # This directive lets systemd automatically configure
+        # permissions on /var/lib/journaldriver, the directory in
+        # which journaldriver persists its cursor state.
+        StateDirectory = "journaldriver";
+
+        # This group is required for accessing journald.
+        SupplementaryGroups = "systemd-journal";
+      };
+
+      environment = {
+        RUST_LOG                       = cfg.logLevel;
+        LOG_NAME                       = cfg.logName;
+        LOG_STREAM                     = cfg.logStream;
+        GOOGLE_CLOUD_PROJECT           = cfg.googleCloudProject;
+        GOOGLE_APPLICATION_CREDENTIALS = cfg.applicationCredentials;
+      };
+    };
+  };
+}

From 30913cc998d568684670deb3a45f6a855f0742f8 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 18 Jun 2018 15:44:23 -0400
Subject: [PATCH 014/117] ghcjs: remove phases

We can just disable each one we don't want manually.
---
 pkgs/development/compilers/ghcjs-ng/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 93257ff7d53..affed7e2d07 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -69,7 +69,8 @@ in stdenv.mkDerivation {
     ] ++ lib.optionals stdenv.isDarwin [
       gcc # https://github.com/ghcjs/ghcjs/issues/663
     ];
-    phases = ["unpackPhase" "buildPhase"];
+    dontConfigure = true;
+    dontInstall = true;
     buildPhase = ''
       export HOME=$TMP
       mkdir $HOME/.cabal

From 3ab1993b1fb977764547e42529b4d21dc3b50112 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 18 Jun 2018 11:15:50 +0200
Subject: [PATCH 015/117] deja-dup: fix nautilus extension breaking nautilus

When deja-dup is installed, Nautilus segfaults on start due to
the missing gsettings schemas.

This commit hardcodes path to the compiled schemas file to the extension.
---
 pkgs/applications/backup/deja-dup/default.nix |  5 +++
 .../backup/deja-dup/hardcode-gsettings.patch  | 38 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/backup/deja-dup/hardcode-gsettings.patch

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index ef7aa96beb0..7e3c3b2e8b3 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -19,8 +19,13 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit coreutils;
     })
+    ./hardcode-gsettings.patch
   ];
 
+  postPatch = ''
+    substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas
+  '';
+
   nativeBuildInputs = [
     meson ninja pkgconfig vala_0_40 gettext itstool
     appstream-glib desktop-file-utils libxml2 wrapGAppsHook
diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
new file mode 100644
index 00000000000..50bf2ba4fbd
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
@@ -0,0 +1,38 @@
+--- a/deja-dup/nautilus/NautilusExtension.c
++++ b/deja-dup/nautilus/NautilusExtension.c
+@@ -24,6 +24,8 @@
+ #include <glib/gi18n-lib.h>
+ 
+ GList *dirs = NULL;
++GSettingsSchemaSource *schema_source = NULL;
++GSettingsSchema *schema = NULL;
+ GSettings *settings = NULL;
+ 
+ // This will treat a < b iff a is 'lower' in the file tree than b
+@@ -313,7 +315,13 @@
+   bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+   bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ 
+-  settings = g_settings_new("org.gnome.DejaDup");
++  schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@",
++    g_settings_schema_source_get_default (), TRUE, NULL);
++
++  schema = g_settings_schema_source_lookup (schema_source,
++                                            "org.gnome.DejaDup", FALSE);
++
++  settings = g_settings_new_full (schema, NULL, NULL);
+   g_signal_connect(settings, "changed::include-list",
+                    update_include_excludes, NULL);
+   g_signal_connect(settings, "changed::exclude-list",
+@@ -329,7 +337,11 @@
+ 
+ void nautilus_module_shutdown(void)
+ {
++  g_settings_schema_source_unref(schema_source);
++  g_settings_schema_unref(schema);
+   g_object_unref(settings);
++  schema_source = NULL;
++  schema = NULL;
+   settings = NULL;
+ 
+   update_include_excludes(); /* will clear it now that settings is NULL */

From a6e737c65eee89ee809dce73923bce8ec210acd7 Mon Sep 17 00:00:00 2001
From: mulderr <kazulakm@gmail.com>
Date: Mon, 18 Jun 2018 21:50:57 +0200
Subject: [PATCH 016/117] odpic-raw: disable tests (#42135)

Test suite expects a running Oracle database server.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a9db4a8ce72..204c183ca35 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -364,6 +364,7 @@ self: super: {
   notcpp = dontCheck super.notcpp;
   ntp-control = dontCheck super.ntp-control;
   numerals = dontCheck super.numerals;
+  odpic-raw = dontCheck super.odpic-raw; # needs a running oracle database server
   opaleye = dontCheck super.opaleye;
   openpgp = dontCheck super.openpgp;
   optional = dontCheck super.optional;

From 6d5751bfa564a365add8a3d7d7d070541a9e33fc Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 27 Apr 2018 20:14:15 +0300
Subject: [PATCH 017/117] haskell: Add setup depends for Cabal

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

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

From ad5cc515bb8d320061e08e82b8b91328f2a4d3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?=
 <clacke@users.noreply.github.com>
Date: Mon, 18 Jun 2018 22:22:31 +0200
Subject: [PATCH 018/117] connect: works on darwin (#42172)

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

diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index f7a0c00fb48..3d63340adb0 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = https://bitbucket.org/gotoh/connect/wiki/Home;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }

From 29d8149fe9890668ff08649334aca8c26ca595ec Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 18 Jun 2018 22:27:07 +0200
Subject: [PATCH 019/117] pencil : fix udev dependency (#42147)

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

diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 0e52190af42..de758271004 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -2,7 +2,7 @@
   # build dependencies
   alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
   freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
-  glibc, udev
+  glibc, systemd
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ar p "$src" data.tar.xz | tar xJ
   '';
 
-  buildPhase = ":";
+  dontBuild = true;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     chmod a+x $out/opt/Pencil/libffmpeg.so
 
     # fix missing libudev
-    ln -s ${udev}/lib/systemd/libsystemd-shared.so $out/opt/Pencil/libudev.so.1
+    ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/Pencil/libudev.so.1
     wrapProgram $out/opt/Pencil/pencil \
       --prefix LD_LIBRARY_PATH : $out/opt/Pencil
   '';

From 1782b9ec09fadfef5e9c8b560fa90aa926a86f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 18 Jun 2018 22:32:56 +0200
Subject: [PATCH 020/117] vlc: Fixes build with fribidi version 1.0 (#42130)

---
 pkgs/applications/video/vlc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index c3665daad9d..d9bc2ed18b1 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc";
       sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p";
     })
+    (fetchpatch {
+      url = "https://github.com/videolan/vlc/commit/26e2d3906658c30f2f88f4b1bc9630ec43bf5525.patch";
+      sha256 = "0sm73cbzxva8sww526bh5yin1k2pdkvj826wdlmqnj7xf0f3mki4";
+    })
   ];
 
   postPatch = ''

From f8cef0d06e39728497f4109855f46b8cc6d4f7db Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 18 Jun 2018 16:38:07 -0400
Subject: [PATCH 021/117] multi-ghc-travis: db63eb7f2ea -> 05926968f17 (#42171)

Just a routine bump; adds support for GHC 8.4.3.
---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 98df266703a..697af75a434 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -18,8 +18,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "db63eb7f2eaa64b7b0e4759e98258fea2a27a424";
-    sha256 = "0ff55zafx7561s1yps7aw83ws4vcpc5cq9r6bbckaagvwwla0dcq";
+    rev = "05926968f17256cae2308756835a3a24d9de437b";
+    sha256 = "0s1g1yq6j6vl2bspc90bwbwp7532pcrmh8fhnz8j6yv9py927mmm";
   };
   patches = [ newShellCheck ];
   isLibrary = true;

From d97f7d3b890086cae07bcbd778c6bd813f16f941 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:40:49 -0700
Subject: [PATCH 022/117] raxml: 8.2.11 -> 8.2.12 (#41964)

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

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

These checks were done:

- built on NixOS
- /nix/store/w8iy7fvdwhjw7zx1dkga3v56fz59s7r8-RAxML-8.2.12/bin/raxmlHPC-PTHREADS-SSE3 passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 8.2.12 with grep in /nix/store/w8iy7fvdwhjw7zx1dkga3v56fz59s7r8-RAxML-8.2.12
- directory tree listing: https://gist.github.com/8a2b70b299e53bfee9f18d2ab8cd5f9f
- du listing: https://gist.github.com/02803409663f19671adc6be233a327fd
---
 pkgs/applications/science/biology/raxml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index 0bac6c77804..efe19a4e2b6 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "RAxML";
-  version = "8.2.11";
+  version = "8.2.12";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "stamatak";
     repo = "standard-${pname}";
     rev = "v${version}";
-    sha256 = "08fmqrr7y5a2fmmrgfz2p0hmn4mn71l5yspxfcwwsqbw6vmdfkhg";
+    sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
   };
 
   buildInputs = if mpi then [ pkgs.openmpi ] else [];

From b3052440f640ee2654bf4cbde2b0dd08d78c06d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:41:49 -0700
Subject: [PATCH 023/117] picard-tools: 2.18.5 -> 2.18.7 (#41975)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/siklhy9pl9xl9cq3nlqhln038554h72g-picard-tools-2.18.7/bin/picard had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.18.7 with grep in /nix/store/siklhy9pl9xl9cq3nlqhln038554h72g-picard-tools-2.18.7
- directory tree listing: https://gist.github.com/a49ed5f2ff312ce6180174183901e38f
- du listing: https://gist.github.com/243f4d89d2100ef27d332e3562d5f173
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 555542b7631..830f4af514a 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.5";
+  version = "2.18.7";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "1lk1qnwc2gwjh8js3rx4qayan5157an6yzxnhija6kqgrxv58f11";
+    sha256 = "00p5wmd3kb7pr3yvsqz660fsk845dwgj76bllwjfrbiscjdyhy9f";
   };
 
   buildInputs = [ jre makeWrapper ];

From a35b6dac434ad128eea4a7015b801f92ae053806 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:43:27 -0700
Subject: [PATCH 024/117] arangodb: 3.3.9 -> 3.3.10 (#42057)

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

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

These checks were done:

- built on NixOS
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/foxx-manager passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangobench passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangodump passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangoexport passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangoimp passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangorestore passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangosh passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangovpack passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arango-dfdb passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arango-init-database passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arango-secure-installation passed the binary check.
- /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10/bin/arangod passed the binary check.
- 12 of 12 passed binary check by having a zero exit code.
- 0 of 12 passed binary check by having the new version present in output.
- found 3.3.10 with grep in /nix/store/25nzmn4i7clwvvs00wg3bc1ik7x5a9hr-arangodb-3.3.10
- directory tree listing: https://gist.github.com/8818b9d47b33b5c0025db3d2cf065186
- du listing: https://gist.github.com/3b134770993a508d79b2bf086d761531
---
 pkgs/servers/nosql/arangodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 5d1723274cb..c330837cdbb 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.9";
+  version = "3.3.10";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "1zr9byxlqd7s3rnmvdgv85mmk5xxjz0va1pj2gn6y28k569prcbs";
+    sha256 = "0c0n681k2z73klb5inhfdy2qzkba681kzg01gwpc6qdnvya8mk9f";
   };
 
   buildInputs = [

From d9a1e79c7b0a472e8adaec4a545295fe132793ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:44:37 -0700
Subject: [PATCH 025/117] chirp: 20180606 -> 20180611 (#42039)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/b4iyklh8y10knkzrrw45dsz95hvs38mr-chirp-daily-20180611/bin/.chirpw-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/b4iyklh8y10knkzrrw45dsz95hvs38mr-chirp-daily-20180611/bin/chirpw had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 20180611 with grep in /nix/store/b4iyklh8y10knkzrrw45dsz95hvs38mr-chirp-daily-20180611
- directory tree listing: https://gist.github.com/c4bf3ab0db022bdfe692715110e6c3d6
- du listing: https://gist.github.com/1c1987a895d93ba39651f4037e030aad
---
 pkgs/applications/misc/chirp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 7004b247667..6dc7a5f7dd2 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20180606";
+  version = "20180611";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "1v1s02675gyghhxasp4pxjrifkgshc82p99haxph1yzkq7gsf03w";
+    sha256 = "1569gnbs4jb53n58wdkdjrxx9nrayljn5v0wqacn5zfr87s16zxf";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a81fba7595cfe4f96c2448a5eb3f6c5162ede9df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:45:22 -0700
Subject: [PATCH 026/117] forkstat: 0.02.02 -> 0.02.03 (#42016)

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

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

These checks were done:

- built on NixOS
- /nix/store/i74h7m1lbmyxjgrkdyii68a4dhi2m2fz-forkstat-0.02.03/bin/forkstat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.02.03 with grep in /nix/store/i74h7m1lbmyxjgrkdyii68a4dhi2m2fz-forkstat-0.02.03
- directory tree listing: https://gist.github.com/89b0404a0b74c11f7d41c06cf94d184a
- du listing: https://gist.github.com/e13ac9907c46410b6a17fefb8f6977f3
---
 pkgs/os-specific/linux/forkstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index bf7bc8a4546..bde2cbbafa6 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "forkstat-${version}";
-  version = "0.02.02";
+  version = "0.02.03";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";
-    sha256 = "02iqi4xjg2hl4paw88fz9jb88a9p4zprvq3g56cd7jwfx3vmw5a4";
+    sha256 = "1dl95ijs9bs9s9i629bi88qmvxjl25ym742gc063bysbp8drban1";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From b3110c46b962439c9d6c84aa8e4d7dc530e763a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:45:57 -0700
Subject: [PATCH 027/117] libraw: 0.18.11 -> 0.18.12 (#42000)

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

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

These checks were done:

- built on NixOS
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/raw-identify passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/unprocessed_raw passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/4channels passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/simple_dcraw passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/mem_image passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/dcraw_half passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/half_mt passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/multirender_test passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/postprocessing_benchmark passed the binary check.
- /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12/bin/dcraw_emu passed the binary check.
- 10 of 10 passed binary check by having a zero exit code.
- 0 of 10 passed binary check by having the new version present in output.
- found 0.18.12 with grep in /nix/store/a93d1dzw2ngcysj5sb3pj5ih6dcm8a1m-libraw-0.18.12
- directory tree listing: https://gist.github.com/20e1b0e52e1c94011da90df577fa84e2
- du listing: https://gist.github.com/adb7f31a821d3bd4157e8003f58d47ce
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index d70a9fc29f5..3ce4b3f2d3f 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.11";
+  version = "0.18.12";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "07a7k83hx7icahh6jaxfbd7pw5jjm5i11xcqjj31b28d1aj29xvw";
+    sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From 8563f5067f0e5494ee242cbbb3e2374cc17441f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:46:33 -0700
Subject: [PATCH 028/117] chromedriver: 2.39 -> 2.40 (#42042)

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

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

These checks were done:

- built on NixOS
- /nix/store/b62dsg9dibywkpx8yzfm08dbcdfh9i60-chromedriver-2.40/bin/chromedriver passed the binary check.
- Warning: no invocation of /nix/store/b62dsg9dibywkpx8yzfm08dbcdfh9i60-chromedriver-2.40/bin/.chromedriver-wrapped had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.40 with grep in /nix/store/b62dsg9dibywkpx8yzfm08dbcdfh9i60-chromedriver-2.40
- directory tree listing: https://gist.github.com/2beed7dbaa434f54d37a742a2c0e2662
- du listing: https://gist.github.com/8b1a61054a03382c346ba383ac79c163
---
 pkgs/development/tools/selenium/chromedriver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index f140c1a7450..82724924a4a 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,7 +6,7 @@ let
   allSpecs = {
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "1rkdlf9v5lciaq3yp7cp2vwmca612vngbcnz55ck76jgx6rknh3g";
+      sha256 = "07b39j1glr53yxbbkkkkx12h8r44fybqkn4fd7s2lr1ysyq5vn1a";
     };
 
     "x86_64-darwin" = {
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.39";
+  version = "2.40";
 
   src = fetchurl {
     url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From 09aa2457bd3b6633cc2c4e6c21e182322fa78d3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:47:04 -0700
Subject: [PATCH 029/117] mlterm: 3.8.4 -> 3.8.6 (#41993)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlterm had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlfc had a zero exit code or showed the expected version
- /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlcc passed the binary check.
- /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlclient passed the binary check.
- /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlclientx passed the binary check.
- Warning: no invocation of /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6/bin/mlterm-fb had a zero exit code or showed the expected version
- 3 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 3.8.6 with grep in /nix/store/y5kq18q0af30rvbhl25jpxrrf7czp5b8-mlterm-3.8.6
- directory tree listing: https://gist.github.com/917b0ce2af6e7d2a9baa6c66857143a5
- du listing: https://gist.github.com/7b0c64048e0913af1cabbed5885116b2
---
 pkgs/applications/misc/mlterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 701e4b2e052..31793031dc1 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "mlterm-${version}";
-  version = "3.8.4";
+  version = "3.8.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
-    sha256 = "07ih7953pr1jr99rayjn57ba5a0cr3niqkmvy9n59lcc1qwcrwf9";
+    sha256 = "06zylbinh84s9v79hrlvv44rd57z7kvgz9afbps3rjcbncxcmivd";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf ];

From d412c2972ce745d50a7ef67b1f00aed107dc6fc1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:47:39 -0700
Subject: [PATCH 030/117] mcelog: 158 -> 159 (#41992)

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

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

These checks were done:

- built on NixOS
- /nix/store/cb40l2kslmy5lr78j30h74d1mbpa6bxv-mcelog-159/bin/mcelog passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 159 with grep in /nix/store/cb40l2kslmy5lr78j30h74d1mbpa6bxv-mcelog-159
- directory tree listing: https://gist.github.com/453a2e6f8b596debb0596272afaf34c1
- du listing: https://gist.github.com/57e4337775456719a1e299eee738068f
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 18e90f85b44..e5ee5e20294 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "158";
+  version = "159";
 
   src = fetchFromGitHub {
     owner  = "andikleen";
     repo   = "mcelog";
     rev    = "v${version}";
-    sha256 = "0hiyj626fv4awzqgf4wnxjkr68cfcllqpibw0ncnpkvk9rn96rqp";
+    sha256 = "1w8y4igxi48r2d9s6g9fm1bgmsga94gfz6x0xaln6rhvbgi318xg";
   };
 
   postPatch = ''

From 034b1bd1f9a38348ef7554fe4315bea8816a5f9a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:48:33 -0700
Subject: [PATCH 031/117] grantlee: 0.4.0 -> 0.5.1 (#42012)

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

This update was made based on information from https://repology.org/metapackage/grantlee/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.
- found 0.5.1 with grep in /nix/store/6g40ly4agw1h9kvb3cl6yf0g3swi95fc-grantlee-0.5.1
- directory tree listing: https://gist.github.com/e74be5a3f1cab3f4f9f9a56612731410
- du listing: https://gist.github.com/6e697a1e258b3e9e42c164a437f319f2
---
 pkgs/development/libraries/grantlee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 3944d2ecab6..9dde67b5c79 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qt4, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "grantlee-0.4.0";
+  name = "grantlee-0.5.1";
 
 # Upstream download server has country code firewall, so I made a mirror.
   src = fetchurl {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
       "http://downloads.grantlee.org/${name}.tar.gz"
       "http://www.loegria.net/grantlee/${name}.tar.gz"
     ];
-    sha256 = "0gqdckxx45qmyixyz5d7ipcqq2dw26r71m2fpsrlnh4j2c9di8hk";
+    sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r";
   };
 
   buildInputs = [ cmake qt4 ];

From fd8d570cc45edea190df88c80cbeabfa363f785b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:52:41 -0700
Subject: [PATCH 032/117] cppcms: 1.0.5 -> 1.2.1 (#42024)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_config_find_param had a zero exit code or showed the expected version
- /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_make_key passed the binary check.
- Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_scale had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_tmpl_cc had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1/bin/cppcms_run had a zero exit code or showed the expected version
- 1 of 5 passed binary check by having a zero exit code.
- 0 of 5 passed binary check by having the new version present in output.
- found 1.2.1 with grep in /nix/store/9rzm8kp5fc4w1n4iygff2fl9i9l47n83-cppcms-1.2.1
- directory tree listing: https://gist.github.com/d1f2849fe9d35b02a9db07f7d396c6a7
- du listing: https://gist.github.com/f5c96329d8e59da59472edbaf149d83d
---
 pkgs/development/libraries/cppcms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index 6dc496d0e5a..a2493e55fb0 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cppcms-${version}";
-  version = "1.0.5";
+  version = "1.2.1";
 
   src = fetchurl {
       url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
-      sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4";
+      sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
   };
 
   enableParallelBuilding = true;

From f6c0588c9752bdc2bbd694f68807af332a54e21b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:53:32 -0700
Subject: [PATCH 033/117] gzdoom: 3.3.2 -> 3.4.0 (#42011)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/f4bpkw3bk3p8ca0vcxdi17hc5lm2r3jz-gzdoom-3.4.0/bin/gzdoom had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.4.0 with grep in /nix/store/f4bpkw3bk3p8ca0vcxdi17hc5lm2r3jz-gzdoom-3.4.0
- directory tree listing: https://gist.github.com/1d92d331e8c24929e998260ca9018ddb
- du listing: https://gist.github.com/ba47c37ae7b73d3fb85a14b537b6c270
---
 pkgs/games/gzdoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 3964eefb9b3..4115dccf577 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.3.2";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "0zlkja0jcqi3s4iw5h076iwqxa3haradqksjnx9jxcbkvaw75p3k";
+    sha256 = "09400w0xpw6sk593c0fr6m9qmgn6n5r1qdardizim6m0r5ki565i";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];

From 87baad7e4980683fda4603d636c65f4a3a6183cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:56:22 -0700
Subject: [PATCH 034/117] jackett: 0.8.1014 -> 0.8.1070 (#42007)

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

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

These checks were done:

- built on NixOS
- /nix/store/a9gjyqrjq6gf7l9s16pipj77p7vb3qcm-jackett-0.8.1070/bin/Jackett passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.8.1070 with grep in /nix/store/a9gjyqrjq6gf7l9s16pipj77p7vb3qcm-jackett-0.8.1070
- directory tree listing: https://gist.github.com/ee9b1ad710c8226187cbc65aa3ab9042
- du listing: https://gist.github.com/c374f814801d76ac2507c5cb6fa5d405
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 5a87c423f4f..2190ae1afa2 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.1014";
+  version = "0.8.1070";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0pvm9q8dpavkgsv180mw4y6555iixjv5s7mnmai9xzjspjpf264k";
+    sha256 = "1xdmf1nvs1y8jhivmc0sw8cip925xrj8hg66z0awcymri6qnp6s9";
   };
 
   buildInputs = [ makeWrapper ];

From 072ad3a67f6bb8c4cfcea59c55a27160a141ed8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 13:57:10 -0700
Subject: [PATCH 035/117] mate.mate-settings-daemon: 1.20.1 -> 1.20.3 (#41985)

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-settings-daemon/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.
- found 1.20.3 with grep in /nix/store/gdndnz6arz8xpvppphm7jxsyfsm7nq2y-mate-settings-daemon-1.20.3
- directory tree listing: https://gist.github.com/2cdc92987c9492e4c99b02efde4fd349
- du listing: https://gist.github.com/071f4f1371037662c45c8ef83b163383
---
 pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 490500fca69..cf63e3e69d9 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-settings-daemon-${version}";
-  version = "1.20.1";
+  version = "1.20.3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1hmc5qfr9yrvrlc1d2mmsqbhv0lhikbadaac18bxjynw9ff857iq";
+    sha256 = "018f2yg4jd6hy0z7ks0s3jyjgpyi3vhd9j61951v5lb1x8ckzxhk";
   };
 
   nativeBuildInputs = [

From c99ba895aabe6826875265e6e98c263df1977acb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 14:00:20 -0700
Subject: [PATCH 036/117] folly: 2018.05.28.00 -> 2018.06.11.00 (#42014)

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

This update was made based on information from https://repology.org/metapackage/folly/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.
- found 2018.06.11.00 with grep in /nix/store/3x7mc1n99r135i68xrax71bqcxpk6cbs-folly-2018.06.11.00
- directory tree listing: https://gist.github.com/cd02bb388dc7ae5c5b39289c8d8b3dc9
- du listing: https://gist.github.com/87c16407b769dd56c0d14d59d577da32
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 8abd42fe174..5dd96c22584 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.05.28.00";
+  version = "2018.06.11.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1n5zic8bgm4dfc7prjj3af2ipxalia6w7dk6w9pmrz1nkrpyd68c";
+    sha256 = "005p2i36vxy2nppxqhdd4a5x58yx7zljb2diyqb820jygz2hfz8a";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];

From 34b7abada4700122160b2a4edb3370e3edd925fc Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Mon, 18 Jun 2018 14:06:05 -0700
Subject: [PATCH 037/117] erlangR20: 20.3.2 -> 20.3.8 (#42170)

---
 pkgs/development/interpreters/erlang/R20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 42aaed0b659..5cea1fd533f 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchurl }:
 
 mkDerivation rec {
-  version = "20.3.2";
-  sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1";
+  version = "20.3.8";
+  sha256 = "1griiszz1x34idmwi6234br7bqd1d7mimim63amjgi9ds79jh6jj";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

From 9f26d17f4a256d1e6d5152d7c49f5056f0dbb184 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 14:33:50 -0700
Subject: [PATCH 038/117] ace: 6.4.8 -> 6.5.0 (#42038)

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

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

These checks were done:

- built on NixOS
- /nix/store/4fh87988qw0bjzks9cy73ly1np8bkkn3-ace-6.5.0/bin/ace_gperf passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 6.5.0 with grep in /nix/store/4fh87988qw0bjzks9cy73ly1np8bkkn3-ace-6.5.0
- directory tree listing: https://gist.github.com/fa80e4b2dda282f3a3dc47a359985002
- du listing: https://gist.github.com/35c8e366656494975834ec145335d2f5
---
 pkgs/development/libraries/ace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index e428b9a8c78..d1ddb17ba2f 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.4.8";
+  version = "6.5.0";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "190cyfs2najph2yycyj8abzddwa8s4wx8lx38iv237plwfl2308g";
+    sha256 = "0mzkyn7bjw3h8q22ajg765dflwxnsz6b20ql23gcbqkxfjvvdyyv";
   };
 
   enableParallelBuilding = true;

From 1e0a2eafbff199b08641bdceadf30e7f0ef73f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Justin=20Bed=C5=91?= <cu@cua0.org>
Date: Tue, 19 Jun 2018 07:50:06 +1000
Subject: [PATCH 039/117] singularity-tools: create mount points for image
 building (#41470)

---
 pkgs/build-support/singularity-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 60271e592a2..db2bef367e9 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -96,7 +96,7 @@ rec {
             echo creating
             singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
             echo importing
-            mkdir -p /var/singularity/mnt/container
+            mkdir -p /var/singularity/mnt/{container,final,overlay,session,source}
             tar -c . | singularity image.import $out
           '');
 

From b30d52905e618c6ae3e5ef0cea41777ee72be835 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Mon, 18 Jun 2018 22:03:48 +0000
Subject: [PATCH 040/117] tesseract: make tessdata a fix output derivation
 (#41227)

the full tessdata is nearly a GB, so sparing a copy each time we need to
rebuild tesseract without updating tessdata is worth it.
---
 .../graphics/tesseract/default.nix            | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index eb9a6383861..7940079d099 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,10 +1,38 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , leptonica, libpng, libtiff, icu, pango, opencl-headers
-
 # Supported list of languages or `null' for all available languages
 , enableLanguages ? null
+# if you want just a specific list of languages, optionally specify a hash
+# to make tessdata a fixed output derivation.
+, enableLanguagesHash ? (if enableLanguages == null # all languages
+                         then "1h48xfzabhn0ldbx5ib67cp9607pr0zpblsy8z6fs4knn0zznfnw"
+                         else null)
 }:
 
+let tessdata = stdenv.mkDerivation ({
+  name = "tessdata";
+  src = fetchFromGitHub {
+    owner = "tesseract-ocr";
+    repo = "tessdata";
+    rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
+    # when updating don't forget to update the default value fo enableLanguagesHash
+    sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
+  };
+  buildCommand = ''
+    cd $src;
+    for lang in ${if enableLanguages==null then "*.traineddata" else stdenv.lib.concatMapStringsSep " " (x: x+".traineddata") enableLanguages} ; do
+      install -Dt $out/share/tessdata $src/$lang ;
+    done;
+  '';
+  preferLocalBuild = true;
+  } // (stdenv.lib.optionalAttrs (enableLanguagesHash != null) {
+  # when a hash is given, we make this a fixed output derivation.
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+  outputHash = enableLanguagesHash;
+  }));
+in
+
 stdenv.mkDerivation rec {
   name = "tesseract-${version}";
   version = "3.05.00";
@@ -16,41 +44,17 @@ stdenv.mkDerivation rec {
     sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
   };
 
-  tessdata = fetchFromGitHub {
-    owner = "tesseract-ocr";
-    repo = "tessdata";
-    rev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
-    sha256 = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
-  };
+  enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
 
   LIBLEPT_HEADERSDIR = "${leptonica}/include";
 
-  # Copy the .traineddata files of the languages specified in enableLanguages
-  # into `$out/share/tessdata' and check afterwards if copying was successful.
-  postInstall = let
-    mkArg = lang: "-iname ${stdenv.lib.escapeShellArg "${lang}.traineddata"}";
-    mkFindArgs = stdenv.lib.concatMapStringsSep " -o " mkArg;
-    findLangArgs = if enableLanguages != null
-                   then "\\( ${mkFindArgs enableLanguages} \\)"
-                   else "-iname '*.traineddata'";
-  in ''
-    numLangs="$(find "$tessdata" -mindepth 1 -maxdepth 1 -type f \
-      ${findLangArgs} -exec cp -t "$out/share/tessdata" {} + -print | wc -l)"
-
-    ${if enableLanguages != null then ''
-      expected=${toString (builtins.length enableLanguages)}
-    '' else ''
-      expected="$(ls -1 "$tessdata/"*.traineddata | wc -l)"
-    ''}
-
-    if [ "$numLangs" -ne "$expected" ]; then
-      echo "Expected $expected languages, but $numLangs" \
-           "were copied to \`$out/share/tessdata'" >&2
-      exit 1
-    fi
+  postInstall = ''
+    for i in ${tessdata}/share/tessdata/*; do
+      ln -s $i $out/share/tessdata;
+    done
   '';
 
   meta = {

From 7162eb196f3dee10dab0ee576956d168ff8810d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 15:16:58 -0700
Subject: [PATCH 041/117] c-blosc: 1.11.3 -> 1.14.3 (#42036)

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

This update was made based on information from https://repology.org/metapackage/c-blosc/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.
- found 1.14.3 with grep in /nix/store/b83mqicbd21q8wm22qgp4jzm7cg90avw-c-blosc-1.14.3
- directory tree listing: https://gist.github.com/05bbb5f5c067b769556ba71848514220
- du listing: https://gist.github.com/cc182424092e94e9dd611e5300b7ac68
---
 pkgs/development/libraries/c-blosc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 2f60fb7391f..3793b70de4b 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "c-blosc-${version}";
-  version = "1.11.3";
+  version = "1.14.3";
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "c-blosc";
     rev = "v${version}";
-    sha256 = "18665lwszwbb48pxgisyxxjh92sr764hv6h7jw8zzsmzdkgzrmcw";
+    sha256 = "051x2hh0yq1zhiyjmiarvc2radi59v03vzs2sa4hmgfhfaxcklld";
   };
 
   buildInputs = [ cmake ];

From 06ab7d8e5981eb33f7c4b4197420a9ea8f72c3d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 18 Jun 2018 15:17:27 -0700
Subject: [PATCH 042/117] balsa: 2.5.5 -> 2.5.6 (#42054)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/balsa had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/balsa-ab had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/.balsa-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6/bin/.balsa-ab-wrapped had a zero exit code or showed the expected version
- 0 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 2.5.6 with grep in /nix/store/1hgx73336q1zhd8r95wv2kicf6a2jmby-balsa-2.5.6
- directory tree listing: https://gist.github.com/8c38ffd6950508c78fde54f6f3530673
- du listing: https://gist.github.com/2156c87e8b84b7a84f6d6f4c4a7b8ebb
---
 pkgs/applications/networking/mailreaders/balsa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index 762c6222b58..571a4895147 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "balsa-${version}";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchurl {
     url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2";
-    sha256 = "0p4w81wvdxqhynkninzglsgqk6920x1zif2zmw8bml410lav2azz";
+    sha256 = "17k6wcsl8gki7cskr3hhmfj6n54rha8ca3b6fzd8blsl5shsankx";
   };
 
   nativeBuildInputs = [

From 1f8f89d309eeebfe00b25c30cc9dca103f3d8b47 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 18 Jun 2018 18:41:17 -0400
Subject: [PATCH 043/117] inkscape: work around ARGMAX limit

This uses strictDeps to get our args passed to the linker low enough
to enable building inkscape. With strictDeps we need to correctly use
nativeBuildInputs to avoid an issue.
---
 pkgs/applications/graphics/inkscape/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 7eb9e7aa001..0d01a631358 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
   };
 
+  # Inkscape hits the ARGMAX when linking on macOS. It appears to be
+  # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS.
+  # Setting strictDeps it avoids duplicating some dependencies so it
+  # will leave us under ARGMAX.
+  strictDeps = true;
+
   unpackPhase = ''
     cp $src ${name}.tar.bz2
     tar xvjf ${name}.tar.bz2 > /dev/null
@@ -33,19 +39,19 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ];
   buildInputs = [
     perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
-    makeWrapper gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace cmake python2Env
+    gsl poppler imagemagick libwpg librevenge
+    libvisio libcdr libexif potrace
   ];
 
   enableParallelBuilding = true;
 
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
-    rm "$out/share/icons/hicolor/icon-theme.cache"
+    rm -f "$out/share/icons/hicolor/icon-theme.cache"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
     install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview

From 085bf3e7b97bceed15dd0f02769da2b0e2b1817f Mon Sep 17 00:00:00 2001
From: Anders Riutta <git@andersriutta.com>
Date: Mon, 18 Jun 2018 16:02:17 -0700
Subject: [PATCH 044/117] docs: minor rewording for easier reading.

---
 doc/reviewing-contributions.xml | 48 ++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index b648691183b..673ff92d2c8 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -6,18 +6,22 @@
  <title>Reviewing contributions</title>
  <warning>
   <para>
-   The following section is a draft and reviewing policy is still being
-   discussed.
+   The following section is a draft, and the policy for reviewing is still being
+   discussed in issues such as <link
+	   xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166
+   </link> and <link
+	   xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836
+   </link>.
   </para>
  </warning>
  <para>
-  The nixpkgs projects receives a fairly high number of contributions via
+  The nixpkgs project receives a fairly high number of contributions via
   GitHub pull-requests. Reviewing and approving these is an important task and
   a way to contribute to the project.
  </para>
  <para>
-  The high change rate of nixpkgs make any pull request that is open for long
-  enough subject to conflicts that will require extra work from the submitter
+  The high change rate of nixpkgs makes any pull request that remains open for
+  too long subject to conflicts that will require extra work from the submitter
   or the merger. Reviewing pull requests in a timely manner and being
   responsive to the comments is the key to avoid these. GitHub provides sort
   filters that can be used to see the
@@ -33,34 +37,34 @@
  <para>
   When reviewing a pull request, please always be nice and polite.
   Controversial changes can lead to controversial opinions, but it is important
-  to respect every community members and their work.
+  to respect every community member and their work.
  </para>
  <para>
-  GitHub provides reactions, they are a simple and quick way to provide
+  GitHub provides reactions as a simple and quick way to provide
   feedback to pull-requests or any comments. The thumb-down reaction should be
-  used with care and if possible accompanied with some explanations so the
-  submitter has directions to improve his contribution.
+  used with care and if possible accompanied with some explanation so the
+  submitter has directions to improve their contribution.
  </para>
  <para>
-  Pull-requests reviews should include a list of what has been reviewed in a
+  Pull-request reviews should include a list of what has been reviewed in a
   comment, so other reviewers and mergers can know the state of the review.
  </para>
  <para>
   All the review template samples provided in this section are generic and
   meant as examples. Their usage is optional and the reviewer is free to adapt
-  them to his liking.
+  them to their liking.
  </para>
  <section>
   <title>Package updates</title>
 
   <para>
    A package update is the most trivial and common type of pull-request. These
-   pull-requests mainly consist in updating the version part of the package
+   pull-requests mainly consist of updating the version part of the package
    name and the source hash.
   </para>
 
   <para>
-   It can happen that non trivial updates include patches or more complex
+   It can happen that non-trivial updates include patches or more complex
    changes.
   </para>
 
@@ -84,12 +88,12 @@
    </listitem>
    <listitem>
     <para>
-     Ensure that the package versioning is fitting the guidelines.
+     Ensure that the package versioning fits the guidelines.
     </para>
    </listitem>
    <listitem>
     <para>
-     Ensure that the commit text is fitting the guidelines.
+     Ensure that the commit text fits the guidelines.
     </para>
    </listitem>
    <listitem>
@@ -99,7 +103,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       mention-bot usually notify GitHub users based on the submitted changes,
+       mention-bot usually notifies GitHub users based on the submitted changes,
        but it can happen that it misses some of the package maintainers.
       </para>
      </listitem>
@@ -107,13 +111,13 @@
    </listitem>
    <listitem>
     <para>
-     Ensure that the meta field contains correct information.
+     Ensure that the meta field information is correct.
     </para>
     <itemizedlist>
      <listitem>
       <para>
-       License can change with version updates, so it should be checked to be
-       fitting upstream license.
+       License can change with version updates, so it should be checked to match
+       the upstream license.
       </para>
      </listitem>
      <listitem>
@@ -137,9 +141,9 @@
     <itemizedlist>
      <listitem>
       <para>
-       Pull-requests are often targeted to the master or staging branch so
-       building the pull-request locally as it is submitted can trigger a large
-       amount of source builds.
+       Pull-requests are often targeted to the master or staging branch, and
+       building the pull-request locally when it is submitted can trigger
+       many source builds.
       </para>
       <para>
        It is possible to rebase the changes on nixos-unstable or

From e8acdccfb16734319b07e3b8abb2daf38d240b2c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 18 Jun 2018 18:42:50 -0500
Subject: [PATCH 045/117] range-v3: 0.3.5 -> 0.3.6

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

diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index bddda1dff55..cd981f8947a 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "range-v3-${version}";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "ericniebler";
     repo = "range-v3";
     rev = version;
-    sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp";
+    sha256 = "050h9pa57kd57l73njxpjb331snybddl29x2vpy5ycygvqiw8kcp";
   };
 
   nativeBuildInputs = [ cmake ];

From 34f57ac837349e9c1080f456098af53a1244c933 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 18 Jun 2018 19:02:15 -0400
Subject: [PATCH 046/117] haskell: fix with-packages-wrapper in ghcjs

Fixes #42032
Fixes #42070
---
 pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 03f0a1dd0a3..7fda1d84e55 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -38,7 +38,7 @@ let
   ghcCommand'    = if isGhcjs then "ghcjs" else "ghc";
   ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
   ghcCommandCaps= lib.toUpper ghcCommand';
-  libDir        = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}";
+  libDir        = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else if isGhcjs then "$out/libexec" else "$out/lib/${ghcCommand}-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
   paths         = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);

From 7b6755d0031c5b779e89a5083d382c2570c29ca8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 17:26:52 -0700
Subject: [PATCH 047/117] xonsh: 0.6.6 -> 0.6.7

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/xon.sh had a zero exit code or showed the expected version
- /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/.xonsh-wrapped passed the binary check.
- /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7/bin/xonsh passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 2 of 3 passed binary check by having the new version present in output.
- found 0.6.7 with grep in /nix/store/mb1vva59dwhq6yzqf98gkygljbzpdf37-xonsh-0.6.7
- directory tree listing: https://gist.github.com/1d8694bad62c300714d6658deedc7ec0
- du listing: https://gist.github.com/2d8baff97fce82b5ba4ded4746d954a0
---
 pkgs/shells/xonsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 0e4d23ffd5c..20f39f40a24 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "09w7656qhqv3al52cl5lgzawvkbkpwjfnxyg0vyx0gbjs1hwiqjj";
+    sha256= "0vxdfq1wpajfypdl5lhvib50mk742dk8y375zf3h057hjb0khhgw";
   };
 
   LC_ALL = "en_US.UTF-8";

From 95358db95645863ae758da5c74db4671d97fcf1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 19 Jun 2018 02:48:42 +0200
Subject: [PATCH 048/117] chromium: Abort build on gn warnings. Fixes #42189.

Also fix such obsolete flags:

* `use_gconf` was already known to become obsolete with Chromium 65
* `enable_hotwording` has been removed in upstream commit d693f0c7ab
---
 .../applications/networking/browsers/chromium/common.nix | 9 ++++-----
 .../networking/browsers/chromium/default.nix             | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7803a530a92..dbfd4753416 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -22,7 +22,6 @@
 
 # package customization
 , enableNaCl ? false
-, enableHotwording ? false
 , enableWideVine ? false
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false, libgnome-keyring3 ? null
@@ -215,11 +214,8 @@ let
       proprietary_codecs = false;
       use_sysroot = false;
       use_gnome_keyring = gnomeKeyringSupport;
-      ## FIXME remove use_gconf after chromium 65 has become stable
-      use_gconf = gnomeSupport;
       use_gio = gnomeSupport;
       enable_nacl = enableNaCl;
-      enable_hotwording = enableHotwording;
       enable_widevine = enableWideVine;
       use_cups = cupsSupport;
 
@@ -259,7 +255,10 @@ let
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gn_files.py \
         --system-libraries ${toString gnSystemLibraries}
-      gn gen --args=${escapeShellArg gnFlags} out/Release
+      gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
+
+      # Fail if `gn gen` contains a WARNING.
+      grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1
 
       runHook postConfigure
     '';
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1458a181656..d2bb0425170 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -4,7 +4,6 @@
 # package customization
 , channel ? "stable"
 , enableNaCl ? false
-, enableHotwording ? false
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false
 , proprietaryCodecs ? true
@@ -22,7 +21,7 @@ let
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
     mkChromiumDerivation = callPackage ./common.nix {
-      inherit enableNaCl enableHotwording gnomeSupport gnome
+      inherit enableNaCl gnomeSupport gnome
               gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
               enableWideVine;
     };

From e7d3dee45b0068844c3dec351bfa5e30d9bae69b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 18:17:57 -0700
Subject: [PATCH 049/117] zerotierone: 1.2.8 -> 1.2.10

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-idtool had a zero exit code or showed the expected version
- /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-cli passed the binary check.
- /nix/store/vd1y0dqqxk8dm0g7daw4anxfip7l97cm-zerotierone-1.2.10/bin/zerotier-one passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 2 of 3 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/87164b4a118f54881debe8986fa9d125
- du listing: https://gist.github.com/d1842159ba2f6272856b4451d5860bf7
---
 pkgs/tools/networking/zerotierone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 43aa44809ed..bc8b1a5e0cd 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.8";
+  version = "1.2.10";
   name = "zerotierone-${version}";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8";
+    sha256 = "0mqckh51xj79z468n2683liczqracip36jvhfyd0fr3pwrbyqy8w";
   };
 
   preConfigure = ''

From 59eca689ccc58861fb0937bcafcf6299d7cd4acb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 18 Jun 2018 20:34:59 -0500
Subject: [PATCH 050/117] dmraid: fix w/musl (missing includes, -D_GNU_SOURCE)

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

diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index d39cadf4199..73ae6801bc2 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, devicemapper }:
+{ stdenv, fetchurl, fetchpatch, devicemapper }:
 
 stdenv.mkDerivation rec {
   name = "dmraid-1.0.0.rc16";
@@ -8,10 +8,20 @@ stdenv.mkDerivation rec {
     sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq";
   };
 
-  patches = [ ./hardening-format.patch ];
+  patches = [ ./hardening-format.patch ]
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch";
+        sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w";
+        stripLen = 2;
+        extraPrefix = "1.0.0.rc16/";
+      })
+    ];
 
   postPatch = ''
     sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE"
   '';
 
   preConfigure = "cd */";

From d316ca55a8f8af0e3c55d76d1ab9f62ac9885c10 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 21:08:50 -0700
Subject: [PATCH 051/117] vips: 8.6.3 -> 8.6.4

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

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

These checks were done:

- built on NixOS
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips passed the binary check.
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsedit passed the binary check.
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsthumbnail passed the binary check.
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsheader passed the binary check.
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/light_correct had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/shrink_width had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_image_convert had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_rubber_sheet had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/batch_crop had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vipsprofile had a zero exit code or showed the expected version
- /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4/bin/vips-8.6 passed the binary check.
- 5 of 11 passed binary check by having a zero exit code.
- 0 of 11 passed binary check by having the new version present in output.
- found 8.6.4 with grep in /nix/store/cffal7h8l17axil62hrsmx2lhja9fpmm-vips-8.6.4
- directory tree listing: https://gist.github.com/3d47ce9f75e2a1d701b3089ffa679618
- du listing: https://gist.github.com/b6aa67c89ec9bb55f45e21ae98e82fdc
---
 pkgs/tools/graphics/vips/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index d1dfe7afbf8..da63cb58a55 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vips-${version}";
-  version = "8.6.3";
+  version = "8.6.4";
 
   src = fetchurl {
     url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "14h9w61gaimldmqaym0zhf9fkxjj1pkd5lhglhs6pxphynwxnnpq";
+    sha256 = "1x4ai997yfl4155r4k3m5fa5hj3030c4abi5g49kfarbr60a0ca6";
   };
 
   buildInputs =

From 08691d0515a44097fcaf27f59d002805afd0e105 Mon Sep 17 00:00:00 2001
From: Emily Ann Ediger <dje4321@gmail.com>
Date: Mon, 18 Jun 2018 23:54:45 -0500
Subject: [PATCH 052/117] Grub: default is signed int. Fixes #42152

---
 nixos/modules/system/boot/loader/grub/grub.nix        | 2 +-
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 2e497ff9f2c..ee07d8657ef 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -386,7 +386,7 @@ in
 
       default = mkOption {
         default = 0;
-        type = types.int;
+        type = types.str;
         description = ''
           Index of the default menu item to be booted.
         '';
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 872261d0edf..d1ff6e6bf52 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -54,7 +54,7 @@ my $splashImage = get("splashImage");
 my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
-my $defaultEntry = int(get("default"));
+my $defaultEntry = get("default");
 my $fsIdentifier = get("fsIdentifier");
 my $grubEfi = get("grubEfi");
 my $grubTargetEfi = get("grubTargetEfi");

From 21a7a98fa603ffa3ff203f99b182d8b80403b8a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 22:26:15 -0700
Subject: [PATCH 053/117] spectrojack: 0.4 -> 0.4.1

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

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

These checks were done:

- built on NixOS
- /nix/store/vc60bssjlz3xpkd8mv3pvq6ymnida0d3-spectrojack-0.4.1/bin/spectrojack passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.4.1 with grep in /nix/store/vc60bssjlz3xpkd8mv3pvq6ymnida0d3-spectrojack-0.4.1
- directory tree listing: https://gist.github.com/edadad9b5269d1184d20fd2bc9796eb7
- du listing: https://gist.github.com/481859872810a39dd7668a81c4162d6e
---
 pkgs/applications/audio/spectrojack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
index 86eefc39556..6614e370224 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "spectrojack-${version}";
-  version = "0.4";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
-    sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx";
+    sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libjack2 fftwFloat gtk2 ];

From a597c0de06985ae25216535d085391ed85855a08 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 22:44:18 -0700
Subject: [PATCH 054/117] uptimed: 0.4.0 -> 0.4.1

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

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

These checks were done:

- built on NixOS
- /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1/bin/uprecords passed the binary check.
- /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1/bin/uptimed passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.4.1 with grep in /nix/store/3g4ks4j5qpbmaz77h94cq00rb09bw4nx-uptimed-0.4.1
- directory tree listing: https://gist.github.com/e0050389ab1f978da6cea6fdba7a6c1b
- du listing: https://gist.github.com/8ad3f0b88db5b50f78bfff19c91cee6b
---
 pkgs/tools/system/uptimed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 58e194d38b9..849baa7159a 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "uptimed-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
-    sha256 = "0h3192angfiv01bjk3f3nd2fmjic37cl72pvmr556n0wy3cfybas";
+    sha256 = "0hqs7n3agayckwdgwadzw5shpdh4h1inqgvp4zr5fi324pj5x80j";
     rev = "v${version}";
     repo = "uptimed";
     owner = "rpodgorny";

From 2db31b6b660191c85eb9eda1841815879cbe9151 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 23:13:12 -0700
Subject: [PATCH 055/117] redis: 4.0.9 -> 4.0.10

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

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

These checks were done:

- built on NixOS
- /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-sentinel passed the binary check.
- /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-server passed the binary check.
- /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-benchmark passed the binary check.
- /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-cli passed the binary check.
- Warning: no invocation of /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-check-rdb had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10/bin/redis-check-aof had a zero exit code or showed the expected version
- 4 of 6 passed binary check by having a zero exit code.
- 1 of 6 passed binary check by having the new version present in output.
- found 4.0.10 with grep in /nix/store/q6zp97d0xgxf7xa4gswy0jgqdnkrrxi4-redis-4.0.10
- directory tree listing: https://gist.github.com/a3e7b3964e29e1b8f0cfe9feca21635a
- du listing: https://gist.github.com/be5306dea5e04998bf4b962ab9c0de8d
---
 pkgs/servers/nosql/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 07489b62728..4980a6fb2bf 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.9";
+  version = "4.0.10";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "0465bv6yxnwmas3wzg07vmrprv2pxhnr56hn5pxrybwf66y76kyz";
+    sha256 = "194cydhv3hf4v95ifvjvsqrs4jn3ffrkg5lvxj5d3y04lwsp9dhx";
   };
 
   buildInputs = [ lua ];

From eb196922ced75b20db933e52ef8deb36003e92e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 23:30:22 -0700
Subject: [PATCH 056/117] riot-web: 0.15.4 -> 0.15.5

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

This update was made based on information from https://repology.org/metapackage/riot-web/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.
- found 0.15.5 with grep in /nix/store/p5phic74phlnz8zyrfdvkq6qyacbjfdh-riot-web-0.15.5
- directory tree listing: https://gist.github.com/2dfaa31736d9687934c557f92066d007
- du listing: https://gist.github.com/f769d44c305628e76a52b8d63351b060
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 822080df10b..9111fa59c29 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.15.4";
+  version = "0.15.5";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1c0b9717xmzvzzxj006hqxafvcpvnnrsifxjnbxxla58jmnwr9v5";
+    sha256 = "04sij99njkiiwc1q23gwa8z6h4z0riw6yb9z3ds7v2qiyi4sshdz";
   };
 
   installPhase = ''

From 49eae144e6735cdeb23aa227bcfb2e7af59cfeb0 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 19 Jun 2018 01:51:56 -0500
Subject: [PATCH 057/117] snes9x-gtk: Install normally

---
 pkgs/misc/emulators/snes9x-gtk/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index e7627130629..09e3fb91324 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, SDL2, zlib
-, gtk3, libxml2, libXv, epoxy, minizip, portaudio }:
+{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig
+, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }:
 
 stdenv.mkDerivation rec {
   name = "snes9x-gtk-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ];
   buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ];
 
   preAutoreconf = ''
@@ -21,11 +21,9 @@ stdenv.mkDerivation rec {
     intltoolize
   '';
 
-  installPhase = "install -Dt $out/bin snes9x-gtk";
-
   meta = with stdenv.lib; {
     homepage = "http://www.snes9x.com";
-    description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator";
+    description = "Super Nintendo Entertainment System (SNES) emulator";
 
     longDescription = ''
       Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)

From ae04fb01f8867c112fdbb7334de546875c31e117 Mon Sep 17 00:00:00 2001
From: Emily Ann Ediger <dje4321@gmail.com>
Date: Tue, 19 Jun 2018 01:59:21 -0500
Subject: [PATCH 058/117] set default to type.str

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

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index ee07d8657ef..f1da2f41b5c 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -385,7 +385,7 @@ in
       };
 
       default = mkOption {
-        default = 0;
+        default = "0";
         type = types.str;
         description = ''
           Index of the default menu item to be booted.

From 933f53eabb0f8b6f78b5b4ac6ae42e23c56335dd Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 19 Jun 2018 02:12:41 -0500
Subject: [PATCH 059/117] mgba: Add desktop file

---
 pkgs/misc/emulators/mgba/default.nix | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 755e2a2d72b..7fb804d31e4 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -1,7 +1,19 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake, libzip, epoxy, ffmpeg
-, imagemagick, SDL2, qtbase, qtmultimedia, qttools, libedit, minizip }:
+{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig
+, cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit
+, qttools, minizip }:
 
-stdenv.mkDerivation rec {
+let
+  desktopItem = makeDesktopItem {
+    name = "mgba";
+    exec = "mgba-qt";
+    icon = "mgba";
+    comment = "A Game Boy Advance Emulator";
+    desktopName = "mgba";
+    genericName = "Game Boy Advance Emulator";
+    categories = "Game;Emulator;";
+    startupNotify = "false";
+  };
+in stdenv.mkDerivation rec {
   name = "mgba-${version}";
   version = "0.6.3";
 
@@ -13,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ makeWrapper pkgconfig cmake ];
 
   buildInputs = [
     libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip
@@ -25,6 +37,12 @@ stdenv.mkDerivation rec {
       sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh";
   })];
 
+  postInstall = ''
+    cp -r ${desktopItem}/share/applications $out/share
+    wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \
+      ${qtbase.bin}/${qtbase.qtPluginPrefix}
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://mgba.io;
     description = "A modern GBA emulator with a focus on accuracy";

From c89b6f47a739f02f08a9441bd3628463fde3f4e2 Mon Sep 17 00:00:00 2001
From: rys ostrovid <nek0@chelnok.de>
Date: Tue, 19 Jun 2018 10:09:20 +0200
Subject: [PATCH 060/117] vym: 2.2.4 -> 2.6.11 (#42186)

---
 pkgs/applications/misc/vym/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index e06242f7a02..48818ca3b8b 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, qt4, qmake4Hook }:
+{ stdenv, fetchurl, pkgconfig, qmake, qtsvg }:
 
 stdenv.mkDerivation rec {
   name = "vym-${version}";
-  version = "2.2.4";
+  version = "2.6.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2";
-    sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs";
+    url = "mirror://sourceforge/project/vym/2.6.0/${name}.tar.bz2";
+    sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl";
   };
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ qt4 qmake4Hook ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ qtsvg ];
 
   meta = with stdenv.lib; {
     description = "A mind-mapping software";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe4b9f7464..fd778deea95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18590,7 +18590,7 @@ with pkgs;
 
   vwm = callPackage ../applications/window-managers/vwm { };
 
-  vym = callPackage ../applications/misc/vym { };
+  vym = qt5.callPackage ../applications/misc/vym { };
 
   w3m = callPackage ../applications/networking/browsers/w3m {
     graphicsSupport = !stdenv.isDarwin;

From ac0136509ce775b5d14bd2de0cf010f6c1bdc47e Mon Sep 17 00:00:00 2001
From: Emily Ann Ediger <dje4321@gmail.com>
Date: Tue, 19 Jun 2018 04:05:50 -0500
Subject: [PATCH 061/117] added suggestion to support both str and int

---
 nixos/modules/system/boot/loader/grub/grub.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index f1da2f41b5c..42da6585722 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -386,7 +386,8 @@ in
 
       default = mkOption {
         default = "0";
-        type = types.str;
+        type = types.either types.int types.str;
+        apply = toString;
         description = ''
           Index of the default menu item to be booted.
         '';

From fd2043588d0fa4fcf4c7b74315b004add16d0e1e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 19 Jun 2018 04:08:09 -0500
Subject: [PATCH 062/117] tectonic: 0.1.7 -> 0.1.8

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

diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index f3f0a60b480..8ce2a6b0aa3 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tectonic-${version}";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "tectonic-typesetting";
     repo = "tectonic";
     rev = "v${version}";
-    sha256 = "007l0l9xnyayiqiap22zlsp8l9afdw803064cj8inr3q7ckzfcpb";
+    sha256 = "1bm3s2zkyy44xrc804c65hrbc6ixzcr95na671b0dannjrikrx1x";
   };
 
-  cargoSha256 = "0kjy9zrjlrlkr2il62nz35hm1nndyym9dbnas43hzz7y8hdf859k";
+  cargoSha256 = "1pyaw72h85ydq794mpgfjfq7dcq3a1dg4infh770swfaycyll6h6";
 
   nativeBuildInputs = [ pkgconfig ];
 

From d2f623d35e19a976d67907bbf6acf817ff68a521 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 19 Jun 2018 11:28:13 +0200
Subject: [PATCH 063/117] avidemux: 2.7.0 -> 2.7.1

The current version of `avidemux` (v2.7.0) breaks on master (see
https://hydra.nixos.org/build/75993794), the 18.03 build remains fine
(https://hydra.nixos.org/build/75935027).

The following changes have been applied:

* `glibc` compat patch is obsolete as it landed in upstream.

* Fixed QT_PLUGIN_PATH for QT binaries to avoid errors because of
  missing plugins like this:

  ```
  qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
  This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

  [1]    20081 abort      /nix/store/rjwxc6ih15zwvvy71ss8bvnh56ibfbmj-avidemux-2.7.1/bin/avidemux3_qt5
  ```
---
 pkgs/applications/video/avidemux/default.nix | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 991842ba0dc..b36147009a6 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir
+{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir
 , zlib, gettext, libvdpau, libva, libXv, sqlite
 , yasm, freetype, fontconfig, fribidi
 , makeWrapper, libXext, libGLU, qttools, qtbase
@@ -25,21 +25,16 @@ assert !withQT -> default != "qt5";
 
 stdenv.mkDerivation rec {
   name = "avidemux-${version}";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
-    sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy";
+    sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w";
   };
 
   patches = [
     ./dynamic_install_dir.patch
     ./bootstrap_logging.patch
-    # glibc 2.27 compat
-    (fetchpatch {
-      url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch;
-      sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6";
-    })
   ];
 
   nativeBuildInputs = [ yasm cmake pkgconfig ];
@@ -58,7 +53,10 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withQT [ qttools qtbase ]
     ++ lib.optional withVPX libvpx;
 
-  buildCommand = ''
+  buildCommand = let
+    qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}";
+    wrapProgram = f: "wrapProgram ${f} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
+  in ''
     unpackPhase
     cd "$sourceRoot"
     patchPhase
@@ -73,11 +71,13 @@ stdenv.mkDerivation rec {
     mkdir $out
     cp -R install/usr/* $out
 
-    for i in $out/bin/*; do
-      wrapProgram $i \
-        --set ADM_ROOT_DIR $out \
-        --prefix LD_LIBRARY_PATH ":" "${libXext}/lib"
-    done
+    ${wrapProgram "$out/bin/avidemux3_cli"}
+
+    ${stdenv.lib.optionalString withQT ''
+      ${wrapProgram "$out/bin/avidemux3_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+      ${wrapProgram "$out/bin/avidemux3_jobs_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
+    ''}
+
     ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux"
 
     fixupPhase

From 3d29c1ae6844c3dcf9a00c1673a530adc49a8dd7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 03:27:58 -0700
Subject: [PATCH 064/117] pkcs11helper: 1.23 -> 1.24

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

This update was made based on information from https://repology.org/metapackage/pkcs11-helper/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.
- found 1.24 with grep in /nix/store/vi1vlsjsmz56rdrk2zyga4jbvh5cqfcd-pkcs11-helper-1.24
- directory tree listing: https://gist.github.com/fa82ab8b06f566b9c980c0d49e7a4800
- du listing: https://gist.github.com/d8cd7f6fba6e45564b5a6cb4c6048428
---
 pkgs/development/libraries/pkcs11helper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 0c5d5e22e69..3e69bbde75a 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pkcs11-helper-${version}";
-  version = "1.23";
+  version = "1.24";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "pkcs11-helper";
     rev = "${name}";
-    sha256 = "1m3fp3v6c903cs36bvvg0h65p1sdamsmzy13ww0zyvplcycarz0n";
+    sha256 = "07ij6i76abf6bdhczsq1wkln3q0y0wkfbsi882vj3gl2wvxh0d1i";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From efd91a0a5851e8361b01dd28f2a4b9e23790f35f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 03:53:25 -0700
Subject: [PATCH 065/117] offlineimap: 7.2.0 -> 7.2.1

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

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

These checks were done:

- built on NixOS
- /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1/bin/.offlineimap-wrapped passed the binary check.
- /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1/bin/offlineimap 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 7.2.1 with grep in /nix/store/i64ljqy7csw76jqan3d4r1ayqmdbpgiq-offlineimap-7.2.1
- directory tree listing: https://gist.github.com/db353c3cafac9aac9a95c6c5e39c8d32
- du listing: https://gist.github.com/87553df2ee20c8d6f60e17381d46f676
---
 pkgs/tools/networking/offlineimap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index c1d00dba2b4..c7d15318698 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -2,7 +2,7 @@
   asciidoc, libxml2, libxslt, docbook_xml_xslt }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.2.0";
+  version = "7.2.1";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb";
+    sha256 = "1m5i74baazwazqp98ssma968rnwzfl1nywb7icf0swc8447ps97q";
   };
 
   postPatch = ''

From 8dcb7c713dfd57e4f5f05c3ac031002b3394c7e1 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 19 Jun 2018 21:41:26 +0900
Subject: [PATCH 066/117] lf: available on the other UNIX-like platforms

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

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 11759cc6d40..3089d6cace9 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -38,7 +38,7 @@ buildGoPackage rec {
     '';
     homepage = https://godoc.org/github.com/gokcehan/lf;
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];
   };
 }

From a5cd4b26851734a6d49b097d8d4da69b9b51d4a0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 19 Jun 2018 15:02:23 +0200
Subject: [PATCH 067/117] =?UTF-8?q?deepin.deepin-terminal:=202.9.2=20?=
 =?UTF-8?q?=E2=86=92=203.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/deepin/deepin-terminal/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 8e64fa69805..a72bae4384a 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,32 +1,31 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "deepin-terminal-${version}";
-  version = "2.9.2";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-terminal";
     rev = version;
-    sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2";
+    sha256 = "11f2yc0fj05lwhgvdrbrs8xsdm7qgp6wb5wd1f9iyc5nxn7ccl1r";
   };
 
   patches = [
     # Do not build vendored zssh and vte
     (fetchurl {
       name = "remove-vendor.patch";
-      url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c;
-      sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6";
+      url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e;
+      sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv";
     })
   ];
 
   postPatch = ''
-    substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
     substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh"
   '';
 
   nativeBuildInputs = [
-    pkgconfig vala cmake gettext
+    pkgconfig vala cmake ninja gettext
     # For setup hook
     gobjectIntrospection
   ];

From c3e0592f20e4cb76d93decc0b254e42dfd4450b4 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 19 Jun 2018 19:34:18 +0900
Subject: [PATCH 068/117] esh: init at 0.1.1

---
 pkgs/tools/text/esh/default.nix | 40 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/text/esh/default.nix

diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix
new file mode 100644
index 00000000000..2ca515358a6
--- /dev/null
+++ b/pkgs/tools/text/esh/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused }:
+
+stdenv.mkDerivation rec {
+  name = "esh-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "jirutka";
+    repo = "esh";
+    rev = "v${version}";
+    sha256 = "1ddaji5nplf1dyvgkrhqjy8m5djaycqcfhjv30yprj1avjymlj6w";
+  };
+
+  nativeBuildInputs = [ asciidoctor ];
+
+  buildInputs = [ gawk gnused ];
+
+  makeFlags = [ "prefix=$(out)" "DESTDIR=" ];
+
+  postPatch = ''
+    patchShebangs .
+    substituteInPlace esh \
+        --replace '"/bin/sh"' '"${stdenv.shell}"' \
+        --replace '"awk"' '"${gawk}/bin/awk"' \
+        --replace 'sed' '${gnused}/bin/sed'
+    substituteInPlace tests/test-dump.exp \
+        --replace '#!/bin/sh' '#!${stdenv.shell}'
+  '';
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "Simple templating engine based on shell";
+    homepage = https://github.com/jirutka/esh;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mnacamura ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd778deea95..bef16a50667 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -645,6 +645,8 @@ with pkgs;
 
   enpass = callPackage ../tools/security/enpass { };
 
+  esh = callPackage ../tools/text/esh { };
+
   ezstream = callPackage ../tools/audio/ezstream { };
 
   genymotion = callPackage ../development/mobile/genymotion { };

From f6af93f44e06ea45d78c560012beb57653427580 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 19 Jun 2018 15:24:51 +0200
Subject: [PATCH 069/117] grafana: 5.1.3 -> 5.1.4

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 646401ce02f..5e3d118b2f3 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.1.3";
+  version = "5.1.4";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g";
+    sha256 = "09bpijjm7cm4p5ci04ihq55fy5zwpdcld791vdpk6m91ixpab2zc";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46";
+    sha256 = "0ygfq4my3bdqs942l31w0695a6rwyrwq7jr23g0vgaqadamgbgkg";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From f077cde5a208bf7c85ac8043187197a0e4d62a52 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 19 Jun 2018 09:57:39 -0400
Subject: [PATCH 070/117] wakatime: 10.1.0 -> 10.2.1

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

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 9899e38c854..6d71a407239 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -3,13 +3,13 @@
 with python3Packages;
 buildPythonApplication rec {
   name = "wakatime-${version}";
-  version = "10.1.0";
+  version = "10.2.1";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime";
     rev = version;
-    sha256 = "0mq1b5hwm03jz1mhlfiwi8k5r6556r1nfv9h7qs3y32zrj9mvifv";
+    sha256 = "14b87x6pd80qdf2dxj9dd53k3a61i793cnrm4nqycn3d7vq2akqx";
   };
 
   # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt

From d21653f465f5a9d9123ac4126fd0560cf74ab0cd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 19 Jun 2018 15:40:37 +0200
Subject: [PATCH 071/117] haskell generic-buider: nativeGhc should be a
 depsBuildBuild

It targets the build platform.
---
 pkgs/development/haskell-modules/generic-builder.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7f3ddc48103..52df573d222 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -179,7 +179,8 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+  depsBuildBuild = [ nativeGhc ];
+  nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
                       setupHaskellDepends ++
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
@@ -242,7 +243,7 @@ stdenv.mkDerivation ({
 
   inherit src;
 
-  inherit nativeBuildInputs;
+  inherit depsBuildBuild nativeBuildInputs;
   buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs;
   propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs;
 

From 37eca93aab86a132d5c29f2d4cbe37f6493f03b7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 19 Jun 2018 10:52:10 -0400
Subject: [PATCH 072/117] haskell generic-builder: Only pass --extra-* for host
 deps

---
 .../haskell-modules/generic-builder.nix       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 52df573d222..52128d3fc5d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -211,18 +211,6 @@ let
       cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/
       continue
     fi
-    if [ -d "$p/include" ]; then
-      configureFlags+=" --extra-include-dirs=$p/include"
-    fi
-    if [ -d "$p/lib" ]; then
-      configureFlags+=" --extra-lib-dirs=$p/lib"
-    fi
-  ''
-  # It is not clear why --extra-framework-dirs does work fine on Linux
-  + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") ''
-    if [[ -d "$p/Library/Frameworks" ]]; then
-      configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
-    fi
   '';
 
 in
@@ -287,6 +275,19 @@ stdenv.mkDerivation ({
   + ''
     for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
       ${buildPkgDb ghc.name "$packageConfDir"}
+      if [ -d "$p/include" ]; then
+        configureFlags+=" --extra-include-dirs=$p/include"
+      fi
+      if [ -d "$p/lib" ]; then
+        configureFlags+=" --extra-lib-dirs=$p/lib"
+      fi
+    ''
+    # It is not clear why --extra-framework-dirs does work fine on Linux
+    + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") ''
+      if [[ -d "$p/Library/Frameworks" ]]; then
+        configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+      fi
+  '' + ''
     done
   ''
   # only use the links hack if we're actually building dylibs. otherwise, the

From 07e8402ed40206a45d058a227d346a757949c5ee Mon Sep 17 00:00:00 2001
From: qolii <36613499+qolii@users.noreply.github.com>
Date: Tue, 19 Jun 2018 15:07:53 +0000
Subject: [PATCH 073/117] linux-hardkernel: Init at 4.14.47-139 (#41782)

---
 .../linux/kernel/linux-hardkernel-4.14.nix    | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 ++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
new file mode 100644
index 00000000000..6855c5c5f90
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
+
+buildLinux (args // rec {
+  version = "4.14.47-139";
+
+  # modDirVersion needs to be x.y.z.
+  modDirVersion = "4.14.47";
+
+  # branchVersion needs to be x.y. 
+  extraMeta.branch = "4.14";
+
+  src = fetchFromGitHub {
+    owner = "hardkernel";
+    repo = "linux";
+    rev = version;
+    sha256 = "0jjgrmvi1h8zs8snnvghnjd422yfmn7jv9y1n7xikmfv4nvwqrkv";
+  };
+
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd778deea95..6dcb6c54e85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13653,6 +13653,13 @@ with pkgs;
       ];
   };
 
+  linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {
+    kernelPatches = [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.modinst_arg_list_too_long
+    ];
+  };
+
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -13876,6 +13883,11 @@ with pkgs;
   linuxPackages_samus_latest = linuxPackages_samus_4_12;
   linux_samus_latest = linuxPackages_samus_latest.kernel;
 
+  # Hardkernel (Odroid) kernels.
+  linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14);
+  linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14;
+  linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel;
+
   # A function to build a manually-configured kernel
   linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
 

From b75e083c69b9f403706bb4388811abf798d77332 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 21:16:28 -0700
Subject: [PATCH 074/117] verilator: 3.922 -> 3.924

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

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

These checks were done:

- built on NixOS
- /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_bin passed the binary check.
- /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_bin_dbg passed the binary check.
- /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_coverage_bin_dbg passed the binary check.
- /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator passed the binary check.
- /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_coverage passed the binary check.
- Warning: no invocation of /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924/bin/verilator_profcfunc had a zero exit code or showed the expected version
- 5 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 3.924 with grep in /nix/store/gnmapahqvab762fi885bwhlfhxvpfs81-verilator-3.924
- directory tree listing: https://gist.github.com/eebd214973454154b716fc6a9556b922
- du listing: https://gist.github.com/cb78abec038b5abdae8004ea1edcefc0
---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 75e99dcf659..205d56f3fc8 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "3.922";
+  version = "3.924";
 
   src = fetchurl {
     url    = "http://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg";
+    sha256 = "0xarifraycmdzjxs0lscpwvrwr59z84p8g8dkyjssc463dqikjvx";
   };
 
   enableParallelBuilding = true;

From c2867828bbc5a49b43f24e5732e622dfe3cf5de2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 08:39:26 -0700
Subject: [PATCH 075/117] libressl: 2.7.3 -> 2.7.4

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/2sj5bh1lwzls0vc31v2fhxaw648n0i9v-libressl-2.7.4-bin/bin/ocspcheck had a zero exit code or showed the expected version
- /nix/store/2sj5bh1lwzls0vc31v2fhxaw648n0i9v-libressl-2.7.4-bin/bin/openssl passed the binary check.
- 1 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 2.7.4 with grep in /nix/store/2sj5bh1lwzls0vc31v2fhxaw648n0i9v-libressl-2.7.4-bin
- directory tree listing: https://gist.github.com/e28b9d47b987d9408427c7ec06e3b9fb
- du listing: https://gist.github.com/0d61c26c272780f10c5ce5359fb79bc7
---
 pkgs/development/libraries/libressl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 5dfb61f172f..6fccc918c3c 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -45,7 +45,7 @@ in {
   };
 
   libressl_2_7 = generic {
-    version = "2.7.3";
-    sha256 = "1597kj9jy3jyw52ys19sd4blg2gkam5q0rqdxbnrnvnyw67hviqn";
+    version = "2.7.4";
+    sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy";
   };
 }

From 96a2217e922e61ed83b45a5a2eaeb58e70f644fc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 19 Jun 2018 18:05:17 +0200
Subject: [PATCH 076/117] libressl_2_5: remove, unmaintained

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 6fccc918c3c..d7a9b7af64b 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -34,11 +34,6 @@ let
 
 in {
 
-  libressl_2_5 = generic {
-    version = "2.5.5";
-    sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5";
-  };
-
   libressl_2_6 = generic {
     version = "2.6.4";
     sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";

From 26501a9bf9555c405b2d54c50b625bc78ed2cda0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 19 Jun 2018 18:06:59 +0200
Subject: [PATCH 077/117] libressl_2_6: 2.6.4 -> 2.6.5

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index d7a9b7af64b..a29257af4c3 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -35,8 +35,8 @@ let
 in {
 
   libressl_2_6 = generic {
-    version = "2.6.4";
-    sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";
+    version = "2.6.5";
+    sha256 = "0anx9nlgixdjn811zclim85jm5yxmxwycj71ix27rlhr233xz7l5";
   };
 
   libressl_2_7 = generic {

From 8eaff5b06ad149642c4f50aea3b924d03579d401 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 19 Jun 2018 12:12:44 +0200
Subject: [PATCH 078/117] xmr-stak service: support multiple config files

---
 nixos/modules/services/misc/xmr-stak.nix | 60 ++++++++++++++++--------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/misc/xmr-stak.nix b/nixos/modules/services/misc/xmr-stak.nix
index 57f43936547..a87878c31e0 100644
--- a/nixos/modules/services/misc/xmr-stak.nix
+++ b/nixos/modules/services/misc/xmr-stak.nix
@@ -10,9 +10,6 @@ let
     inherit (cfg) openclSupport cudaSupport;
   };
 
-  xmrConfArg = optionalString (cfg.configText != "") ("-c " +
-    pkgs.writeText "xmr-stak-config.txt" cfg.configText);
-
 in
 
 {
@@ -29,22 +26,34 @@ in
         description = "List of parameters to pass to xmr-stak.";
       };
 
-      configText = mkOption {
-        type = types.lines;
-        default = "";
-        example = ''
-          "currency" : "monero",
-          "pool_list" :
-            [ { "pool_address" : "pool.supportxmr.com:5555",
-                "wallet_address" : "<long-hash>",
-                "pool_password" : "minername",
-                "pool_weight" : 1,
-              },
-            ],
+      configFiles = mkOption {
+        type = types.attrsOf types.str;
+        default = {};
+        example = literalExample ''
+          {
+            "config.txt" = '''
+              "verbose_level" : 4,
+              "h_print_time" : 60,
+              "tls_secure_algo" : true,
+            ''';
+            "pools.txt" = '''
+              "currency" : "monero7",
+              "pool_list" :
+              [ { "pool_address" : "pool.supportxmr.com:443",
+                  "wallet_address" : "my-wallet-address",
+                  "rig_id" : "",
+                  "pool_password" : "nixos",
+                  "use_nicehash" : false,
+                  "use_tls" : true,
+                  "tls_fingerprint" : "",
+                  "pool_weight" : 23
+                },
+              ],
+            ''';
+          }
         '';
         description = ''
-          Verbatim xmr-stak config.txt. If empty, the <literal>-c</literal>
-          parameter will not be added to the xmr-stak command.
+          Content of config files like config.txt, pools.txt or cpu.txt.
         '';
       };
     };
@@ -58,10 +67,13 @@ in
       environment = mkIf cfg.cudaSupport {
         LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib";
       };
-      script = ''
-        exec ${pkg}/bin/xmr-stak ${xmrConfArg} ${concatStringsSep " " cfg.extraArgs}
-      '';
+
+      preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: ''
+        ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}'
+      ''));
+
       serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in {
+        ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}";
         # xmr-stak generates cpu and/or gpu configuration files
         WorkingDirectory = "/tmp";
         PrivateTmp = true;
@@ -70,4 +82,12 @@ in
       };
     };
   };
+
+  imports = [
+    (mkRemovedOptionModule ["services" "xmr-stak" "configText"] ''
+      This option was removed in favour of `services.xmr-stak.configFiles`
+      because the new config file `pools.txt` was introduced. You are
+      now able to define all other config files like cpu.txt or amd.txt.
+    '')
+  ];
 }

From 5673d74dd1423b7de72ee954d4927b647bb64b1a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 04:23:13 -0700
Subject: [PATCH 079/117] pagemon: 0.01.12 -> 0.01.13

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

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

These checks were done:

- built on NixOS
- /nix/store/i6bq7x5lbw83spjs8irjihvrr09ygkif-pagemon-0.01.13/bin/pagemon passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.01.13 with grep in /nix/store/i6bq7x5lbw83spjs8irjihvrr09ygkif-pagemon-0.01.13
- directory tree listing: https://gist.github.com/b7b92de7a71b30515369214111f387e0
- du listing: https://gist.github.com/257db82673b5cf4032834d2d9a93b431
---
 pkgs/os-specific/linux/pagemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 99caa813b2e..6429c19f2b5 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pagemon-${version}";
-  version = "0.01.12";
+  version = "0.01.13";
 
   src = fetchFromGitHub {
-    sha256 = "0bddn22daf33dbghwfjxxgsn4gmr5knr6h9sbqhs7g7p85dla6wa";
+    sha256 = "055qniys5xv0ivdvdws5vwdgfyj6iyq02v5nn945l1x59rwnb541";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";

From 867c4a438b346e2ffd139a07d62165160f8d0f4c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 04:49:11 -0700
Subject: [PATCH 080/117] neo4j: 3.4.0 -> 3.4.1

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

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

These checks were done:

- built on NixOS
- /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j passed the binary check.
- /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j-admin passed the binary check.
- /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j-import passed the binary check.
- /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/neo4j-shell passed the binary check.
- /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1/bin/cypher-shell passed the binary check.
- 5 of 5 passed binary check by having a zero exit code.
- 2 of 5 passed binary check by having the new version present in output.
- found 3.4.1 with grep in /nix/store/cmnl1i2dr77i6rs6kvk2y5pml713zpp6-neo4j-3.4.1
- directory tree listing: https://gist.github.com/89bcc22704e3395637aebe7490b1c372
- du listing: https://gist.github.com/28e23479c8d4173c73887b835e0d2ada
---
 pkgs/servers/nosql/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 022a1a9ba10..fe4d285713f 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "1pccw3av72qqpyfsdyz72ab1lvc7fqraw14vi3hq67n96rsj017a";
+    sha256 = "1hgpgkmz0rgdppk1rl41017369qp9lfbrdk7j3qc5dq54x8rxbjp";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From a0d07eb94e147b133f485b041e852c5f690a7ea2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 03:47:59 -0700
Subject: [PATCH 081/117] openfortivpn: 1.7.0 -> 1.7.1

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

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

These checks were done:

- built on NixOS
- /nix/store/qn1hzzhcv20cyk6q58wlgjar03dbqbqv-openfortivpn-1.7.1/bin/openfortivpn passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.7.1 with grep in /nix/store/qn1hzzhcv20cyk6q58wlgjar03dbqbqv-openfortivpn-1.7.1
- directory tree listing: https://gist.github.com/8d202ae1f27f632d9f02045900200b02
- du listing: https://gist.github.com/809d7d83e583187909b98ed31fae9fab
---
 pkgs/tools/networking/openfortivpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix
index b265cdb4c32..5512db9fe76 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let repo = "openfortivpn";
-    version = "1.7.0";
+    version = "1.7.1";
 
 in stdenv.mkDerivation {
   name = "${repo}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "adrienverge";
     inherit repo;
     rev = "v${version}";
-    sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0";
+    sha256 = "01nsgmmh72qk0aq2zdjh8qqn256mmvz1w2gl0wi7g29d82y2hdfm";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From ac3b07b581b86c674995a732a09608d4db1d732e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 23:11:05 -0700
Subject: [PATCH 082/117] smcroute: 2.4.0 -> 2.4.1

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

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

These checks were done:

- built on NixOS
- /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1/bin/smcroutectl passed the binary check.
- /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1/bin/smcrouted 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 2.4.1 with grep in /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1
- directory tree listing: https://gist.github.com/f35692e1d0eaf5b66e1203fcdc9cdf6d
- du listing: https://gist.github.com/6170a85a1ce970d7ef1388b28005dfee
---
 pkgs/servers/smcroute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 40472c59a87..241ed17d2a1 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "smcroute-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
     rev = version;
-    sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r";
+    sha256 = "0wh7c15lglcgiap9pplqpd5abnxhfx3vh0nqjzvfnl82hwhnld1z";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 18096d201b6dee117fff095aa8df10d120dc8140 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 18 Jun 2018 21:32:07 -0700
Subject: [PATCH 083/117] toot: 0.17.1 -> 0.18.0

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

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

These checks were done:

- built on NixOS
- /nix/store/bhs5n438kn33h9v1r27m27zb27z0pvmw-toot-0.18.0/bin/.toot-wrapped passed the binary check.
- /nix/store/bhs5n438kn33h9v1r27m27zb27z0pvmw-toot-0.18.0/bin/toot passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.18.0 with grep in /nix/store/bhs5n438kn33h9v1r27m27zb27z0pvmw-toot-0.18.0
- directory tree listing: https://gist.github.com/a202deb57487abab3f68139efcdf7e07
- du listing: https://gist.github.com/fffb680bbb26f7e0ff4956e000c89985
---
 pkgs/applications/misc/toot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index e282e752b31..0fa0495ceda 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.17.1";
+  version = "0.18.0";
   name    = "toot-${version}";
 
   src = fetchFromGitHub {
     owner  = "ihabunek";
     repo   = "toot";
     rev    = "${version}";
-    sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis";
+    sha256 = "0snvxn7ifbkrdnml66pdna7vny3qa0s6gcjjz69s7scc0razwrh8";
   };
 
   checkInputs = with python3Packages; [ pytest ];

From f5f8f57e112d40d028108a624a456e28ec085d67 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jun 2018 09:32:29 -0700
Subject: [PATCH 084/117] xmrig: 2.6.2 -> 2.6.3

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

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 91fdb37432e..340d84fd2aa 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-${version}";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "09dcjvnm74j1d26mvdiz0sl1qwns5xfkdwx46nqd4xlgvg9x4rpx";
+    sha256 = "1ssiq2yv8b3xg4kfp2cfzl41m5apjw2r2k74lh3fz0g0ix3cq55b";
   };
 
   nativeBuildInputs = [ cmake ];

From d7c2561790034fe6323872dc597dce10d5269607 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jun 2018 09:46:06 -0700
Subject: [PATCH 085/117] smemstat: 0.01.18 -> 0.02.00 (#42208)

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

diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index b4b8606197e..c4d699c395e 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "smemstat-${version}";
-  version = "0.01.18";
+  version = "0.02.00";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz";
-    sha256 = "0g262gilj2jk365wj4yl93ifppgvc9rx7dmlw6ychbv72v2pbv6w";
+    sha256 = "16in8bzsrrcz7mc5qvyvjkxgpzz4bnq8zvkb7vsv6qfgyd3xr1dp";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];

From a943befd8a2727bae96fe1d2d40e5e7ec64459ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jun 2018 09:47:00 -0700
Subject: [PATCH 086/117] swiften: 4.0 -> 4.0.2 (#42206)

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

diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index 272967fcb99..810420fe6b7 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python, fetchurl, openssl, boost }:
 stdenv.mkDerivation rec {
   name    = "swiften-${version}";
-  version = "4.0";
+  version = "4.0.2";
 
   buildInputs           = [ python ];
   propagatedBuildInputs = [ openssl boost ];
 
   src = fetchurl {
     url    = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
-    sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh";
+    sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
   };
   
   buildPhase = ''

From 42b28bfd7bf8c3110f0697a71c433e4a049f5449 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 19 Jun 2018 18:50:51 +0200
Subject: [PATCH 087/117] libressl: fix eval

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dcb6c54e85..9d644182a0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11071,7 +11071,6 @@ with pkgs;
   openvdb = callPackage ../development/libraries/openvdb {};
 
   inherit (callPackages ../development/libraries/libressl { })
-    libressl_2_5
     libressl_2_6
     libressl_2_7;
 

From 9374c3f2036398bb8a14286541606e2d3a44c16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@apb.name>
Date: Tue, 19 Jun 2018 19:00:03 +0200
Subject: [PATCH 088/117] platformio: Fix building of overridden click package

The normal click package now applies a patch that doesn't work with the
older version used for platformio.
---
 pkgs/development/arduino/platformio/chrootenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index ae68e84ab1c..8f93a0b3772 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -13,6 +13,7 @@ let
               inherit version;
               sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a";
             };
+            patches = [];
           });
 
           platformio = self.callPackage ./core.nix { };

From c7647189663f676a79f5291d15b91b571d035ea6 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 19 Jun 2018 13:00:39 -0400
Subject: [PATCH 089/117] python click: make patch conditional

Make sure we are not using the old version of click when applying the patch.
---
 pkgs/development/python-modules/click/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 4a96ef7f673..2a3004de379 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -9,12 +9,10 @@ buildPythonPackage rec {
     sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
   };
 
-  patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      locale = "${locale}/bin/locale";
-    })
-  ];
+  patches = stdenv.lib.optional (lib.versionAtLeast version "6.7") (substituteAll {
+    src = ./fix-paths.patch;
+    locale = "${locale}/bin/locale";
+  });
 
   buildInputs = [ pytest ];
 

From d2c633f55dc0ebb1186ff8e391ab1b82c3df3433 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 19 Jun 2018 13:01:04 -0400
Subject: [PATCH 090/117] click: fix error

forgot stdenv.
---
 pkgs/development/python-modules/click/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index 2a3004de379..68a4662d282 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
   };
 
-  patches = stdenv.lib.optional (lib.versionAtLeast version "6.7") (substituteAll {
+  patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll {
     src = ./fix-paths.patch;
     locale = "${locale}/bin/locale";
   });

From 2388a9b5a9b274127fd51fa2b411cbed55558346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@apb.name>
Date: Tue, 19 Jun 2018 19:01:34 +0200
Subject: [PATCH 091/117] platformio: 3.5.2 -> 3.5.3

---
 pkgs/development/arduino/platformio/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index 9d30c226855..de058530999 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "platformio";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb311ce5b8f12c95bc45c2071626a4887a3632fb2472b4d69a873b2acfc2e4ec";
+    sha256 = "1l4s2xh1p9h767amk9zapzivz4irl2y3kff3dna6icvsgq6rz011";
   };
 
   propagatedBuildInputs =  [

From 56b6771e09a013759ac45fbaaf20b6462dc68bc7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 11:47:55 -0700
Subject: [PATCH 092/117] entr: 4.0 -> 4.1

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/10c98102g693y06k81q97z6akq0a87i8-entr-4.1/bin/entr had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.1 with grep in /nix/store/10c98102g693y06k81q97z6akq0a87i8-entr-4.1
- directory tree listing: https://gist.github.com/fd156bc7a5f670e3b90073b60678bee9
- du listing: https://gist.github.com/3a2e6fc964562e2a7d597aeb4c95b46d
---
 pkgs/tools/misc/entr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index b8791f5f32a..9301ce12a05 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a";
+    sha256 = "0y7gvyf0iykpf3gfw09m21hy51m6qn4cpkbrm4nnn7pwrwycj0y5";
   };
 
   postPatch = ''

From 802ea37863d7b62f83b502212c6bb2a0671e6df1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 11:59:41 -0700
Subject: [PATCH 093/117] git-secret: 0.2.3 -> 0.2.4

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

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

These checks were done:

- built on NixOS
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/git-secret passed the binary check.
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/.git-secret-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.2.4 with grep in /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4
- directory tree listing: https://gist.github.com/d460daac78bbcef226d1fff7918d150d
- du listing: https://gist.github.com/ea683543c922a9c179a97faf441a1797
---
 .../version-management/git-and-tools/git-secret/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
index 02dc7f86fb3..4993910634a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
 
 let
-  version = "0.2.3";
+  version = "0.2.4";
   repo = "git-secret";
 
 in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
     inherit repo;
     owner = "sobolevn";
     rev = "v${version}";
-    sha256 = "1swgw91zzs9n582500a34cppyngrqrqrnl80d1vd7i93xx1lkmv6";
+    sha256 = "0lx2rjyhy3xh6ik755lbbl40v7a7ayyqk68jj8mnv42f2vhd66xl";
   };
 
   buildInputs = [ makeWrapper ];

From 5fce881f60a475f113270ba5f7d721ae8fb35f34 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 19 Jun 2018 21:14:28 +0200
Subject: [PATCH 094/117] wireshark: 2.4.7 -> 2.6.1

---
 .../networking/sniffers/wireshark/default.nix          | 10 ++++++++--
 pkgs/top-level/all-packages.nix                        |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index f3afeced8f6..42038426515 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.4.7";
+  version = "2.6.1";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy";
+    sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb";
   };
 
   cmakeFlags = [
@@ -52,6 +52,10 @@ in stdenv.mkDerivation {
     })
     ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch;
 
+  preBuild = ''
+    export LD_LIBRARY_PATH="$PWD/run"
+  '';
+
   postInstall = if stdenv.isDarwin then ''
     ${optionalString withQt ''
       mkdir -p $out/Applications
@@ -72,6 +76,8 @@ in stdenv.mkDerivation {
     ''}
     ${optionalString withQt ''
       install -Dm644 -t $out/share/applications ../wireshark.desktop
+      wrapProgram $out/bin/wireshark \
+        --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
     ''}
 
     substituteInPlace $out/share/applications/*.desktop \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d644182a0f..063e3a57672 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15973,6 +15973,7 @@ with pkgs;
 
   wireshark = callPackage ../applications/networking/sniffers/wireshark {
     withQt = true;
+    qt5 = qt59;
     withGtk = false;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
   };

From 912e60f9294f263d3bfa3847cc33be86cbd58b1f Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 19 Jun 2018 15:43:36 -0400
Subject: [PATCH 095/117] inkscape: add perl to nativeBuildInputs

This should fix the issue in Linux sandbox.
---
 pkgs/applications/graphics/inkscape/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 0d01a631358..639f1928f8a 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
-  nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env ];
+  nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env perl perlXMLParser ];
   buildInputs = [
-    perl perlXMLParser libXft libpng zlib popt boehmgc
+    libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     gsl poppler imagemagick libwpg librevenge
     libvisio libcdr libexif potrace

From cb1fcff6a0c05842e2a99babbf392e6a6f76e5b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 13:17:30 -0700
Subject: [PATCH 096/117] fnotifystat: 0.02.00 -> 0.02.01

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

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

These checks were done:

- built on NixOS
- /nix/store/bhgmqgb2378111cih2i66xxw8hs437cg-fnotifystat-0.02.01/bin/fnotifystat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.02.01 with grep in /nix/store/bhgmqgb2378111cih2i66xxw8hs437cg-fnotifystat-0.02.01
- directory tree listing: https://gist.github.com/403bc6fa2fa6447782c088789925dbfa
- du listing: https://gist.github.com/a24a28895d12487f43e6b23117868c75
---
 pkgs/os-specific/linux/fnotifystat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index d49d0115822..eb87d8aa725 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "fnotifystat-${version}";
-  version = "0.02.00";
+  version = "0.02.01";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
-    sha256 = "0sfzmggfhhhp3vxn1s61b5bacr2hz6r7y699n3nysdciaa2scgdq";
+    sha256 = "18p6rqb3bhs2ih6mnp57j0cyawjm0iwky6y3ays54alkxqaz8gmx";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From f9ad1cae78b5fc27a5bf2f17b3f9ebf7b239b3ca Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Mon, 18 Jun 2018 13:05:01 +0200
Subject: [PATCH 097/117] nixos/kubernetes: dashboard lockdown

Kubernetes dashboard currently has cluster admin permissions,
which is not recommended.

- Renamed option "services.kubernetes.addons.dashboard.enableRBAC" to "services.kubernetes.addons.dashboard.rbac.enable"
- Added option "services.kubernetes.addons.dashboard.rbac.clusterAdmin", default = false.
- Setting recommended minimal permissions for the dashboard in accordance with https://github.com/kubernetes/dashboard/wiki/Installation
- Updated release note for 18.09.
---
 nixos/doc/manual/release-notes/rl-1809.xml    |  16 ++
 nixos/modules/rename.nix                      |   1 +
 .../services/cluster/kubernetes/dashboard.nix | 138 +++++++++++++++---
 3 files changed, 132 insertions(+), 23 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index f57fd75c782..d3062b3ea32 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -306,6 +306,22 @@ inherit (pkgs.nixos {
      was not used and thus has been removed.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The option <varname>services.kubernetes.addons.dashboard.enableRBAC</varname>
+     was renamed to <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The Kubernetes Dashboard now has only minimal RBAC permissions by default.
+     If dashboard cluster-admin rights are desired,
+     set <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> to true.
+     On existing clusters, in order for the revocation of privileges to take effect,
+     the current ClusterRoleBinding for kubernetes-dashboard must be manually removed:
+     <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 2df737452fb..e3691843e17 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -34,6 +34,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
     (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
     (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
+    (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])
     (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index 9c1f814b683..6d9faada440 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -8,10 +8,25 @@ in {
   options.services.kubernetes.addons.dashboard = {
     enable = mkEnableOption "kubernetes dashboard addon";
 
-    enableRBAC = mkOption {
-      description = "Whether to enable role based access control is enabled for kubernetes dashboard";
-      type = types.bool;
-      default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode;
+    rbac = mkOption {
+      description = "Role-based access control (RBAC) options";
+      type = types.submodule {
+
+        options = {
+          enable = mkOption {
+            description = "Whether to enable role based access control is enabled for kubernetes dashboard";
+            type = types.bool;
+            default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode;
+          };
+
+          clusterAdmin = mkOption {
+            description = "Whether to assign cluster admin rights to the kubernetes dashboard";
+            type = types.bool;
+            default = false;
+          };
+          
+        };
+      };
     };
 
     version = mkOption {
@@ -202,29 +217,106 @@ in {
           namespace = "kube-system";
         };
       };
-    } // (optionalAttrs cfg.enableRBAC {
-      kubernetes-dashboard-crb = {
-        apiVersion = "rbac.authorization.k8s.io/v1";
-        kind = "ClusterRoleBinding";
-        metadata = {
-          name = "kubernetes-dashboard";
-          labels = {
-            k8s-app = "kubernetes-dashboard";
-            k8s-addon = "kubernetes-dashboard.addons.k8s.io";
-            "addonmanager.kubernetes.io/mode" = "Reconcile";
-          };
-        };
-        roleRef = {
-          apiGroup = "rbac.authorization.k8s.io";
-          kind = "ClusterRole";
-          name = "cluster-admin";
-        };
+    } // (optionalAttrs cfg.rbac.enable
+      (let
         subjects = [{
           kind = "ServiceAccount";
           name = "kubernetes-dashboard";
           namespace = "kube-system";
         }];
-      };
-    });
+        labels = {
+          k8s-app = "kubernetes-dashboard";
+          k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+          "addonmanager.kubernetes.io/mode" = "Reconcile";
+        };
+      in
+        (if cfg.rbac.clusterAdmin then {
+          kubernetes-dashboard-crb = {
+            apiVersion = "rbac.authorization.k8s.io/v1";
+            kind = "ClusterRoleBinding";
+            metadata = {
+              name = "kubernetes-dashboard";
+              inherit labels;
+            };
+            roleRef = {
+              apiGroup = "rbac.authorization.k8s.io";
+              kind = "ClusterRole";
+              name = "cluster-admin";
+            };
+            inherit subjects;
+          };
+        }
+        else
+        {
+          # Upstream role- and rolebinding as per:
+          # https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/alternative/kubernetes-dashboard.yaml
+          kubernetes-dashboard-role = {
+            apiVersion = "rbac.authorization.k8s.io/v1";
+            kind = "Role";
+            metadata = {
+              name = "kubernetes-dashboard-minimal";
+              namespace = "kube-system";
+              inherit labels;
+            };
+            rules = [
+              # Allow Dashboard to create 'kubernetes-dashboard-key-holder' secret.
+              {
+                apiGroups = [""];
+                resources = ["secrets"];
+                verbs = ["create"];
+              }
+              # Allow Dashboard to create 'kubernetes-dashboard-settings' config map.
+              {
+                apiGroups = [""];
+                resources = ["configmaps"];
+                verbs = ["create"];
+              }
+              # Allow Dashboard to get, update and delete Dashboard exclusive secrets.
+              {
+                apiGroups = [""];
+                resources = ["secrets"];
+                resourceNames = ["kubernetes-dashboard-key-holder"];
+                verbs = ["get" "update" "delete"];
+              }
+              # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map.
+              {
+                apiGroups = [""];
+                resources = ["configmaps"];
+                resourceNames = ["kubernetes-dashboard-settings"];
+                verbs = ["get" "update"];
+              }
+              # Allow Dashboard to get metrics from heapster.
+              {
+                apiGroups = [""];
+                resources = ["services"];
+                resourceNames = ["heapster"];
+                verbs = ["proxy"];
+              }
+              {
+                apiGroups = [""];
+                resources = ["services/proxy"];
+                resourceNames = ["heapster" "http:heapster:" "https:heapster:"];
+                verbs = ["get"];
+              }
+            ];
+          };
+
+          kubernetes-dashboard-rb = {
+            apiVersion = "rbac.authorization.k8s.io/v1";
+            kind = "RoleBinding";
+            metadata = {
+              name = "kubernetes-dashboard-minimal";
+              namespace = "kube-system";
+              inherit labels;
+            };
+            roleRef = {
+              apiGroup = "rbac.authorization.k8s.io";
+              kind = "Role";
+              name = "kubernetes-dashboard-minimal";
+            };
+            inherit subjects;
+          };
+        })
+    ));
   };
 }

From 1d07b0edac30d0eaa7c0f92a1e0b5ed5a22820ea Mon Sep 17 00:00:00 2001
From: Thomas Kim Pham <thomas.pham@ithings.ch>
Date: Mon, 18 Jun 2018 14:14:55 +0200
Subject: [PATCH 098/117] add missing k8s Webhook authorization mode

---
 .../services/cluster/kubernetes/default.nix      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 20f2308508c..5e87ae88f5a 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -332,11 +332,11 @@ in {
 
       authorizationMode = mkOption {
         description = ''
-          Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
+          Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See
           <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/authorization/"/>
         '';
         default = ["RBAC" "Node"];
-        type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
+        type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]);
       };
 
       authorizationPolicy = mkOption {
@@ -348,6 +348,15 @@ in {
         type = types.listOf types.attrs;
       };
 
+      webhookConfig = mkOption {
+        description = ''
+          Kubernetes apiserver Webhook config file. It uses the kubeconfig file format.
+          See <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/webhook/"/>
+        '';
+        default = null;
+        type = types.nullOr types.path;
+      };
+
       allowPrivileged = mkOption {
         description = "Whether to allow privileged containers on Kubernetes.";
         default = true;
@@ -943,6 +952,9 @@ in {
                 (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy)
               }"
             } \
+            ${optionalString (elem "Webhook" cfg.apiserver.authorizationMode)
+              "--authorization-webhook-config-file=${cfg.apiserver.webhookConfig}"
+            } \
             --secure-port=${toString cfg.apiserver.securePort} \
             --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \
             ${optionalString (cfg.apiserver.runtimeConfig != "")

From 2b534c6e7ed07385d90c8c5188173785963bf675 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 14:31:23 -0700
Subject: [PATCH 099/117] clex: 4.6.patch6 -> 4.6.patch9

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

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

These checks were done:

- built on NixOS
- /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9/bin/clex passed the binary check.
- Warning: no invocation of /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9/bin/kbd-test had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9/bin/cfg-clex had a zero exit code or showed the expected version
- 1 of 3 passed binary check by having a zero exit code.
- 0 of 3 passed binary check by having the new version present in output.
- found 4.6.patch9 with grep in /nix/store/qkxwkwy5z5spp4i1s47sxa4yp5fn74ih-clex-4.6.patch9
- directory tree listing: https://gist.github.com/2c328494e947f31dde0f4b4e11ae16cc
- du listing: https://gist.github.com/34e5287c0403e2308608877e577ca373
---
 pkgs/tools/misc/clex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 2f442a7a9c1..54a6fac17a3 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "clex-${version}";
-  version = "4.6.patch6";
+  version = "4.6.patch9";
 
   src = fetchurl {
-    sha256 = "0bqa2hc9721d62cfsy5c7a5pzgh9b4px7g4q60xlybkwll19qbbp";
+    sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc";
     url = "${meta.homepage}/download/${name}.tar.gz";
   };
 

From a13cc1151712c5aa81e165da81a6914ce897c5ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 14:44:44 -0700
Subject: [PATCH 100/117] debootstrap: 1.0.101 -> 1.0.102

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

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

These checks were done:

- built on NixOS
- /nix/store/1d259k14mlj2g4ahwzrqysz8qzq3h0yf-debootstrap-1.0.102/bin/debootstrap passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.102 with grep in /nix/store/1d259k14mlj2g4ahwzrqysz8qzq3h0yf-debootstrap-1.0.102
- directory tree listing: https://gist.github.com/a5ffc7b266836c399de6806088eb48a7
- du listing: https://gist.github.com/7ec59bc18aa8dc8cf0540391333485c2
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index bf4319759fb..21f91691a71 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.101";
+  version = "1.0.102";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1p1a81s8hq73byd7256iljdls389x2q7w6srgrgfmx5bl1csnzp3";
+    sha256 = "1i8fnxyf073dqywcvj6n32k1crzl7bwlmn373n5342pz71rmqrq9";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From 5d0780193830ffff29ff7b4b522f919cafbd496d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 10 Jun 2018 20:21:33 +0200
Subject: [PATCH 101/117] python.pkgs.cython: fix tests

(cherry picked from commit b9b18ded57842d24ef05bfe33aa7dba95b77babf)
---
 pkgs/development/python-modules/Cython/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 189468a2daa..1c391d3495d 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -9,6 +9,7 @@
 , gdb
 , numpy
 , ncurses
+, fetchpatch
 }:
 
 let
@@ -48,6 +49,15 @@ in buildPythonPackage rec {
         ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
   '';
 
+  patches = [
+    # The following is in GitHub in 0.28.3 but not in the `sdist`.
+    # https://github.com/cython/cython/issues/2319
+    (fetchpatch {
+      url = https://github.com/cython/cython/commit/c485b1b77264c3c75d090a3c526de24966830d42.patch;
+      sha256 = "1p6jj9rb097kqvhs5j5127sj5zy18l7x9v0p478cjyzh41khh9r0";
+    })
+  ];
+
   meta = {
     description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
     homepage = http://cython.org;

From 98eefba1906e8333d17f537d2b059362027f6660 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jun 2018 16:24:05 -0700
Subject: [PATCH 102/117] wesnoth: 1.14.2 -> 1.14.3 (#42195)

---
 pkgs/games/wesnoth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 12fb0bd60b0..45b4e5a5891 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.2";
+  version = "1.14.3";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1xhnhxjc8zjv89xmrbffa54fa4ybw6x0p34k14n9lrz1y18vaar8";
+    sha256 = "06648041nr77sgzr7jpmcn37cma3hp41qynp50xzddx28l17zwg9";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 39f01c1a8bc1ea4c78f3bf1f97159d245b393f61 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 16:36:02 -0700
Subject: [PATCH 103/117] adapta-gtk-theme: 3.93.1.18 -> 3.93.1.22

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

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/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/e6801ef270b37b8b69012340d257786e
- du listing: https://gist.github.com/50a1c6c1c9f0e79a349f8b5a83d10300
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 372efec785d..c7033bba4b6 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.1.18";
+  version = "3.93.1.22";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "1jaayfj2h0miaalmgk0i26py4b6750iq3kis2jnm54g2gxyw3ipw";
+    sha256 = "1i74vpf7fv1r6074lv8f9515hzrhcbi2wg069vmc10ihwpml391r";
   };
 
   preferLocalBuild = true;

From 12a554dc318a98ef4d3856ce49003fd35d21904d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 16:52:22 -0700
Subject: [PATCH 104/117] brial: 1.2.3 -> 1.2.4

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

This update was made based on information from https://repology.org/metapackage/brial/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.
- found 1.2.4 with grep in /nix/store/d80z046q8l3rhi7zwbcxzaydfrqxvzq9-brial-1.2.4
- directory tree listing: https://gist.github.com/73a4fe4d778faacdf1c17f40a83e3884
- du listing: https://gist.github.com/23202c35b020ea0976f7c4ff9e23ca2c
---
 pkgs/development/libraries/science/math/brial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 0c0332f1366..38b77781867 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.3";
+  version = "1.2.4";
   name = "brial-${version}";
 
   src = fetchFromGitHub {
     owner = "BRiAl";
     repo = "BRiAl";
     rev = version;
-    sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
+    sha256 = "08skgmwz190mvpkh0ddx92ilva6bxidxwh1qg16ipi768x92193s";
   };
 
   # FIXME package boost-test and enable checks

From 48fd0e6f20cd835765d7803eff4ed116409d81e1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 19 Jun 2018 20:45:33 +0200
Subject: [PATCH 105/117] =?UTF-8?q?evolution-data-server:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.28.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/evolution-data-server/default.nix        | 15 +++++++++++----
 .../core/evolution-data-server/fix-paths.patch    | 11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index a9516206859..5146123cfd4 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,19 +1,26 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection
-, intltool, libsoup, libxml2, libsecret, icu, sqlite
+{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection
+, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata
 , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking
 , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.28.2";
+  version = "3.28.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk";
+    sha256 = "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit tzdata;
+    })
+  ];
+
   nativeBuildInputs = [
     cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala
   ];
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
new file mode 100644
index 00000000000..33423551659
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
@@ -0,0 +1,11 @@
+--- a/src/calendar/libecal/e-cal-system-timezone.c
++++ b/src/calendar/libecal/e-cal-system-timezone.c
+@@ -26,7 +26,7 @@
+ #ifdef HAVE_SOLARIS
+ #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab"
+ #else
+-#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo"
++#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo"
+ #endif
+ 
+ #define ETC_TIMEZONE        "/etc/timezone"

From 843a1cdcae20228f05423ab747a6c0ed37336ff0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 19 Jun 2018 20:45:42 +0200
Subject: [PATCH 106/117] =?UTF-8?q?gnome3.evolution:=203.28.2=20=E2=86=92?=
 =?UTF-8?q?=203.28.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 4470f11597e..6c7f57b0162 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.28.2";
+  version = "3.28.3";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74";
+    sha256 = "1s1vlznc22q1f8fm8fhggi8xak52b6n952s562f3kpv6g0dm2x6k";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];

From 77f3ac7b7638b33ab198330eaabbd6e0a2e751a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 17:15:26 -0700
Subject: [PATCH 107/117] altcoins.bitcoin: 0.16.0 -> 0.16.1

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

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

These checks were done:

- built on NixOS
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoind passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-cli passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-tx passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bench_bitcoin passed the binary check.
- Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-qt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin-qt had a zero exit code or showed the expected version
- 5 of 7 passed binary check by having a zero exit code.
- 0 of 7 passed binary check by having the new version present in output.
- found 0.16.1 with grep in /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1
- directory tree listing: https://gist.github.com/a5e5d745910497ae913d4577342deba5
- du listing: https://gist.github.com/5f62bec50f6ab977a25c8ee0f118cb10
---
 pkgs/applications/altcoins/bitcoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 30bbcb2c839..25f223d5744 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchurl {
     urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
              "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc";
+    sha256 = "1zkqp93yircd3pbxczxfnibkpq0sgcv5r7wg6d196b9pwgr9zd39";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 696861f9a65e43645b3c08ed55cd863d935c5991 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Wed, 20 Jun 2018 09:11:04 +0300
Subject: [PATCH 108/117] direnv: 2.15.1 -> 2.17.0

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

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 15d8647ff82..e22bce7c698 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "direnv-${version}";
-  version = "2.15.1";
+  version = "2.17.0";
   goPackagePath = "github.com/direnv/direnv";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v";
+    sha256 = "1dmanqpifx27cz41yc3ijpij0wrbgw9qny2d4n6jppfwf2qzyq4s";
   };
 
   postConfigure = ''

From 1c1e32ba002aba575e970306497380bf10e67da3 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 20 Jun 2018 05:56:09 +0000
Subject: [PATCH 109/117] ddrescueview: init at 0.4alpha3

---
 pkgs/tools/system/ddrescueview/default.nix | 39 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/system/ddrescueview/default.nix

diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix
new file mode 100644
index 00000000000..517cefb6a2b
--- /dev/null
+++ b/pkgs/tools/system/ddrescueview/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk_pixbuf, glib, gtk2, libX11, pango }:
+
+stdenv.mkDerivation rec {
+  name = "ddrescueview-0.4alpha3";
+
+  src = fetchurl {
+    name = "${name}.tar.xz";
+    url = "mirror://sourceforge/ddrescueview/ddrescueview-source-0.4%7Ealpha3.tar.xz";
+    sha256 = "0603jisxkswfyh93s3i20f8ns4yf83dmgmy0lg5001rvaw9mkw9j";
+  };
+
+  nativeBuildInputs = [ fpc lazarus ];
+
+  buildInputs = [ atk cairo gdk_pixbuf glib gtk2 libX11 pango ];
+
+  sourceRoot = "source";
+
+  NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
+
+  buildPhase = ''
+    lazbuild --lazarusdir=${lazarus}/share/lazarus ddrescueview.lpi
+  '';
+
+  installPhase = ''
+    install -Dt $out/bin ddrescueview
+    cd ../resources/linux
+    install -Dt $out/share/applications ddrescueview.desktop
+    install -Dt $out/share/icons/hicolor/32x32/apps ddrescueview.xpm
+    install -Dt $out/share/man/man1 ddrescueview.1
+  '';
+
+  meta = with lib; {
+    description = "A tool to graphically examine ddrescue mapfiles";
+    homepage = https://sourceforge.net/projects/ddrescueview/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 063e3a57672..4ff64a13070 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1993,6 +1993,8 @@ with pkgs;
 
   ddrescue = callPackage ../tools/system/ddrescue { };
 
+  ddrescueview = callPackage ../tools/system/ddrescueview { };
+
   deluge = callPackage ../applications/networking/p2p/deluge {
     pythonPackages = python2Packages;
   };

From 6916565510f013fe86eb44013fe196d3f5e8ff9a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 20 Jun 2018 05:57:08 +0000
Subject: [PATCH 110/117] ddrutility: init at 2.8

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

diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix
new file mode 100644
index 00000000000..f8a6dac8197
--- /dev/null
+++ b/pkgs/tools/system/ddrutility/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ddrutility-${version}";
+  version = "2.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ddrutility/${name}.tar.gz";
+    sha256 = "023g7f2sfv5cqk3iyss4awrw3b913sy5423mn5zvlyrri5hi2cac";
+  };
+
+  postPatch = ''
+    substituteInPlace makefile --replace /usr/local ""
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "A set of utilities for hard drive data rescue";
+    homepage = https://sourceforge.net/projects/ddrutility/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ff64a13070..7bbb5ca26ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1995,6 +1995,8 @@ with pkgs;
 
   ddrescueview = callPackage ../tools/system/ddrescueview { };
 
+  ddrutility = callPackage ../tools/system/ddrutility { };
+
   deluge = callPackage ../applications/networking/p2p/deluge {
     pythonPackages = python2Packages;
   };

From 8f558a68cae77825186001fb634891900da6b3ea Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 20 Jun 2018 14:58:39 +0800
Subject: [PATCH 111/117] firefox-devedition-bin: 61.0b14 -> 62.0b1

---
 .../firefox-bin/devedition_sources.nix        | 796 +++++++++---------
 1 file changed, 403 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 8dd7d4752b7..fad5f0bf434 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,995 @@
 {
-  version = "61.0b14";
+  version = "62.0b1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ach/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ach/firefox-62.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "1b8e2e92cc7489a9876aa4b8082f3285a1db6ced460597f05f4843f3858eb4fe858b5d87e641480836526bd7b718d033a24fc1a2b9bdf0504dfebbc5e7a292c8";
+      sha512 = "a87905427f380f4234a76e36f1157c7b4286e71b46aadc84275ec21897a179d2e6aabee553efb3528c9b8a6255ecf6145bd05e96dd1ace096832cd5c724996cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/af/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/af/firefox-62.0b1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "d1b77553f03b06de6fa6d8e3a308105b885690d2eaa21a066f89ad35c5475633a3f4d63536dca33c737dfe2e84dba9c05a09c011cab7bc4356b4158dc122662e";
+      sha512 = "1178bdcfbcdb948284847df330666f82ff4347c38d1737177469c7a3e32a792cb9434103adcaefc3773421b5f544ccba0464d4329464ce1dfcefc99eee837e2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/an/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/an/firefox-62.0b1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b8ff7e36c2b826da7d69352abd2f2ce6661298ea09b1f457ccfeaf9d271ad49358b2a6947bba47bee506c102c59fc1426a92f09e3e9591693e4fd6c8fe84ea18";
+      sha512 = "0097dbcf6f23251e0328d3966c76e250f9be83a232f9cfb3afcdfa6b445193beea64fe907396bb54a41ab89008dc35304b8de7dc8b7abf7bab8afc703ed71ddd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ar/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ar/firefox-62.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "108a6b8f7af9915c20a11bce0bf1c2096d8ee09fcec394325faf0142eff1452d493e5a5c894ae3061ffdb63b2f19b127446f2b86339ddff309120df37e113bdf";
+      sha512 = "6c26898763eb09341d6b39d9519f4ffc869202fa14b7a16187eec8e736e0575b119e0d4f6dc47eff3caaa1a0e62bdf7b61c729f26463a4dc96a1e6e700fc29f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/as/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/as/firefox-62.0b1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b4368567ebe0ca46aeaf48b23e75bb972f88af82ed692d72b4fa1aab8f89e16f09974810c4fb333bcb30b5d2f9cdb50a39a42ff73fa53c2511a1adbd0713c060";
+      sha512 = "55a3a9f38a810981538d714d29c2c53cbea4953d187480838fefe5e83e101b0ebf40f4584fcf6e8967b978c54e03ccd59d9c07653aa4663de679438bdf5047e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ast/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ast/firefox-62.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "3ca40ec6844c55e7beb3e6ee7a3a7604a92560830ad060feb7cca5118bffe4d2b5f6ca8af6f98d07eb6a970814a33d38b0516ea339f07b0e2c8e55a79a031bae";
+      sha512 = "e531fcd3d3140dd2733ee2e62d7b092ab55b96c91a4be6004240a7d505cb64e3b38d8e0b2dab15634d814174e93936b19150d88bfde3bd5af0e322a63cda14bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/az/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/az/firefox-62.0b1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "3bcd5e17dcd0debd02bb79aae488ad6f158e6e45aad6ef49ba6e6d69e894e5513c7b1e27c4d90df9423717d1d8f1b5f02c1dcc42e2255d5ad0727095e9ade169";
+      sha512 = "00734d67c95010caf326a2e3751564f801225e8d524d94d2cfdb11daf56ccc80b2904e6811b355720434efaa29a58a06c46157527f8d7c148e89ac420ac6d83c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/be/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/be/firefox-62.0b1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "bb1168d80f4947e5de3872c02ec5f472381b1b59aec5cb4a05788556db462702c99e36f67ecbd52029856badaf255a9a8ff692f37b6d5c7166d73255b097057c";
+      sha512 = "326cab9a252bed4bf51d36b53f59f12cea73e7fa9c2b930c86353bea8bbd2ef4ac962bbcfc68f4145fda0de2651db294d42d826c6bb1d7555de514a83010ab8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bg/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bg/firefox-62.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "52b93a4eb34c083ee824cbeed17a65396c8916b4313a080d43dddbe0fbc1e80b84030a201e98ce259e24eca7bbcf89f83442779c60660104d28c683471ff4f78";
+      sha512 = "98f3ad0cb0bd02d4107f9799138cb5fd41fb435b0755bdbdedd926c5409427605febbc6fbb060c5f68876fd5b40e0e3b8bec67a9ee3f957611cea922127277ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-BD/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bn-BD/firefox-62.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f387009c1e447e276dc042e1ad0c39661d32dde20e3ae1a4c5f57c6c3acd154ffeacce170843f8a5d04f26d9c1c44fb933899f8253f38690944bed38dc339d72";
+      sha512 = "62e2d3bdf24346326831721e9b3e71fb041dba6774c1ad9c3806bec52e2d38dab14c4fb67a78d803233fb40f8ed6e4d2910bfe97ad4711090c87dd81fad2cc65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bn-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bn-IN/firefox-62.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "fbfd8c0d7ba2038505bde3172d736d851e64600738c28ac9a414e0f859ac7c7b264b23a9a2921e20b2cb9a99d5c371dad7e186e1a5910415debb203dd08bcc3f";
+      sha512 = "21cd75ade9c30a21964d3147b8120d94993bbb406ca9e58643ca78cfe81c9f13bbe8538961eb6b3ced551dc1e80f7060c9a5899c4046db0063513f254789ec29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/br/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/br/firefox-62.0b1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c0a7900802be77222c156690df96e3ee03d88d4888b0dc31d45dd46d29d19a13b97141c68b002f39b657cd96463152c358b45e78368f72884529af51991b8512";
+      sha512 = "a63061938c280c299d54627f979c9ffdf2dec1271b767bad0a972f1300fb150746775e6dcdc86c3dfe184a45afd4e864e08fe78a8c7a63f318c2e227c84d1773";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/bs/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/bs/firefox-62.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "391a2b1aa85ec4bf010c7051565b9168b0bb71dca5a4f40368781efb690d838412859c8bab34c14ae168d3bb9bdbe538c6a38dff11e138aec9f179ae52cda7d4";
+      sha512 = "3703be2a357ce4eb122b70450e1e45054b93d9f9de78a797fab75d1b4125c75e4c8a10c58c40f764631806b070d48536e36b372c168cbc945bf05198cc8dd5f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ca/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ca/firefox-62.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "7655c923e92f356e3d893dddb01a966bcc7ee89f035ae1e8caee681605fcd54c3e6497225700d9eacd099374f0a3fff3050a529354018963e3df40ee3fccc86e";
+      sha512 = "7d5d296e589c5eeedb6e293a55ae9594e71ae034fd58cf5b474f0dbe1d567f0783b4d97336861d4f14a4201302f353ab41a30040bbda30a66f795b640114dba0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cak/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cak/firefox-62.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "daea430b504dbc276e6b7b8091acced1b7842a97045184bad7867f98033feed98b7ebbab922f25f828c031e189b3d437aade6cc7060eb982068c2cd8d977409b";
+      sha512 = "884554722c3c019bc7e1afdb14ac26eedadbec8fa7b1f7efee99e5c4bfca0ea52969d122632bfc17e54ce91731e9577270c74d5bbc86adcf252de2732aff3685";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cs/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cs/firefox-62.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "a6cc36eda14619d4fce6fd2304f0027130ad92cdbaf0e88e3077deb721b9740bfd99d62d22c67cd35286c082374c53df782452227e69364e414f92f16dd96741";
+      sha512 = "5f8c14bbf0090b6beb8b10bdf2400511347157aa329659fef174c0e8d651bc3ab43282c5b4492aacefba0a19230d55b8a90412c6bae7d7c70de9ce104169ac5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/cy/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/cy/firefox-62.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "df0589ec3b22f6a320b3890a6f2beefa99fc2688de6c4afa0f8a879b830d249f4aac4cae1599895edb7e6196ffc02213188d461b07c7242ad29ffbc9901c1c66";
+      sha512 = "90bb43395d0257bd1f48d9c673465850ad05c5e5b80a337d6438394defcde211ea35a164bd5ae9a9b80980bb955f686ef73a6c50699d209c8bec7df7c1b72be8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/da/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/da/firefox-62.0b1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "d6c97c376384c742bf0cba9eb4cfa011ecf1500a7e6c518041c30acd6227df9b8300b156935216ea112956bb0291bd925935b940d372ef8b57a19357e5074d15";
+      sha512 = "6f4aa6e27afeef8424a577cd7d5d67fc51636a71d2f4243f703ef327d9e5b69d835d6dba4eb7a7a2e3aed444903f457e944da787549401cd1ba3bad2cdd38bdd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/de/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/de/firefox-62.0b1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a5781c0515280f5b4fb80f4eaf373a62f591e924466668667885554dc1086e48006cfe0645140bf53b877d078a08c4a1ce209c9dd0985ea28b9fa5579137045b";
+      sha512 = "a533e81e2935e33606ca579a4c70d56be07ab70352a6ed37509a23d3e36d0041a053d7117bd495f2d944c0d5ce91848f99ac397c399af41813e469289ab028ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/dsb/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/dsb/firefox-62.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "ec5eaa244ad1f6bafec67ed2017d16560be5ba2f66e5788c54fc643a748e1e834a7eb11869c5aef233f1d1d7322b15bdbabfc0a6bd6a46011397203911607cc5";
+      sha512 = "4977ef29ad99e13f98156f2ab4f29c2e36cfe1c07bf4bd2db19d6e2af005c319d00370480c15cd56db4266d3922da3456fea18a85fea534f3fe7848d50cfc683";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/el/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/el/firefox-62.0b1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8e4a7d9e778b85caf16e2144189338bf3beb577d057c3416dc45be315eaa4d8a9f26180aabdf1de28cfbc3a6545ed8304e04bb112392a5c49046261a7976fc33";
+      sha512 = "5fe84e58b746519b9ad95294443dc112186916c7cba6728c955f8d986f587dcf3542bf3c3c5b5b2eb862b5ba22849ff870a178be70ccd5f9807db0a5b83a98af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-GB/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-CA/firefox-62.0b1.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-x86_64";
+      sha512 = "f16ff6e47ef02e83e2dd73db8a559bd1ccf871d545a3fd744addd7c4c034af5329d17ed253b77c0186f29cce3f84b7ebaf4539df533c783defabb1527d7fbd94";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-GB/firefox-62.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "bf5cfef892fb906accc0db406b5e3b3389f338719ee29605b2296151ef8a0f2d4916f8b3dd31cd52e79262a4747252d4b553b170c185e181ed2895aa7130cffb";
+      sha512 = "69383c1076d7ec8a88c1b8b4ff9a42c9fd6d6a615fe729e11f5b2d45d52df9b51e1ccfb953ac5e62dcb54ba6c806f1dca5cc24c76f586dc4c74c70fa768d7edd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-US/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-US/firefox-62.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "52c5502b6423b7ce3140f3eb62e274874595761dc996a200442f21b5611c97534734fd93b90340f719d01d0557e2aa18d88137217f8c40a23b2bf50577a820f3";
+      sha512 = "d36f78be9b830596356017348d3e0f30d55f6da6f37d54719e06b5d49a96e171c14af457febc8e8dabe88752833f8ac700ddc2c5bcdbe92bf9593b4938f847a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/en-ZA/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/en-ZA/firefox-62.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "55f251447753564f7db3973c72e1007f1ebc356cdf6c3765dcc6a5352c931f39f7d7e46ffae72b1b4dda59bf2917a09eaecf33cc30b976f78bc7922466a2a9e5";
+      sha512 = "dd106e71d05e801ac6c1b127dff07bcb2d10b235f075ad85e7d1acd3ab583eb76ec88ee8e1698382b35b407604ce5d5b74a7afb6ac491b57e925c957cb419f61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eo/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/eo/firefox-62.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d008d4e0614e3490ffc7951ad7413ee57d84ce1d17563bd69ebb7bed7f5d362231b497d6ac142003aaaba8129683b24fc3fe6c2612b674ead893ed0e500d9ca6";
+      sha512 = "7bdf3e44663c9665942a88ea3ada22cb178b656e036b8a20ad7b14b78f38334cc3aa34489622eee180ec52e2474c6a89803e676ae83cc509290cb6394b228930";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-AR/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-AR/firefox-62.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ebee62d32b2e7d48561ebab7a387b06f06f4c1553cacf814b846bc8cd58a708c397b2e642b67f31617047e34b3baecce7ea9e0177606cf92e386d22f7276a941";
+      sha512 = "241e516324dc6003d6944a3341532192ac8dccb33e128fec57e0026c5e24b5e9e533f2f5cd995cb0543f84ca2f10c92e2464ba0946eac115ea3e615866dc8122";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-CL/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-CL/firefox-62.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "35f964ebc3133704d95cc1ecdf0cfab7c7902b7d22608d0711dfc5badabd262df52f10516a5a3c4635bbc3fa5dfce2e7c73a9362c58768f54a38abbb4a8ff55c";
+      sha512 = "3c51d5fec1074ad4d9ef0dd1617b183ef3550b5b6b653bbc529c23adb59ae7e11081adf554be2924d9dae1a483403d7bc570379cdbaeaa3bb262c678def252eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-ES/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-ES/firefox-62.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "c728a0cf0d75739be5db224a49e1c91e779456b75769898d1097b443e3348e12ec11e6626bd72512e5d81ae22201be55043bc0f82ca74123178cb637f8e44bbb";
+      sha512 = "45f0c26958718df7ae9d7c25e9e7dbd0a2358a02b46e8927f38b264325b2baaf936ff371713abf334afc3eb99a069372ba53efaa6514384f225c1e5353b4afdd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/es-MX/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/es-MX/firefox-62.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "58c2ab98acc72d0e5421f6d14194a0c6a14a443290fb1461ee45abed3086b5bd6977c0ad4f083ad2c7b7cc84e39f02621b248c6ec0c50823d15c2778636ff6d2";
+      sha512 = "9d17ccec770e1004149bda6622a27c5ec9fe72ea6c8e0c43adf20d2afd6f417a8a89ae737b3e1bd51dc520747996eddb1d489db0557b825fa15ada232af58e92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/et/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/et/firefox-62.0b1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "b73a8057c6a8ce7091d0d9717ee67790ec13faf7eb27b2dcc696a465c291e24fa7e9630c7c0382dc3de2f477c7b476e84687a0fa49f84ee1aeb7b4ef47c76e13";
+      sha512 = "c1cb2baa3f4698818f2b914f66e95f0d09755d28b416499f046d5bc043cd8dcb07fdd01a302cf898fcf80fbb88848bde740a18bad0feb08c046f08f44ac58f30";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/eu/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/eu/firefox-62.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "956df7dc028b820af5679b731578331b98d146e843da68796f878e939e8f9ce60355dce3d28093b4cbcb2052083f29c5e412afd502307895553f8254f3e18b3d";
+      sha512 = "05e7a366441e6672d424391818fa662473a30ca6b894e928ebd77c918989346f12bd37b03ae442b765168dee4499c92fad460941b11d21373411530771fa093d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fa/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fa/firefox-62.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "5a2f480f6c7e120eabc19f629de687cf4bca8c824b0c693aacbbf7d0b7c577097b03e5eab2570bd127cc36963c85599ea1355f2ced07d283ff8ee964779167f6";
+      sha512 = "c36a4962eafe222db6b320a2d5477ea37b7f9e79db1ad9ce0e13c879b876d3adf790caa148e5fddcaea8890bb6a2c1d0489d202842868aa1851312ff50e6cead";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ff/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ff/firefox-62.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "afc19bb38a30a1227babd3b011ee1639cafe154f72b67bed65f897b7584ed8509ecb59f176380cb1ae0f6068926686e3473ec63ae8b68a75cbe5c8c32aa97224";
+      sha512 = "2321bc75c84f5700157a5b774437ae2ce63b791fb8e4d9dbc5c66df39b6a513f1b2669c605ed5ae0ac1890aa1429b4f342099574e89352dc24e270ce1ee99a36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fi/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fi/firefox-62.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "dab0cc26ab4cc2f700867140715e4f5a63d272b053550d69783e20794e167a4b323e054d91ac9f0aa05c4b82c60618fc37a9cb6003ff8d92cc6b39781e25ed78";
+      sha512 = "4982001bafabd64ccf7c761efd142b02e88c03fe5c8d245a8918f4490436fd8778c149211bde5bdabe6f19d30ff3cad48a1c6462557008a3cde6df369f96007b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fr/firefox-62.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "6946a4375ec4abaccf6326acbdb775dc2c9c866e8b41eb1978b7e9525f0865b5c6e5b6541a04405abe294600eb97b53f2fc3dc25dfb2c0760861be25075466e1";
+      sha512 = "2f68665bc1e0f933dd5cebaa76133d32d1a729520022ca76708ecdaf9e7bcbb27f365f95cc725e0da44b20239cf60039526850858f9d2102a1736fdba7dbdea9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/fy-NL/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/fy-NL/firefox-62.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "e718d94a1d5c1bfb5f19317f6eff382c2ba5549561bdefaf1c67c1a51e68cf291b7f77dcc8a4141b53abdfda9e7f3806166a9675c55f1f3397e9c1bd41f74598";
+      sha512 = "90866a8c0e7c1f4cc27d69e03b24d47505d34ca07d54f1bd5718ab8b440ff869fc1e2b359f200f05ab77b5360b96b2a1ae4a5cc1981edac41c9db0f187264041";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ga-IE/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ga-IE/firefox-62.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "31f571ae0eaece944002b1c4541b8894d860bc8987d0c914cc78fc2f5e202f4c8733b48e350f443f513e998f654bf6fca1fff80811f380c2c8babedb5d7a1f02";
+      sha512 = "ee503cd31998e51cd9353129ceb204879c3acf24bc6cf5f09a4cb81a223cc62a360190d6ff6a8742bff8a37c7740a475f20cca723d7afad48ea6acbd1e67d376";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gd/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gd/firefox-62.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "f288337f68922425589edb57cd49e9d1d468a60d9172c5d514719e5c2e2d1fcd3ccde7f2581cd58a9b94c9241cde3e2a3ff24304e452459808ab74100ab30242";
+      sha512 = "4fa5938eced70ca43010b6c390e3dd97e5cd27e0355d217f100823ba5c2d324795be340e71d77dcd2cb0f213409f04c51866a31fd1f913524869f4899414d0ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gl/firefox-62.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "bb33fd8d03f49cc1c993d9d95aea3c8b739fc25b266ad394b725d16cbdf06e55a0330ef1a9f749b0b55b6724eb310470dae8cbd0927f90a9f321290beaec971b";
+      sha512 = "9c958f29ecc41a631985edb6a3744ca2ae132832b743fe9f43b5b308b115e509dff110f61da057780708d2a998110062f09a135b2e53e896f3d938ef9c821c33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gn/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gn/firefox-62.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "2b3edfc6fd42a8bffd0035512ac3ef8393acb051852af6368f772a683cdafe28c278f305f77936e03a2b8273233ea583ba12d5709d1a61735c328283a57936f8";
+      sha512 = "94efb1247d9ceaa1b1c2e79d1163dff31b8b87794ebdb22236f111e0bccede73cddc1ccddda387d8e7606c9dc0295167d0941af6a56b456fd2776481ecd7893b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/gu-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/gu-IN/firefox-62.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8dcc7f8461e7a296a07f74864e853d063409bf73fe7edd8e35be9ee18bddda7f2f8307ffd36e9e2fe5c13e777ceef8718b58894a81a963bf35b3dc40f04e3976";
+      sha512 = "876a944f415aa830b5b7231d6feb765640ff4b7cc0bf6c40f12a4d03acca6feaef7d7cfbdb0de8ebbdab112663323b3adb08b92b32bc241515b433640431e7ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/he/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/he/firefox-62.0b1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "44957ce39dc9230388cfde78652d88d0a6b283a1e8bf731ca6916d706ebde291045d4f27e3a0480dcfb97f8fb4bb68e03d5009ef658cc98224002ec1ced82fc1";
+      sha512 = "e04deddf11b82bdbdb0f98be9144423735bbbd467b6f2f15c2f6609b1ab3a3024e7205c2397faaea1d817feb9f71843458c9c4e054c57e72cd6e0215c0151783";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hi-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hi-IN/firefox-62.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "2ef4df45864245c3e8a5b276031d0f3dcaab8271d253b07d79cabb9e0098d59ccfbab949d10a843e946a01596b51eb8d4c2c31a476e877c050324806b4c07326";
+      sha512 = "80d4d38b725696dde0f0e71aa325a4be9c34993fa0a98f1a05eecccf1e34e6d7c850d94ff2f14578a0dbce9e697688f8af959e4d9fd54e6530f1dea0d037a0c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hr/firefox-62.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "da0e053a5cb88481699bdca777e9c930ebc2842da4c114237c49d40de6811e2c7e9c3d3a3b773a9ed2a7fe275447e3e585c0440dfef6450b6b57b58436233c53";
+      sha512 = "5f4da7f2b75bd963783ca0570377477407fe5778be2f1727488b26933960ff473318be2e92ade00d7bd0996db1f87636a800e6bd94052e2c4ab8972bfebc8fad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hsb/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hsb/firefox-62.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "40e362ea134e1a03a9394f3c3b15d428b309da30b209553fbedf72e7b923439d4133b5e6bf8a79a2dba7d37fc65bc03f90df5608f360588ea80ac6208f13595a";
+      sha512 = "d89f2dbb3e4934f750f5ecb7a90a76aad2804f44744f6925ba2a805df2a55bd3ed6390ae889a9569bf266f06d2dc92a38bb4bb4c125a3164f574e1edb00eb1cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hu/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hu/firefox-62.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d9b152504340f00b1ce00d7be1bc4ba1c80ebe87507f7cb3985fab52c0a04238e026b7488f46817102b578139671c81709ba6fc5edb4eb37b0182c5c52a54282";
+      sha512 = "76dea45f4f224bcd92ff82c3f0b9967ea6cb9b0d9b60079ba8a3d105965dec539c50723d5203f254e6d1fa43cc80da0605880625bd79cfec541d3dbc85fa8cf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/hy-AM/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/hy-AM/firefox-62.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "c36dc4a3a87230dac351440cd66ce6f6479f34b65f018f36d1f3cf3b6f5eaccf40e9fb15dcf796032a2cb08028ec8b7c3407c03ab0bd1330fd669323d59ed78e";
+      sha512 = "2d21caf978ae853c376d94d9dd0b14f50f3ac5415bef319ebf5131d8b14bc496d8f8da09f3529e4b910971042965f07650b8b82e6b9b1d41eb456845dc52714d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ia/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ia/firefox-62.0b1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "cb0c4ab408fe879c9629bcaaebd4ce34be033aee6cbaa2a7360f68a40be03e0ff79e5ca61991e3378fdce28278194ed54a9c5273be401ce30c359b22aa2062d3";
+      sha512 = "8a463b132e199dbc7a6c14a054e23ce93e466e1b9ae43d16c41ab6eca8d31dfabc5caf0aa9068244f23d158da6e0e69920a21c77caa6074d18f8572cb8c847b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/id/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/id/firefox-62.0b1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "98c413687af4db1e68229348290fe426d607f264179b1b634eac4ec87bcb36dce497ac25a458a97873a3f8fd962a47b865f8f5a5c5afe4b5beef56e46d1aad2a";
+      sha512 = "57ac16932a18617f068242fb2266f48ac0fed528be46a327641eebb8740022f032c76981c526e659b0a81d0c68d5ab2b69c40b154800e98b72cc9140afdb182b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/is/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/is/firefox-62.0b1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3647141ef52695f91ef303aee2e74accb78336fddeff84411d2f20eaf4ee89407fd9b80ec9667587d5cbe81bde846b01893330e8576421a9cd2eba937b31fc26";
+      sha512 = "d7fcd1795c577ba6db8535a2ecd11f3f5184752b96b2227dd62cc0520e2be72d7e4c75e7506cba1ec4b6e131b64d8fe42a1e8ab05471e2b87400a88547b4224e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/it/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/it/firefox-62.0b1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f20d33aa7081862088d25c5bb9c8ba90a1dd4a5951045ef80768f34216241f7dcde2957970caef715d3d935147f1254e3feb1269a302c4adedfcd76218445bed";
+      sha512 = "11022485019bc02b316705d5d178fc5d32e2e3161dee676acbac326e2a80d70905d2b8b743b1bce733e97208ebe9393d5a0f852fdad15fa464b5773a6ded2116";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ja/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ja/firefox-62.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "32a3c325fc8a258dbed4ec5af6cb06a1d9829cf87b2863644050775165d0df2df6fbdc4a4d553f45567141d1c09a0a5a8bce3c7d4cab773502f0846f6f0ebb0b";
+      sha512 = "57efa4365d3da6e69bf2fed5f69b148585ba72f21c515dd4ba3bc4dba4ebdc56975b74b60ceb5451027d1244ebef83f397822e93900c86b1cdd8e18056d36a32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ka/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ka/firefox-62.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "ec51621ed8adb6141d7055b82d1bfb11dd97f492d1927c709216d5bd57cc5b14f4f07b40bbc379f62a364769adf5c907efda8936c39ac077a56a2a6bd546ad18";
+      sha512 = "f3976a6e621fd63fa405b3b0e513842ae2de1e1943f5a1c5d26a447b0d9cd934a8a13f4b9a7bbe69365de4669246417671463bba2399ba1b8f98023083bc5003";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kab/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kab/firefox-62.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "5e0e3b8a238f34445380fdec1bb4ee0d5fcd60b5e6947843af19f0d770c497508664af78a49c339eeb08049a870ab0098ecd6ef50bc1a3527fbb6c891e54edf7";
+      sha512 = "a16a5eda06f2cc7257b780bc3403b01cb4f183e520f43599b33030e5157a3dbb664e738d90de037bb7e14790f7b87683ef6290a75a984fcc8f7b87802ece8b55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kk/firefox-62.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "a3d80dd3ca4e969a9779e00ff24087013c5497b113b086d68c3dc33c6d05d98921014dcd81ce7cb871274f9d9b825cd1d09ab867d7329503411ff68431c947c6";
+      sha512 = "efc2c1b2dec9554cb099d9d415d9edce10525a5c82ed011c82032b89ef23b330c360b22c70deee4fcf2704d8121b2f7209cb1069fe415df17135cc23988f8d8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/km/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/km/firefox-62.0b1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "260d5585d544c1cbf7a7762bd2126041026dd281500475079cf8889a03cd016d5fb7d6b3da7483a51374cdfa1b0871317689cf248d32466885e0d92055e80d31";
+      sha512 = "11bb2c1e223eac93956979f12ce8046fc4046820623894cc0284ec758ca677cc25faf5dc913000840527d6c39ca3e05ea4ad1d67e2c896a00df3b3e42f8e08a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/kn/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/kn/firefox-62.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "92338e4f1d92ca91fbdb7cef4c999c6f78a1aebe69d6fbe46f7a67a13f4d63d838fa33d602990d3b10c160ee5e1c595fc9d37674bfea8a9e40088e057683847c";
+      sha512 = "456289e3c99016e5ebee2c393bd727205488228a4b52673d2e658d8071a9cc2a6382f9e5b08d25d70d319d1900cd6c0e31519b52be561a35ebbdec5c6a3c6d21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ko/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ko/firefox-62.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "6066cdbc6603db7b9cbcbcc85485937a9303466091cc737fa5fc5e219f7758fc1c0198378ff2fbc9a63059d6d93b018daae15c51d264c3e47ce3f8c4450d4418";
+      sha512 = "4fb02aa4d05477e8f22c8821ed921b2961ad6ba4bb1b049f24b1a6f255903c8c6260eda4f0f30cd6fc17a7836edf7fa48d3d7cfc56056019636284a92dd0520e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lij/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lij/firefox-62.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "eb546ae48d9d5d88ec861d51bec7476b64a383be32fc225d41f86cf1f4f3cc4d4df2238d067ef50d7540f666d55e7c8d7dcc0856d24f377117ae310cbf47f474";
+      sha512 = "7c52a19bd02d7daa83ceec382891f345a376fbd9a8627f5e6f9312663d7a544a382f2e2c23d1eaa8bdffeedacef11ed5e1dd052d7c52ad527b840dcd419d35ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lt/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lt/firefox-62.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "4cd5648ab324ff2d9af506f3888a53273cb4f6848aef9069f153081de16f7159a376710c91c4dc4ff489ba5462ba3d91e5abbf824d9abd633455a6c9900114df";
+      sha512 = "77dd939383cb68dabce5a29ebc66ee701ed4ff521be891f6140f88e384234ed0f134aec2e6fb40e3e09d451d0501820a5b0b700388f7ce9708d6f39ec210a17f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/lv/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/lv/firefox-62.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "e54cd1faeb530c680fb38c567398f208d5e9f9fe1ce0b5db78c8ed46432703f59f7ac1accbde86ca78617cdcf177bf2c9850dac127490bfc71264c2c64f7d026";
+      sha512 = "d7761cf119cd718b1862dad2bf2d24584836a1017c161d342e8d68ec036695097fadbf166338be07a7a48093bb29d45cec0650e973d33ef4886781383760732d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mai/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mai/firefox-62.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "8d7b7d264325de3040c981d8c446d1cd634cd7742eff7dcbb5edc490e43ac4d5821536d5ada900ca7ed35ebd2f7f3e935c76fede38dd16803ecd1cdf0a067f0c";
+      sha512 = "45c87b9ea504e47f7467198f35ee906bbd22375aac1e75b0e3102f4312cd8aeaf4affa40eb2620733d30ebede743b0dc7875fd5f7dbf2de9e702e86d917b483c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mk/firefox-62.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "dd740707e019800784cef932c037d779380e1f3db20c888469036b228a4b261050c072d38ce639ddd9caf63b143b5dd970dedc379a03621203479c148c2e2dc9";
+      sha512 = "284302019c6d499431b4ec1d7cfaeb1bd344720cb41b1ee3da937d07ac38df278099116ddd5b160b4ee9e8084c58712aea1e1eae2f93c5e9d330a18af733b770";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ml/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ml/firefox-62.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "695815665c4c3381f8fecb62d402aa7a868b8997a412e4230c92c0fe7ad454f249bff8f7f1a92b2bb002fda4f22506ffd988e6332f6c4a8a026b7216dad1b4f5";
+      sha512 = "c3631e69c78fb2f759ca20f59f4378703c9a21d62c138a628c7b5e7becd7d680c444b5a997ff518279cafee82da0dfd8f2f2d728ed53620123bcf7eff6ab1d1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/mr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/mr/firefox-62.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "b7c3fcb0f41dfbd09591740e1121fd2c37806814ff9c7ddd8dd683b86c6445ff3b02f73338658968cd0dfb9487e779414217f29e81d4b415296a72349a575d57";
+      sha512 = "38ad3b359b6cf39d4ff74afaa88fba269499c5eb5c5d3fe6622f3d63a09d797637fa4a8f9ef6df79dc6145bb782ba1b0af9f26745cee34e1269601e93dcdc035";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ms/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ms/firefox-62.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "036e8d6536005d77c5aee1532f302e0aacc074e005f0cf3d5f5f397e573481a3c6d3589d62dc84ec0aab9d9b2ec4a2aedcb4722222e13f8f78819177b790c3d6";
+      sha512 = "40c09a877ca3606749997bfbd8cd71c38aa050e4b394983dac75d6d4c060c613aa3332f1e96e1ac809363c9166d1a263afde54550578f657df64f69ed1bff88c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/my/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/my/firefox-62.0b1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "185286fe6fb8037240b07a4356008a3ceb70653ea2fdbcb25c7882c395e08e7d64fba7acb394447b68e970dc2cfc4936008ac0167fde2b8b4f2113bd5c5040f3";
+      sha512 = "9ce0e16e123cbb0cbd370124225391eba5a3e657c008492ec4675b431ad47745299e73075907bdbba532d029052d9522359764122678f92b137b59133cbecf98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nb-NO/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nb-NO/firefox-62.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "7a199a5fba5d3c954c4489533f48e4424908c3d141d8a3f6055c7d4a6d071dab9b0d52a85ca899d0d662aa5668d9c5fadd8238ea9ed770097dd15eaa6b17c87e";
+      sha512 = "86e0880350b015e77c0acd480da9a20d83349ce3dda110880565025fb6875e887025856cd17ad87c1193eaba53d8ab04c2b69f39235f555ed7ecf76d4299d08d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ne-NP/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ne-NP/firefox-62.0b1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "eadb4fe826c22d067f91bb010e7176ec6b0a890c10ff0716d68e21f70b28fbcc8e65739af7c6c9ed919abe5e067271e55285a0e3d809c7c1ba65376e8e8b8347";
+      sha512 = "13a4291276baade6d8ddc1de73b9222fc121549e0b52d2bb86838a5b4c7d1df3ed494c4c8d739ea3fa39264419888676a8aacb8e7501290a182efdea8f41fe16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nl/firefox-62.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "6bdfa9d6242d17b4396a25b5a4ed30a251c0aa85cbdd9a53bb89e0496673f138e8d3b938a2f7181523085dc3af0ffe31edeab78531f3e8fc35484fd250688cb9";
+      sha512 = "fca0002264ba3e6f4a661bfa2f257bb71ecdce5d17875fc85a914f9c33f02809b79def6626fde8f659b81aa61da60600edc5e094a71e3d0673a3faebdd1caf6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/nn-NO/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/nn-NO/firefox-62.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "af7eb3ea2c18871c0bb33dc4997f38dbb7c6896bbd0d1defd027e4b64df65799e50c01969c34204f5f212389108d6d62cd2d52de33a55aa385b2d5eef34e4849";
+      sha512 = "ba286362b9a13b069c4eed0cbc473d31e8ca3a85b791e60eaa09ee354b9f2fed3c62b3a77c01a85b68e33f30e23f8c6d9adc6c6f7ecbe3146a0401d248ffe77e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/oc/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/oc/firefox-62.0b1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "59b939410f19f7afe089c8540498304cddea08a0061dbc1ec2d65be74081971e65ec3503dad820fae0126984313ca7fe36881e347e1c20f69feaaeb1afffff33";
+      sha512 = "5949a4fa66a8f783170b4deefe07c0fbf73790c53ced93c30553effa03d2942ef00c2af7bb2bf1b83dddd2a08db72a2c305c4535d4bb60666fecaeb4ac418ec4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/or/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/or/firefox-62.0b1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "5b3c288c6f5b09d21f600959bdc6fdb1b7d0529be4fdb3ce9c05b0ad3003e90ef538e6c1c058d0d04acf59e72616027c5a2eff25aac3fccaab7ff388c52d7a1e";
+      sha512 = "31bba0616cb9ef68f9d2bb451bc5d02d67adb8fdf4e8214cd5a1ad49644060fb23beeaf1b17d19217d894ed0127208cee2bca2b031b08b837ed3ea7b1fb0cf81";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pa-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pa-IN/firefox-62.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "5b3a227dbdd13ccda515efec7d10c529fd04c9f0a91363eb45c2e8b7386654ec906c83326c22d355f2a662f22688144317d89a302e59a7cf8d368df3910b1add";
+      sha512 = "8961151c03a1d3bd3a72cc19cba4491a0173189125305b30f984457668af55f76a609f78ef2dabf14f1b5d66a3ce2d0f332f2cb4a8e78b8f1cd7245fb2c232c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pl/firefox-62.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "9ca212e82615b9d7f95358f70e0f294001fc94eebdf4e96754c1880e136dcd428f6a8ca04b6c319587e2bc5a89b762e94f27c0439c3fc7de6b1e9f1d83ed5bbe";
+      sha512 = "58ff6108e529ac5d7d2a19a8b9d8d2ecfe5aeb0ec7fbf52b80033e40b2d5d79c33950149cd275238072604a460abee9bd7d499464f1c4dfb615334b516dc5407";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-BR/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pt-BR/firefox-62.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "b0bb415701de65165ea2c90ff837fd6025791b7061930999afdfda2db9d77ee4ab38bd11288db3a668332a25915fb97e44d26fef5bd5aca8052cd4ce2a0f8b4f";
+      sha512 = "39782bc11d81c9ec558da43237915ba1bef642187b6747d550cc58677103745f125703b909e757cf3b41a0706bd4a1ddc408eadbc01a8fe2fcc1daf827ccd730";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/pt-PT/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/pt-PT/firefox-62.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a6adbcae92503d65cb4076f7d917b7dff21396f70049fcc9836b4ca91c1d5d6016c1f74e0572b10361e9bf3327d87c2abea4d179bf2daa25f2b506c6cb7ce808";
+      sha512 = "2b2ae5086952de1761459083605260dcf1ec4ca94f15a40bd2272e43145516b6e7115f2d8d17926399a563b1d25e8477174564af9f697606df85c816fbc1e1e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/rm/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/rm/firefox-62.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "d86dc38bc86b27ab0b8cfe10b09f8d78219ec282690a5f876b174877371cf7179f26459e927044720390162a697ed37c2684225722c23acb26b5718a40b4e399";
+      sha512 = "42fc889ca0fcafb143725bb616ce6b8f70dbf802b024f183b8a9470c72119b7793e275648bfbc94433875a97197b913d7942df361ad0b6f8395ec17c3be6e2d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ro/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ro/firefox-62.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "3441346f8842a956921658295808dfbe0c4be04083779409cf19846e75d6287c524441869252d693a23bf5e7794466e4ec9f6cd3aa363475e1f855ca3c86c872";
+      sha512 = "86fea7512cde6a583303f6ad700bb26aaf5181ad90596b952df5a5627d2a78b5aa88337d68ff31b914146c474c92020d9359fa2243b336987e03fc003c135439";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ru/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ru/firefox-62.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "47c370cc4e1e759fb498f3e7889605ed4b9db6ecc7f1b324d800db89ab69369dba584e76fe2ff6777d47ba60ba3f7a628ca75171b7019c65d4d0275476befd96";
+      sha512 = "8baf71ca8b18ddf6c08d469d41c0b8c7d9ed815adef8fa8c8d312094bc55f863c574b3e8990630aed79b4ec2b4965182eaf8ac6c105e68f82dffe143118ffad8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/si/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/si/firefox-62.0b1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "6dc7f968e4e96c99cb12e682ce1db5139465816addff1cc9235187b8341c7f94dc322899b85eae96b85ff0abbafe937916ddd88750bc9b295a06207e1f8dc0fc";
+      sha512 = "e5cfade7c16e0c04f0ef12f5a867a9cfeb8570439dd16d6ab8109bdfd3b6cb45db60f7e2cafa9e3a3e18a7e634d4491a72050e54d3988c64744063c20cb50532";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sk/firefox-62.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "3537af8e430f9ae41f5ef4b7ec5ed883f4e70124c691db76420d69d16a19b06c0c9a29e4b17bf44a81a85a50bb9ed6bf1f897061d5e6a79b72762b61e66c6aa9";
+      sha512 = "66ae74fabbc2079a14e10297bc2ecac3578274adf4e67532a14a8ccd49cdd043a5f6c3d6a91bb3ed78b2d087dadf11bcd75f1ea504e32f183949e512b9eb72ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sl/firefox-62.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "6e521922bf2e5839b269601116bdcef0cb6a4c3bd8ae75c68afbf12fa9834b24da2e9e773121b50d7f38cf2dab28826ce246cd87212a9b742d0a09a2fb118103";
+      sha512 = "1852ac0d4de217a4531bf70302267899fa94144801d10bd8f41694016a66e0662cefe45765240990c3747baa39b10cb8b23e7efb647c6cb72dc59c7d44216802";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/son/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/son/firefox-62.0b1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "98a1ef288662186ecdad6d15ce34a78a7385d0576c923a330a1fccaa36a79ee7e2ff8b8d874e253cb44df24a596fa11ff79fd756a814589ca5f43d277665f153";
+      sha512 = "22707848521ae418a620255174790907c96ed6301a2d2a032f095ae17af1eada2b0a87c7a39a27ac3a63b710e7c96638979ce47aae613e4d0b1ae9c1728c4f07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sq/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sq/firefox-62.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "1a51452b80bf795c72b9e4696768474bd21bc1311be6d943be0c4bfc8aba9cdc3e8829859ffb5c73fafbc7e5be0d5bcb27181842b0d55699e1a943c8b4dd315d";
+      sha512 = "0c27782b9aedf9fed190ad95e9c8e194ed0971cfcbf62741e5032dfd95f80dc7420a7364e0fd614587094de98ac24e4c06cbb4eac43ddb0efeab0d0dfb42c996";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sr/firefox-62.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "2090f30b3c24125ef4c3ebfbc8d11867d2730bb4217855384d7a61a1b76aefa6223dae5fe227acaed2316697fb877214b2f1c9a62e497ca026f2b1f8d91d48fe";
+      sha512 = "d8d9b0e082b002b99a8aeee8b23885bdad9d405a58eda2180b5f46c26544c3cc4810882e1f347953900588825450b3e6b9d4b0d913a2e454ca45857f9f2bf5df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/sv-SE/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/sv-SE/firefox-62.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "55ebddd90a2504be1cff612965df4b7521c32c9adc168e2323a898219d2780c503639b9e073b26928838da533cfb06dc90c98192a522d9cc2192bb1a82c406a5";
+      sha512 = "7eddc9c3cda027c8a824f67f99ea5166397362a4305f6fd6907d15542c5fa8a1ba34b7f5c90b83eab18ca5c610643622702332df103373d7a99a954567cc5def";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ta/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ta/firefox-62.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "cca9e0c313f019e2cb00ffd1f8343d78e033cbb88261d2b58f543ae7a743aec6f5375e88f3a56aa87bab162f511a1f7af147aecc8bf3d8c1533ee4fc342d5993";
+      sha512 = "58e601d01ce339b4492baa48be9e708c243f65949eca881b6f2d65902965ba0c8548bdd5ca92b5139983e0a451db516ed1d04ed81c159bad2b4d37cb3c482f7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/te/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/te/firefox-62.0b1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "7cc45e847c58b11716dbc0b26e7a5de7950be959e4bcf7ec2a245974494b2e2d0ee06c62696e1b1b1b2959fcc1f728e4b354445ba02b5e762fae16460c3fc2af";
+      sha512 = "bff5f9a38f36e825ea6cde6a7dc332ec9f82dffade16be0fa1bba14758284664ebe7d8a3564f163368b0b0b3cdb28b97b7f3bbf335ae6b7872cb958b9a7b78ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/th/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/th/firefox-62.0b1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "aa1420d420388eb49d73b09e3dd6313b376b233e3e4e681f9b284c59a87726cb85569490e6978524040825f0c005aff936e25881dffd0d42f76f07060ab2dc68";
+      sha512 = "6290c4899ffd2ee6d42888b7a1c4b1e9a53b9bd038d64b64aa21b07a79fb256d80fe0621ba9a2bc4c98bef600c66cdd5e7c9c4d5c0e196617ccaa114bae56ce1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/tr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/tr/firefox-62.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "4783e93f6405cb1a4bb66010a24cd41a957efe638bffa8ea11bbcbb59f0a994681775ebc1db242fcd3abf46cca1050da0e25f60fb1bb866159a259bddbaef9bb";
+      sha512 = "ba235dc6154a27f2351764900bd22f48b3cbd1eef854bf930be59e0d7d251bcf47d41a9c94a859427acd4d3db669b8d07e4e867422e3d002ca0405fe74cb4ff9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/uk/firefox-62.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "0b8ab5e88943be553a2a6482c266f81c790732099f3dba6614a1fe2c520ec4e82c18fe5aa525e40c425975c71ea992da6b04f336bdb52d1ce069c3cb715ee235";
+      sha512 = "74637192055d2c3c3a75ad49147485d97f865026f43af3933830d513f501b255b1280349a7e554c4060b5b030947a8ae987e57e9465eeb83ae59d316d434fa01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/ur/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/ur/firefox-62.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "03afad45c029f408369b44a5c6e06c7ea6d348734b5d8af90b94b0216646cf025c11239015698f7d2d94921d583a13caf57cbc176d55d283b990496dba6fa34b";
+      sha512 = "f5ee9bd844fb230c445dcee9e615a75b9ceced1e6e15fac214a0d7f0c511ed1b177ad11885cc916b52b6556930827848dbbb22457717eeffd8e4683074fbae14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/uz/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/uz/firefox-62.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "dcb586205dd3965c511ac6d675d4974a7d3d3d9574e9db1e6abda9da93cbc197f76f0c7d656778211f3b4ade70733953b0753d58fdad45eb94faa214e325b8fd";
+      sha512 = "1e4a2af576bfaf3bba1c9e54216015ee0fca177112ad5cc444c064d020cb1d5da1d63b761c6f63b0528bd073582ad3f106caa6cac4c3c56cc81687e235ad8b94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/vi/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/vi/firefox-62.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3bbd74b322121d2c82d17ea137985830542c26a51fb154d02be9f09aafc5456160fc78567a21ba0a8cebe0b9f86aa7e7d83b69865517bd6a95ab8b34573a26ce";
+      sha512 = "bbbb982f4924074efeb0b3a0aa998246275e9dbebaa2208bddd400a3ef367f5a6cf4377453a3e2ade02401699ea6149d39b65ad4cb88cc32da05488f5466051a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/xh/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/xh/firefox-62.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "ae0718ff478b973fa2c76470f5e2c01014f270402251d8474451764a431b7cf43eaaa59373904446c8e2045c844a35d4e2027ba2e694d6cfd89c7a38178d9187";
+      sha512 = "d60563ae6e359eba3a1be3d84c89705c13d30abf30b45b1ba7a1ecaa10e9e3520d4801317d48ce3b6b7c4d2cc2ec79e5c14041561cd3c5664a27120afc2a45b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-CN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/zh-CN/firefox-62.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "fcf70e05a796cffb027d0c0396861fba4a58c98ee773c5cbed38ffe09786f98faca147117915c64fc9b4d01081de55d4689547c8767d84609b66927d50982176";
+      sha512 = "9152ffa08f60b1474650c41188d64eb7239e9a78ae8594982d1e37ad84e6a3ccad04e78f2f8e13d263d8d3336f4b385a9ffd60015ad0d5326b453a4dac838779";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-x86_64/zh-TW/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-x86_64/zh-TW/firefox-62.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "9f3978cbb2a51182ba62fa68c09d49e33cd0fb68be7d8de8de2e335997184648981cffc8e90764452bee0fc81a26ba9b8896ff630e81918b4634e8cf6923c5d4";
+      sha512 = "24148a13ef717ed36a9787e433b9f9b6262912009df2649920ae39a04dec3b68959b2e9abc15d376a64f8720669a9ce9e155c856698897a7efa97b0b45042ca4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ach/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ach/firefox-62.0b1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "ab140f06e11e226bedf7bf01b2f5c366b654583bcdba17546c6b8cd144ca6a71424f774316985d0885733a7702d201995a25964e2015c278028888a946c26099";
+      sha512 = "2a69bce7fcc5691f5150b8077d01b5fce140113eb74e2934d2851c76642ed7c2e173ab35271d3cab11f94fc8f3971cc23d5159bc90d525614e6a759e1d7c72b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/af/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/af/firefox-62.0b1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "8d934c0823d899c8a523a131eb31a7643b137f795b94c4d73cd675e0c10758cfa051958297dfbff57238383284eb7e8986ded98ea3b952d4b60135e426948bc9";
+      sha512 = "443eb00d24ff3410b1268ba9e469239246dea7d4b989ea4d8b0f15b8e29911675244b9df76f6f38a3341b3385fc32a5394c5b9f2272257d07cd662c1d0397159";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/an/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/an/firefox-62.0b1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "1a0523a8900909bfdb396c6bb16072918a78a65011f2f88d714ca74f8bc5e9f667b22e7a30529f985f34b55c05b547209c5d307d4c576cada9bd5af144718f6e";
+      sha512 = "b89d592d03667289b9582114726e175cbb38f2c17f16da4e3d28d89d12868bdfaa1edd2109cdbeacdb50c54ab27467926d5dbc3f9cd364670cfa6df5f45ef552";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ar/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ar/firefox-62.0b1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "283ee30ecd49786cf23207cd495aa58fca84be51bd65c329418ccd6a09e058222ab1d2cadacc94074b7dc35707139659639cf42ebb6edf1819b9ab5520cde691";
+      sha512 = "5e18d15894477db914cf42af85b4e4d4676f93574c4cc04418ab32803d5709ceda37b283a4e0bedf5e374a54968b106f8d9211f302c7085a8abab8b02512da71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/as/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/as/firefox-62.0b1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "637fdae253df177d12feff2cd70bbf308dbe8f2bd51c09491de35dda9e666428f1f42c80a110fbbf38489c2ed6196e34fa8e6f9c1eacf15b15d721de0b8f37ec";
+      sha512 = "92c26d4084ec2fabcd7c1ca3b5b69c1ed9396bfd7d6b1432f41a1c07aa10e292c0ff4b5ea509d2503cbe815a165dbf3400a39067dad2c266a92629cc5bc285ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ast/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ast/firefox-62.0b1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "087bc7c5e22defd3141cbccc271e0be8af29fdfd4d1842cf6c1ca1f757921cdd5966c3c6351d489a3026ccdd75becdc5c1b318ceb64014593df348309d915e8c";
+      sha512 = "882c6c30f681b495b971ec4499c79da7da6e51f2ec1c954071bbe674f07280066cbf66baab4d9de950b0073b7aa123d2bb2aeb69203e54dbfe40be66a6552769";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/az/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/az/firefox-62.0b1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "68fa700cf5e085361bd49f53ec79fb096820e9f4528892d37c8c846aa2d3bcc7b39de0bfbcbbcdd8a23a52ba7a1449196e8c81909e0f8ad2924fb2a68abc8fac";
+      sha512 = "1e5271ef465c28ba10117b8d9cbb02c29c26c287045121c111a8576d1edbee1fc66b16764ba18c197c6648fef40146bf01dced7a40b9e643ba925f4f6b771925";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/be/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/be/firefox-62.0b1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "b27df80f1d7052b5ac80f8a05c20b71f20d13b9f76b92ab10fc3bb591ce8a6d2d5660aff11d2d5c996843f60b5c0f661bca5f750a097f542e8ce3c719bac14ed";
+      sha512 = "04211608dddae59c53a678a51f8f55061479be40426745fd5b6ce2c10cf6a6f5f6aaf97fde1754101e9824b1de99a767649b7eea06e94fc4b8777575f77c63e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bg/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bg/firefox-62.0b1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "c1dda1a57ee7b565e779b33b41ba7a92eb49b8ec4461bb388761fadb69b33011bc26f0e253d7b9902cc526a105fe783209e8028dde3ef8c1ded2543d17e0735a";
+      sha512 = "c7ea5434cdfbe05be4c99a46564d199207d3dcdaf817da34b3e4d9e66ae4569c91b79b03cf5ca49855c3cd6754f42c63130c220afe4ffeae67ed0ec38844103f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-BD/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bn-BD/firefox-62.0b1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "fbefb442d38a01c3d2b45b2f9f251a1dde050993d6c54a58695197a57e493a1b0c699ca6995b4111af230893912648b1e0009ae4b852803d71423427759491b4";
+      sha512 = "6853afdc3e36ee170e4c58302e6d02f3f21881395d0630b35087dcba417e62af36e193a82f6b95bb27526ed39f817a7da61d04e34c29eaed57b946dfd0d2a83f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bn-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bn-IN/firefox-62.0b1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "dac0f5d616daaa19b2507ab9d43a0127d39bb41ddab92519f33f0e9950b34803e1fabae035d1fb803982d6f0b5bba7192695722a728ca85ea9602fb08b775cd5";
+      sha512 = "e26c6c4a7d9eda29cf030be82432fb2acb8c7a63de441f10d8ad4b14ef63010ace42376bf6768fda952645d203487cf8251870944b2816f68d1d59a098edf5c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/br/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/br/firefox-62.0b1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "bc4573646eaab95724a6b3429c3b0263fddbc65ad0250fe7fdf8ecbcb4a0422b39513d03d018311141e3cc67f95b994565949bf2fb31b41be10991fdd610d7e7";
+      sha512 = "b84d2da5aca088b147327dd22d9ad63a381e4024d046663cf85d9cfee1234cf39c0fecff6e7fb5b647c13ab40b270489eb0fa92e56c5cae9bdb8e9b91b7f61ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/bs/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/bs/firefox-62.0b1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "a8dd8a5ee5637f8a0bdcd00ff142fdbd825308097bec954bcdb8845076dc8367c09ef4fb0783ab47f5b8581a6ce4befa9c883d445ff6d96e444751fe8d4ae23e";
+      sha512 = "0097b0144eca625affa1228ceb27d53d41a8ac8d75edf74dbfbe33a2f00834c8430dd0a936a0ab47d85ce6b173b60a10e21d59e20c7f8b17350d3f6b08e7cadb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ca/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ca/firefox-62.0b1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "faef1b8531dacdded64cc0bf572e075b81690de76835c9a5a108b5d3fa0486a930bd8bec943d91f177166c51b506fed683bb00071873d57bf87c23267993f79e";
+      sha512 = "93f28382bb11907946bf66e7272219fc43cb1dea3d63035308f533072c768bc4c5d7b8be1352272f1f7ada77f1224932cfd028d6bc507d04dfff515c6cd61f96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cak/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cak/firefox-62.0b1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "21b226e39e0d02dfa3b7bde90a47d407088d327a82abf21b5002e56eb28ed7605ea35b28e15b088d6486dc9735b7cb8827a51f1e17ef07da22c019214f3b0fda";
+      sha512 = "0952433b064ebc8c347e187e616cd7a884e1947bd602a2fc396de898d8351c11f2f79a709ddd1fec962299d279bb15f2435fcb88319104fa2dd92729e34c94c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cs/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cs/firefox-62.0b1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "fe52d89c9176a4160636c04fcd2cbec1add30db3ebc64d9f2e01d2439b4f1f7412a5195cd29f1f7b7b9b6d062f880062f6fa33674a413a4257250ab764822b35";
+      sha512 = "e4142088780249441c19989ef3bbca2b2d32bc09eec9ea32142fbaf87e416b7b6317b168706f161f8e9c77e2c924d41cb60b6682d24d1f899daf00e5c8a4c646";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/cy/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/cy/firefox-62.0b1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "75f1f87cb31db73dadf4897e8336a7af2433ec89cd9cf886c5bd951aba3920df3e5f723a730607c868ce086fd8f4e5fbe3f6e31e5c364cc9b498586bb3804ea1";
+      sha512 = "59ace20cd22e6d251f0f3de856201feab581d068dbcd0bfa4ec33ab6015613e52dd903e41fec8bf4e74aebcaba3fe7fe3b6778a2ea04e567a9446e8b125fb92c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/da/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/da/firefox-62.0b1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "c0d646633133e05c792ce2d4459b0ed754598192508b0340a24886aa2b8f65a3b7487b20f6a5ba19f83cb64ce4f480859ed5f3d14e8c978c4bbdadf323988cc0";
+      sha512 = "a9b0c3479917a7ecbb6501398d19f6d2345267772a3999f484e59addfe10bcfba458fb28aef319461fbd78c388412b6615f1d581eac40894e250eb49c8f9ff61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/de/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/de/firefox-62.0b1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "583ba8d028fa48327747776c7027c1598e600860ee0b9409ebbe4755fd552c189288903e61904a16d3dd065dca030ee5d674618a8b14645c2e2705fa41c80d3a";
+      sha512 = "a9d9bce5e8ea0ee67e158424be3b8cb9fd0057b784c6bdfcb9ae40b20d155f4a717a9e83f9425e3dd831c4c54fc2120e4c3f92473c06a30f7f619fb3062d5147";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/dsb/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/dsb/firefox-62.0b1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "7b7a508fc15dd777b00a786abb9ad013f985c6c3389d78a1882323e50b3c09e49bf63391df5b3a4e91c60902ea4522b9b6eb5b93915bdedafdd303c6624aa9e0";
+      sha512 = "8f39109a68ef0f8a2860e36ef271963dcf9d71a0030bd53e7548f49f0378f678766bfe7d1217ec55f06cd02e14279edabb7b04631d2642a323e94ce0637f0990";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/el/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/el/firefox-62.0b1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "4bb687487ebcc9283ccfd737750f6724fcd787f441ed7d48eeb91133768191f04cb38770eadb854615907a04ccf1279746e6e12f8e7ec78086e97de6bae0a9e1";
+      sha512 = "5c17db7de7e441b80f55650bdfa5c6dff90fa26eab0bd139301a81e41b40bf382bc1fd981e014bce195e0e9cc45a366bc4f35da8d5187c042ec6335382ab82fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-GB/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-CA/firefox-62.0b1.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-i686";
+      sha512 = "f922ca74cf91aa74b0e7fbdc550a2236333d501db5f9993a1d6de4bdfb825e33e3534788295dab0353516db698a753bfc3414f25f691d3547aa375967beb7f2a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-GB/firefox-62.0b1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "cf50aa3949578ee5a178b665e58ec148a8534226f31838b4df01a06d4e860b61ccb457d6c3f59dae735e8d9ca8e80434b27f2d912d437dfb0695d5c5d6c9ada6";
+      sha512 = "2013c63b9fa8c3a3f53d8aac2c47c8c23d7d27bffe5ce7ac24becfdb96e90d200883a0ed8a2aa130b2d2f6c86d9f47db26a5fe1b4e9b4e8357f502c5ec3d84e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-US/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-US/firefox-62.0b1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "9e1f551c0f63e2aa1db652b884315a366debb515197636d1e2b81e6d94d5c764705716f610931d44b020ae97175ad88780421071bf000751e66ccb6935360303";
+      sha512 = "22a95c85c16430d0c4ba06f96727483e1d5adfe41dcef95e4107e80cc669f8c802eeec6dc16934473c33b822d2ef1cf080aa4ebff1706ccd4dee9b21d4107a3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/en-ZA/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/en-ZA/firefox-62.0b1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "9720c4dfe5a2a9916325f5f08577ba0517c51e517a3b10b7e131fde709fc1ad26bdfc8e21b4ec09c0a7c0afe1ed6a213ebedb603f6ff49d8be3dfa8f6bded202";
+      sha512 = "4cb771c4b43b07707b760526f068d2d41a622f7dc2c9abcdd5e5501149355d9d5ab39d8d860bf6a1b1c0f24a8d850198faf3127463158b4e62871774b023b28f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eo/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/eo/firefox-62.0b1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "58c514b410d3b91ba370ca3fa01cd6cbf2a4925875d77b7bdbefabac37b6c84327064a3086c862eb4c7a954bf86249502defa89acb245e725f521460e2fbbd82";
+      sha512 = "51ea9e1339e19a889b9f3edf067a5560f7398d68cfaf7f10cae113b498db87770b280644ad18bb7e1774195b9ba0ca2b8e27407b7f25a641c6b0660b76da6699";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-AR/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-AR/firefox-62.0b1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "da2ce694e2e161c20edd137472e1217a7ec5b90611f58992116fbf200b53006599723f7510ba2e242e2a77c6279ce6ff0b7fa61cd5d45f984ad3bde2c473b237";
+      sha512 = "9bad5b12fe67391fc8e9c1acd519344700a5d5f798590d7c861eb5a51b7dba8a4a1ce6b30d617872aeef5d8def0fa8e2378e47dec9e8da0df3a113ee5aaf9e8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-CL/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-CL/firefox-62.0b1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "eeb0d1e813e1e90da99ed7539936d3e8189598631c89cf41abad0069f5e992c972aad661d59a4fde25539c3a1d33492fabe9b809c95e9777d8ac5366d3b5d3e8";
+      sha512 = "2c80c7d3c817bdc6e3003cf6bc14b5d05537d1f90e1646116bfb3f21f75e21b7dac7ff6485b469b8993f7719687f90d46375d4ad8f607849ac64ad9135baca33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-ES/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-ES/firefox-62.0b1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "ec875171c103e574a91f7930a346b9fa95df13288a58461ba8f7affe74cf97f741394c98ba4891582cbd19c26b870e46cbe021678625c5435e3ad42355700f05";
+      sha512 = "c7a90515291dbcd86f357392d73bcd90e31bc919f192012b3b91588ef6ef2ace9ba7250c62ab54f6e94c8ceea190e940e82a7bac89c14118095917781c23bc45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/es-MX/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/es-MX/firefox-62.0b1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "974532385a78eaef5e29f7a345c0b74af166251ab7188efdca7c1bc0a579c4677739adbb3c07ca1b27dff7012ab1f31be1c6aa383bdc4a46e84ac34bee25ef71";
+      sha512 = "6efe529d1aebbdbe28266574ef9ffe93a0866a8f4d43f73d8712d97e50632318b01deab082a421229cd11424f4c8a6bee00ee11f9a32c68362c798abbbdd3ee7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/et/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/et/firefox-62.0b1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "0dbe8007bdaa26c8d4947f0f9c58233255f5e8d16beca1ab499e1d67f386f97733071adbb5102abc24504193410aa0d0f43cc0ebd235d06d35e61b6f41b70375";
+      sha512 = "82f0dea819f21ba2f8def3c7ca5157c839463b6e2d544b64acc1a798fe7aaecd9c173150dcc38cc5236e0f3626f1012af33287fec1f5f825b1f9b3074b261ffb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/eu/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/eu/firefox-62.0b1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "7ea445637a36d5868a8c8c5b8645e9266082ac812e5bcf36ed4a5f9369324112d700fe0809cff3bd4b543b15e2e09569fe4ecd48ba72319321287b76c6d0a896";
+      sha512 = "0750f68158c993a30d1551c0218d0480cabcc53c21987458784751277e84525acd673fa930d34847eec5400e4fc0038982a336ca5d06e2e9c40ae342e3ed5f99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fa/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fa/firefox-62.0b1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "612eef22e6dc033cc601fc094f22fada961c4309923245164459bdac44e584d3dba0411c5a1c708585b3241a8893cf7c760355a3d1f396320354ef1d104599d6";
+      sha512 = "6812e82c39bc9635bc58ec0db38259062c118a8dcc2c2f55e8d8ade72db4146e4fb70509f1a7631efbdef90d34b016f93f775e4941dd0b395b0bee90d395447c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ff/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ff/firefox-62.0b1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "a927567ab31a8e37dbc6503e9cdc1048deda751aa88294918938bfda055e7bc5175383a0eb0168c65e69c35ad758b9d6e22da1765fd41901e2818091d7031a50";
+      sha512 = "0dc650e5617432b162beb981dfe86cb76291c30b58bf9ba635eea7a8395ab3c8c83db81c61e0585574e37fcf1481d953cfd8d2b36c48f6d64cbdceea8c90971e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fi/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fi/firefox-62.0b1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "0e2db17c273b356c9fa62eebdce05ba2f2aac8dc8d593f96c2e3c9aa65a0e6aa183d1216342970bc78173bbc08ecddf0016c87989f36ede989d65410350c5588";
+      sha512 = "c6d04dd3abb11f717f23599d4f62fc2dea8d36c7fc05da4050ecb226409ff34c7f2180941fdb178d4ed6871b290c743d8b6b47cb1c10f88f93575fb1ca53e1e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fr/firefox-62.0b1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "09979e982d82581dfdba0c1737cc7b4e9849d176396ba084088377bf86a9ca3dfd5f9174056154f85bc95632bde09766e5e206b2e6be7f65f0ce63f6b6cf4f2f";
+      sha512 = "4eafdae8fb6cc36b2d85ebc478aeaf80fbfe85359d955ffd7c9e34046b27aaf8d81f5a91e67d0ce1f9a0a593d7df258c9fe479fa4eb3a16dc01788f0aac4e69c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/fy-NL/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/fy-NL/firefox-62.0b1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "515b5b9acef3bb11e412e7ec26b05176aacf8e9c4227be62890b613de0d94d3f9dc82fea287990d97ae7ee2774814c7aafe6c02bdd74d2fcb88074c17d2fb1b3";
+      sha512 = "c16b78bbdb512a194d785f67c6a910fafe24b18ef3e9bfa3b3d3eafc411e264ae61c34fd8d02efa075531b694cc79bb14586be3b0a69af974f042b03d40344ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ga-IE/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ga-IE/firefox-62.0b1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "90a3932a735da2c82607d2cc7403d6ae274c6d6a292dbe7b409752d70ab8db47d3411bd39c48f9643f54fe21896bf48c1f7e6428c7b903b349b9dd871404e9f8";
+      sha512 = "a9ee9bbdae4a32b1d350da589b5c47f9eb258636ebeb6f1c00c90434c2d26fb9ca70041de64f7d45435d098c8c6d145cd1d7d7c4788acfc88e1ec9dbb0ff17d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gd/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gd/firefox-62.0b1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "04e0c9c45548666b4aa8b22fad375759b4fe8bf236e24f0039a88792242a42dcb928401b2f84b1f978ade360182538d246846e3d066fcf18de3944cc02544e9d";
+      sha512 = "6f115c9246ce800e64cc5c65164fb60c1752e847df326a41199ba674131bf4d2b49d9c2c62bba6ffd19b15bbb717dfddce3a0ff8f64ee0179f8c176d5c530f9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gl/firefox-62.0b1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "8e33ae93083535d3e16c92121f6af480193640f17018c51c648ed1cc8d56fbcb43a5a1a82ea964a494e19bfd23f2abb22b245ff0ffb22511ea5273ababb603b1";
+      sha512 = "dae7fef780ea737978253f92bc0c10f2f708e4206ee7ca02eb886e73a6a06509e3426498a35349197d758dca5bc4b899297d3713817c47e7b440d175e11b42b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gn/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gn/firefox-62.0b1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "d8d3a3870db1a62a513aa85775c6eee8a2de6c5aebddd3ff76e9a98d1197e38509fd79caf80135c8b1a3a01350633f697a88a3c5b4e99bcd1596e0e8ac52fcb4";
+      sha512 = "a98f3c244b828fec424f2c41a0e26590654ecf58e6216cf279be1c455afff1fba605182dc9b1c75a09be93df60b4feaf46b5f0c9471316c692549125c603154d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/gu-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/gu-IN/firefox-62.0b1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "648d1ac593d0dfd81cdf8ecb5881e15d3378993b3dba58d0702ce6c4ce8189d589d8a5d3ff600841787576a60c6e6af9aa5aee7ae6f6ea182d8ce9c5bf1e368d";
+      sha512 = "00b30be562063f65383750fab39fb66f67c1deadd9826cc8aa6e20856aa129ea999c1f0660cc4d6680c343cccf50f9d60a0b16c062ff932a06dcca3d79b195e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/he/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/he/firefox-62.0b1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "37bd53fa8de977d6fff8b86134a2a280cccf7b1027b4af3a28fe7a1de6d5571c63797be1b029231e0133c60737a68d5d6c3ec5f8ce1901e31d94ae9533148166";
+      sha512 = "e3179e17d961f8d8ed29189e5e89e249ba18f2cd4b084cd1b47ec965af7f5403609673d477df0ba418fd1c2cabc7e92afe43123fb247f41a535eb4a34a899e8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hi-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hi-IN/firefox-62.0b1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "375725d897b046a40793ebcd8689b6553095f931a348a38bc61b8123ef94f34e9f0b25e699c048968126ff26d09c2ca5b976a671251a8ea10a8edcaa837dfa25";
+      sha512 = "bde96bd5f8225bc5ee7c3e304c39c5f36ca06ef3a7d9d0a0d56db0782b9ddc64b4024b26c1b79c23caf54a219521145030e2e4f019448e434e234e058fb81328";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hr/firefox-62.0b1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "58c400af34e1e771b04e9567144911866dc752ee4d95773eb77886d63fe6e136b15594cff3910088938186e84a5d875b6d434a07a3a5ae4fa3912f06f75421b5";
+      sha512 = "983e6fca9dc9d505bfd1fd41f3a69f54510087180182f4fa07d4ad4b9ce180b3674eae6efd5f6be36be5c02f555bddbb81a52e21c6f94968395ff86ad7d98c43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hsb/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hsb/firefox-62.0b1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "29f47f4b9d0878e1f8977254f7f0a7d919f023e3d5a64a0c53f64271fcefe6416a278bf83025f8e235a9be4fd7b0afca34f5c796aac4c0c1b204118c3ac5f9e4";
+      sha512 = "f2d76467468d62cbe0b14f056654bff256ff6ace2de45d9b957424022feacf6afa385841b7763443b2a7e4033a14693616d1a1d117ecdb7cc6da6ea34c285d0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hu/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hu/firefox-62.0b1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "b2776f2003f140648fff22dbde719a325b7eb407858086fae671149cfb975c89f433cdc5057daf2cd07e84e4221026c33cd45f6af7a9f54e9e7174bf2fd26636";
+      sha512 = "d2a2d116083cb1519502a5c8d42f6c8b6a82e3fdcc6a43cce388d3c39fe766a2eda0f9355565ec503f83d18f2993d5d2ef22fe8e72a469594344ec878fc34f3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/hy-AM/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/hy-AM/firefox-62.0b1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "889b4f043aaa78d0a5418fab3c406296396081c5a21338ec07340f89288ff0f99e7a566aeed04e65765e211c2bd8ea5a8df54ff2a9cb880639114847008b7524";
+      sha512 = "e16153be498984c1d86aa5d409ab20f24864a7cad5dd682e7274853366a8f91db1d9b3adf3c0025d657004282f6eae736c3a6fb1f98700b3d8d86696d9b27766";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ia/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ia/firefox-62.0b1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "3567a4595f322a38cfb3cac147c635f658742d516e102e07dd8438b7939b0613ff913ce86b0ced95f5c0d7dd5e0e71d673534aa5f96938210fd5bdb16397b9d3";
+      sha512 = "413e252c2e7e1fd31c4c39ce6e05cf31d47de79d25b43113d9b64e3ddabe35e2a292052c1f3e32628e617e5bbd4121905fbc8e7899aaad6297dbb8b08c286b0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/id/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/id/firefox-62.0b1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "0cbfae9884e3d296730244f15342952141771b0e6f1d48d30b29ded30141c51cccd9cc0cfa60f50987d435da6e306deaf93c7b9dba86be591d958e441db00b2d";
+      sha512 = "0e602ce9a799ecb08196dd22fd00226ac0efb1a95d2fed43d69846cf1c1d810ffe2d08c39fd9564c4e133bcf94fb8642a836fe6760e9d0a4e86b0df0bf3f250b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/is/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/is/firefox-62.0b1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "ca491e6ae92d933b4fc75c07aad7580f8d5aed90984363268bba1a2db4c237b09a6a8fa09a3b475d9f6e06b9def57a948207c44c9572d1bfa48f3914d9446eba";
+      sha512 = "6896efe5a1982e2b5126891f7da40c43cf2eeff59c76d4837d0327ac873dbdb190609ef2e84130bfb38d111e4232b029a713bac6c9bfdee5f397831b68fc9c50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/it/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/it/firefox-62.0b1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "1b35e8cd0c2eeac92ef7d43ca73ebab85b731cef5e505236f5c9df4e9fb05ba8f03455ec2ac6262a0bd86e3a05c6d8ca236f9437277c36154011e6721e795e75";
+      sha512 = "62bb8fa38d8ea96af516d9c69c981ed959e66824785040bffa809ee7a1c6ba2e4b6e324beba263e5627183e660d97943960a2fba31f72b7d751a85a963538787";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ja/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ja/firefox-62.0b1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "d9252c1e002802ef09e85e04586dd983adb5fcdfc6248e5b7cf71030697477785c74409b27f6640c02a026a621e6edb6b20842cd0d6e2271ef81730a3b2b5cb2";
+      sha512 = "a968827ec6d07ea4a88722faba0deb26c633e755278a32072737f139b02309aff3b8da18f48949e0ed737a04755138c8594b6c10bcb4e65d09aa9dc73a045174";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ka/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ka/firefox-62.0b1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "a9b5fecf88d96bbfe34901bf8a386c8b31ad97f87c322294a0362d992b88ab42fc78836c70cfe27301729aba46c21648da0377a0f113b99ddf14b524017a0b66";
+      sha512 = "767b550e392e5547c269cf04e06de184e08fabaa3a1a06bcfa1932411589c7bf661817038e0969b8f1ea51c99b676f304d1308142d0eba8bc5b6338092e06c8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kab/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kab/firefox-62.0b1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "5eab8f88267155c8d8d8164047e624900ef8d915ec5c1c4fa275df7ee2745427e2ef50254c92127d5a6768c70c2fad9d7c7c7c8af1383793b238ac00a487fc42";
+      sha512 = "d3204991c980728d23f01690041439d25deb6f338bd88c9c9636bd773a726af7327609da029a766c0d65c9a2f8f0801ff656ba195996bfaaf3a3ce2f050f23a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kk/firefox-62.0b1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "c22908d53da55aa3aaf5929b29af37d6b273df6164784bd03ce89e7a9aaded8cdc939ea0c1e7b87a9c4ef3ff0a76273ae1149259f9ba8c3d98db75d6b8755e20";
+      sha512 = "650ef47cbc485304ed84ad674a0f6c0e724f612a90694eb20df7bbd9a88f9be4aee5acc9dc3c3079a95b11061cd34f0147c39dc16a0d49710a270c7e519d369d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/km/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/km/firefox-62.0b1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "ab73eed0d4649afa678e762e361eeddee7d188beb41d4415e272e8bbc855c25666642b5b4299a3a4b5aeb80d1fadbd59c3dbcabb1d30c2bd68d2def706259d3c";
+      sha512 = "35eaced569719c0877a3190b49163a3b5cca8c9aeed2ba868401f1dc2b5ddc28fe60e5235258ef4d9a2b5e7cd25aecdbae008636e389dc2663f0a10d225179bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/kn/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/kn/firefox-62.0b1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "d5219ce9149b510283c2178d51c209f88c97e5c73696316f9c0eb94492950c6d9d22509655739cd32905d6e0c534245e7dddde9a5630f61d2dccd14dbc968663";
+      sha512 = "8626cc39f2b65543a9dc7cfa090db7883294a47692740b123413dfd223543c83c961a47968f02597411e236d2bcb7125f0899db52c78041d830ce89101c7bf8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ko/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ko/firefox-62.0b1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "633f2b5bd4d935b48c9da2e00b1dad339f9ba3fc6a0c2102e0b2e66fc4c3177013e47d99afd6de9d54d7897b54270b85849c60ffcdf3f75d78d85f1f85785df7";
+      sha512 = "d8904507cbabd5e89bba2ed3d39da6f2e7327710af5390f75c9a2c8f99489512ab54f884231616469ed989248c384aa3ac1d086dcf42d02b92d2b44e75cba556";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lij/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lij/firefox-62.0b1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "b29fc63919da339eacdad4e9851f1f0b63f3f3b46590b86256b9e1bc7d0ecf7cc91d708b54e1145add40efbb146d8e4470f77a4c33118ff65445e2802e6fefe7";
+      sha512 = "f3dfd0195283582ed07e697c3f9996ca20c887909bd4f1972bb49a980afcf41e77df18fc81e0bd9f52519acf3507080a1e58512a0e50b7978acb8a17269fdf35";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lt/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lt/firefox-62.0b1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "6a38be681c24da3c3aec3fa78a0561f96d53d1b1754dab1796f137cf1c1dbfd559b3a4e77bbcf47d5571b56f0ee176af0353827a5899db8424e471af67a29022";
+      sha512 = "53d0481730b86a6b964e769f6d3fa849d833328140fa47ac5d31a7988060bafee5a5309678740df15ce8ad864f9731fc3277a6a58f8577a857193709f09dd033";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/lv/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/lv/firefox-62.0b1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "9e5d8b2ed27810964862ed7b1308db33de6d518b1cd293266ca950797066e8108d8e5869d3062870f74d38dfbac9776cd926165142340ac5ab920ca0cb0c6fd0";
+      sha512 = "283f3f9345d8d7bd186ced0f417c5dfc02b788d357bb45f366fb8e92fc5985e83cd80bd7ef8b085fcc23e276fc3411395f976731810edccad61c63d2edcefb7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mai/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mai/firefox-62.0b1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "ffc81f670b3bcf5c43ed29e8016cb240a8c9936eec601e53092357854f2587dcf28943ac72a098791398bbb98d37b68cccb9a813db9dc22d0a44328b788680e8";
+      sha512 = "fbbaca82dbb5cc794a852bdbb2a766b5f90f5c061222c4154200641540ff6f1d9bad5cfd5f3acceb5fabd69fb500ab7c21c43186820601d089a7cc1bf5168042";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mk/firefox-62.0b1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "711d7b92936415d46574d144e0a718278807d00dcc252e46e5bcbe528e578ff9e7d2baaa76be20e18d8b41f492a6d7b4bb95a6d47e899adde988ab5fe47900f5";
+      sha512 = "39f0c19e563ffe0ef44596429ebef45aa4176ddcbef35ef1de4e7c006ce93dc21afa5512cfaf343ae46e774a7e92a471c2d0052540d3704c5dbd30def3b86abe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ml/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ml/firefox-62.0b1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "5d0d5ab64f8663fdf700c317c346c79e47ee4c035589b4eed1d8f928f5e78ac8dc8f60c4183fc6d46308b14306298be4d8e87c69ada4a7d3a23f9db8473c62d4";
+      sha512 = "eabc942d8c49bad4a9a1ca55aca4762d56c58992a37247aacc6ca2426713e9116925827216386140160649dd86005452b3411cc6158ebf3191bee6cddf621240";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/mr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/mr/firefox-62.0b1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "d97774eba736fc032b06972e1684464022db0aa9e0c67c815f71f07bb5e9a1df01bbe5c93d1a9011d4519430264d64aaaa6cc13bc2fd778acfec69138118ee92";
+      sha512 = "56bf7ab49c79aceb18c6c11949a72813bad2589480a865d0da0ee3986869004bf544cd2d66510a022d60fac8b4456162bbdd479f846bbc0f0434ce8e00146cb7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ms/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ms/firefox-62.0b1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "c3204e7880cbb6604f5dc63973db3b4c51c01e1e54e9a03e8b18441ef86ae70644a038fbd4e638257195c5cd6ce2706dc385ac155936a8221727e916ded6f6b3";
+      sha512 = "19be62f3476f136f34660336ea7e96058ddd8699a71c5b2d1be8c444b372205fcd8f16d5d852ec33bc848292b346883fb065837711ce28bb5b16cad65a62a5ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/my/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/my/firefox-62.0b1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "6a99b4de109040f7d28fcce85efcfecf07c6d603d77d21d28e9953f3d240818d8d2e1c0ac51e732cfb2ec1a5d431d5610f8d92fc125ddf3d5b7ba38d617ae633";
+      sha512 = "293c80b252f9a6102d7d259e493cfa4a263917fe1204bfbb0f82215bb17905055d99923fbce4dd029d83faf92d29327e2b8326b082cbceb15dc18dbe0b041976";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nb-NO/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nb-NO/firefox-62.0b1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "796ab97579eac69fbfbdd12e62e3457c9329587a4a69d999ea85177ad9871c42b89a84641a450c17cda7536fe97552d4d5b2150d21261514c649f446d76c5935";
+      sha512 = "acf870d40309cf7fb39c30ddf41a88555bd037ba2ecb769b30d41094efd1e29181df91337286c0d8db76bc0bc3e2da915e74e409f5328a51f2f73e0f8ed05cef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ne-NP/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ne-NP/firefox-62.0b1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "3efdc62d62f3f3da82d3e669f3becca6e26163a05d72cb94a42bc5a8c0cb85767d1da14ea18348d13c9b43856e4fdd6ff2a21765fed622b1f087eea968440574";
+      sha512 = "bf47317457835eb796567bf21c41b5cd4e88e8f5e3623022b8fb3a6975604e5e0f637a4297b68cb03d88b08ad58cfd6bdc81523a349738a12f10b6ec005e17ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nl/firefox-62.0b1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b70dd7e08bd397b175030c28b93fc8154f4a5ffa7abe1fd6f95dc46f8b37ceee19359ef1d451cc198d93222e50a5a6a0e84616f2b1d361f18e53958332aa0d71";
+      sha512 = "d489b412aa16d31f1e81a9715ef8efd852803b1e8c26bdc1aa496c5c0a73263826affdf721694213c638a1dbf37333e9f45d5ee0286b39c236cdc3a4e1e6b4ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/nn-NO/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/nn-NO/firefox-62.0b1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "a7971d6900fc9f35c014e0e98c1c7efe672a81c29d00de39c76218b347c1e3fe0b1c241cee92593fb38bb236cdc756016d597830b4db10d346041560e8f95ce1";
+      sha512 = "ef1660457ffb2cbe6b266b8d6295bda784759027abf8afa5179d12ef302374809b8c03ca8cfd028444cb727089008e75ff15042e12f2f883aa18cf27f9baf76b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/oc/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/oc/firefox-62.0b1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "281ec70ff1d62c5343352efe648d7db8f4f6b49e0a608427b85615e21ff0c435531fdfb57afceaabd446823659665ad6f411521c605cf846ff1a0d9c62c76b8f";
+      sha512 = "b366368985b0491a3fdae463c114c60147d080e8347ad085d5db82d65b2a8d720f7dcc7486e0b9e576a83e335ee1eb3c8949949a49463ec7eb2dbc43b6c72f98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/or/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/or/firefox-62.0b1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "e31b8f043d2f468b33a7561c42eb09c904571d2949d53486c2fa44a07375b6321efb07045935c8a6cde7a3bf1caac606218c8d658cd067b2a08d3321d4684cc4";
+      sha512 = "ced81741353263836d9bbbe13d3e981fb7c83f55f9a2095d1bbb9bc06a2221e5e125578096bfed54b66e3707a6c659b9a4736ba1552be1809ab7708587a79115";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pa-IN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pa-IN/firefox-62.0b1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ce200baf1b4f99ce75fe1a8bc9e07d2ca05c2b231d05afdd93de385b56609c25586a92d67554ec292c916f9ba775c0b65750e3d3dde07229f70ef6da34eddebe";
+      sha512 = "c3e11f3580dda5b4a11c50277d9da81fc94c23ca1ec40e2c48ccb828579a9443b3a4dcc1bf3ae24ffd78b8aee9288e0edd00eaeb0f44cc89ed06f45c03e7ea41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pl/firefox-62.0b1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ceff46c9b211e1df3f52fd522531f329b4f12ab7229fb569d3eba96e2b5d8aca49f8482d773189e129db1a893de85aec5bd1bb3dcf5ac87715b9f042b7b8eb36";
+      sha512 = "882f35dd369488c3d2c7dfce8205d3a165e8fc2ffd057166d6ff4e61e1726a4452d6a5acaef5e65571f6247718c489e0bec0a7e5960708f44cbf5ddf08dfc39e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-BR/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pt-BR/firefox-62.0b1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "cba9d2c59717d10308e9ba36fb20e6b88f13b3d2ed9620a64ee5125bd19b173a03fc3e0d0344c9f022b89609172ae1eb71603a705b6374b057864d391d951652";
+      sha512 = "9b03a2fefd05f986878e55bcf88991273112a44bdb216598a9a5a56433580a8e5c344be75cc13fe6799e701127bbed67e5d768520611e981c6b54a569f281b0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/pt-PT/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/pt-PT/firefox-62.0b1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "6ca78cdca5cdf329d5ae153f016290c7e2c25c4db19c306460b902b217ac8c38fe01061c43f3e9e12e93c2805aeb7a44c5e1828e4235dc0f457a178caaf4e08c";
+      sha512 = "565c9fd3eeb044e56da27897c20959e65d17c653521d2ba848ef73b0533519e0e01ff482e4bdf352974a584d654bde23d0e58c929722554125473f420b286e25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/rm/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/rm/firefox-62.0b1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "fe9fe0f3a3e1b7409ab2452496b63376e124e1fb5bf3c3521eda8afc008756bbc3011189dc9efa520d6332a5eb734dd2d1c5d1d0a1396db1aa116530ad8653e2";
+      sha512 = "66cb8e518d7f794341afe9310efd5588bd88a81eff38dca36311a60b3140fac1f83b30eeb78ec7f9c8f999e276eab50964b31b5923fec58ee0b32c333285ebff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ro/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ro/firefox-62.0b1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9fd3fae5bdfe6b41b33b91672bb46fe29b56d750e4df5a7dc069457623a1effce440c875847a36a0c18c02f3182ffc60b103a74352a3316d57b099ecf9a71eaa";
+      sha512 = "3a4cd4037f51347cab0b198cefd3fcee5c201fde671ed2b781553ea336a20e1a57809844ac3806f771603693ba9f118416cb4af5ea0cae029f99f4286a89d22e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ru/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ru/firefox-62.0b1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "2df4bf48b71daa282a360f6877530e67e8e5e050c70066b2bee890409611053d72a0cf698e80f5bfabf3a9c5482997b66cd1acdd98dbf5027d5abb9224641bd1";
+      sha512 = "f44fd98115173deb2d05804842413ee4f05629e07d4362346a51f97a1ed0ddbdd6f6c79cc01bd89366bce2f455cc27af56de2807954c913be8a26fdae9495c82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/si/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/si/firefox-62.0b1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d05ef105312b143ebf85131f8e5645281f8ff0969ea891ff455bb5d300eace172abfcfa1a588afbf85b8046e6c51141774c7482947d80110c0df20ccfb54be93";
+      sha512 = "c2b3473fe2994e57c5321d4cdce60c250e0dfd11915449afe2d3033be2f082817e9dd6c2ea64a000ee4f20ea4fe51b642dfa6abe1faee976ca2dfee754d5ffd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sk/firefox-62.0b1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "64785b3e374e143037e8d278c1702d82b6b872fd7c839713ff2272beac3c63e3d39b7eda51fccacab1c2bc313d373d5850f9e6425ed611759d1073a59d785d76";
+      sha512 = "eb0cbb65eff38e20371930ea56450478172360a85c6692b14bebeffaca47dd2c1bbf07446294e210a52e14749c31dfc6dc34c36fca8312bfa4267ac17f2e5d98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sl/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sl/firefox-62.0b1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "82fe1143c73daa2d1b2c4322c783503301470c8df32fafd910234a156dd8ec40e327b94134c52915fe39e5feeb9e12ab347172277ebfac6d6584a352b7d05f56";
+      sha512 = "3328939bf37de6646df07b2f63fd6bbe14638587c9f5349b2899ae1bdd11d4d57d7fa8d43c9bd6a915f95815717b1b9cb7b028be250428651ac5c73d9bcd3686";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/son/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/son/firefox-62.0b1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "69e0839613b34afb114628998f073cf48ebbd58fe7ca64b55dd14efdc3770bb31ddfbd8d4e4d57fc73d6664bade0acfa57d0ac0eae849431d6064bedbec66a66";
+      sha512 = "2b833d57529f58a2a34ca6f3770cadcb14cb4b7758dd3a3c2f5ede33b22fe3759483b3af7db17b87272a255a044403b4b8c8946c6e6358c3edb699347c6caf03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sq/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sq/firefox-62.0b1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "d198b61bc16b71f4ba0bc5cd6e62497e31103e3df5b2aab759166721c44410370e606598ed9b2f2bf1eadeacfef5f723434bbdf8ad781057e10f59bc82b2bb4d";
+      sha512 = "96413625445c9afb849ef34dfed5f7445f61038b27c136add1ab43632a3e01e645804aa48cc0c4df8a89942e8a4b3ee41e6999433ca8f35d38b411358d12656c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sr/firefox-62.0b1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b621a05fe50181b1c94f408f680d48fe8e596da8b7df353633d4d8ccdc08f25443ab79ab4e6f858ba6fb8a656c140813e352ff3e1689176de0147701a2396b0b";
+      sha512 = "a1f9dfefbf53f8b3583e318d9e7bb7c6443e302b54db220dbbd7f24369abc3c556d49aa07174f979c565f81a22154e8d340a76746854e09af2c5beddb345dec6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/sv-SE/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/sv-SE/firefox-62.0b1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "85e20d2e721a22abab9a1c369cce31514edaac7c9ccce28416cf3eb6e46974613ec175b33783f07ff55636745d6ef28c35cabefcf7b8aa70f925fe6fdafc66c8";
+      sha512 = "42f99df87e0b45ea29c51ab9a4d3147f9956980bc62429a6cfe29a51d394b2b9515a0c042722305b31f5d3834502b6d032a4eca9f060a3fc3c6ae9bcf5efc128";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ta/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ta/firefox-62.0b1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "5162bec39eba7dd8c320ed75de56c2fdbfd66fcf47036f3c07fa8dc849f5fc532f0871f7a8de287ab69d6fe7e1c85317f9dabc64f7e276a40bce531083f19d85";
+      sha512 = "4342517a40d246676c57aa1da4baaba44af63ee8fb5919d0c040b2e190efe2ace068da4955525dafb42f55bee84c5c7d0fd27347c6743c84b677c6a76b50bf86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/te/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/te/firefox-62.0b1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "063b9ca6d71bd22d79ff21637fd3f32e711582ce08331b7fd13b7271f759072d648b4de0f6503fce35990751d4da9c01429f38de5ff12345ddf5bc16dcdd000b";
+      sha512 = "a37b00cd8fb297a67f57c0e493d112a31c7d51da45f63312b1afb689bbdcb7c73ccb93b24c721137534dc6d2f4d4a08dad6b9cdd6f075d35aff3cf3b88b2bc89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/th/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/th/firefox-62.0b1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "e42dd04acffc8d4468833444d23bdda05d7696f37376c6afbc0a2af5d7ee78f8ff0fefdc475b5f69bbf4e42b93f944e6bf2550cc4975a114699992224a3a522d";
+      sha512 = "23bb835d03d8ecf73f474ab20b9af4d0064e794c93be320eb1902635f8ddf63b83425e4aaed9457b949bb97f15999a1aafa3a831af45eb7937a5f3f497bb409f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/tr/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/tr/firefox-62.0b1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "27b34656efd50449a3cc86a9d46dc64fb6fcd8248b4e8e43fe871a7f95138187a0102b87d1393cc78c600255e745dd21c2b01870690e4e0820c6859d8dde9dce";
+      sha512 = "25b11eb970a5bb5889cfd36e14865bf53de05de53fcec21ffc44e4e57889422ae668061110d6c23fa94282619a7fea69aac1baf2e3db075b61f8aef68ba0a00b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uk/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/uk/firefox-62.0b1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "537871ebf2c3457cfe9b61ddc2ba4916e502bfcfa8e2d1d4d10b84278a025ab3b859e4fdf68b1ba7ace37c0af14fda702f2be6a7b0e1ba5512c63294ebbed7da";
+      sha512 = "d1ccb9277f72d2b575bd1bdeb26b05f8be1fb7dc7aea801f51ae1e63684c541cde9e203ef2bc0f01c48b01ad9b85701b40117573c5b44b2f8fafcb3940993576";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/ur/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/ur/firefox-62.0b1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "89f5c1db253fc25ebf57523471c1f9a72797b3e2ee67eb4b74ca06ed297976bf1c15b7a25d1f1eb309d759e2f146e7210a8a33667b8bb22e254f071c76f7d49b";
+      sha512 = "9fd5a14da1c5ef7f508c0852428d7657ec646785cf21d8f381b16f8bece68699081b85507fa7e69b186533f4653ca27038f0f976899ea8220a97cf8e199d22ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/uz/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/uz/firefox-62.0b1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "3050b5ac3530cbad7b31920921a9aa29533614264a55eae9d333e95a5d57568f8a7002a3c9739a8f55594983d70fdf0ad29d38d8f9e7b212df23f488ebc26515";
+      sha512 = "24ea3aed72b06fcc84d4e4148ef7a766594f94de11d49a67239f3e454eeffcaaa74e41b93d76a256ac0f9bbd302de2e82f02356f4c650c80e9bcb2ab01bafb65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/vi/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/vi/firefox-62.0b1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "03c6ab48cd6fa0a797eee0acbd39a14673da14da3f2505b445f08a3b6021c3d6e01baf48a725c8fa08bc68d5189eb8e0a8a2c150e9563a149c8a221b6c50091e";
+      sha512 = "580fa2bd0d5a5105bdf37f855ad67e12df04cb556f03911e252f1854b7749e407b0dee93c643d44371f4e03a9cf4c1522389c7fe4b36ab3c27bd5f1729f0d942";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/xh/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/xh/firefox-62.0b1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "bb9b5bc312024abda5e44e8f299217cac7bdf3cfcf26f55ee1605ac3c4b59fdc5a59fe0fb8897243b9e542f83faccc3025c77710d236e8f937844f7be101d272";
+      sha512 = "8497ee2217b0f0588579f56d64e56c7e17352b0b88d7d3fb98d46ee67889f017bf69ad0c79480c24108445d8c9a171d047c3d4c0363c9f447f50f4863c8104a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-CN/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/zh-CN/firefox-62.0b1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "bd80296763f7c82be3bc02e75a47ffbdabf37873e41b82b213d71aa6eb165e742b89c1fabe00ccddd2c9b81824e96eb51186bcb399560e285063e050bd435ae6";
+      sha512 = "168268f4cf22dd22c64fecee16ed619c6adfc5370e022554b000e92c052356b31492a10733f55fee3c37d45b08a3ab63f66545f4e502101f0440f9c683837e33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b14/linux-i686/zh-TW/firefox-61.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b1/linux-i686/zh-TW/firefox-62.0b1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "995e0a228a83f464b3d47f4b9e0fb9b692bf6ff2af4c526e6046cab17fb4c15f1e36d7822efd55731bfe812fdfa8885fd60e4431cbab0562ac6dfac21fd3aa6e";
+      sha512 = "0c9b3475773dc7669c2408c8533a23330f3c3f49d6b07a807a16eeab946ef933fcf505f43835237f690f49045489e3ad294a2db74622cd09ab2b4473e8eac42b";
     }
     ];
 }

From bbf359ecc8baa1c627360d3e4892a4172f28a78c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jun 2018 09:49:21 +0200
Subject: [PATCH 112/117] esniper: update to latest version 0.35.0

---
 pkgs/applications/networking/esniper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 80984208460..a7d10adc0a7 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, curl, coreutils, gawk, bash, which }:
 
 stdenv.mkDerivation rec {
-  name = "esniper-2.33.0.2017-11-06";
+  name = "esniper-2.35.0";
 
   src = fetchFromGitHub {
     owner = "yhfudev";

From ec93a511876eb9d9dff4b9540ed559ef6ed31880 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 09:54:20 -0700
Subject: [PATCH 113/117] grails: 3.3.5 -> 3.3.6

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/sp0w4frknlgjhmw18j8rsj5sgaf95zhm-grails-3.3.6/bin/grails had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.3.6 with grep in /nix/store/sp0w4frknlgjhmw18j8rsj5sgaf95zhm-grails-3.3.6
- directory tree listing: https://gist.github.com/8278e7c1c9d28a8983fdaf23975bb930
- du listing: https://gist.github.com/10a146e1e865583f68e892f13c310026
---
 pkgs/development/web/grails/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index a0d8a0b84ba..e5e6f639b95 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "grails-${version}";
-  version = "3.3.5";
+  version = "3.3.6";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "0796jbcblr3vxdf6sngzcfs1m24d1ra1n8jc7cnfrfxpf8r0z15m";
+    sha256 = "0q3rbz47lp2zh2794aycf85vnic77dg3sclrqbizfpdijma87iy7";
   };
 
   buildInputs = [ unzip ];

From a3963742e5c2c5ea972378852776026e26dadb04 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 19 Jun 2018 11:39:58 -0700
Subject: [PATCH 114/117] ethtool: 4.16 -> 4.17

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

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

These checks were done:

- built on NixOS
- /nix/store/l6vkhh88xfbdfjaqm9wmnlvm1q6qqg7i-ethtool-4.17/bin/ethtool passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 4.17 with grep in /nix/store/l6vkhh88xfbdfjaqm9wmnlvm1q6qqg7i-ethtool-4.17
- directory tree listing: https://gist.github.com/1861fff97928fe0b6cb81079b3266156
- du listing: https://gist.github.com/65766ebe5f7022f5c96f6f8266a93c78
---
 pkgs/tools/misc/ethtool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 62c782b26fe..0e0bc37ad53 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ethtool-${version}";
-  version = "4.16";
+  version = "4.17";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py";
+    sha256 = "11f5503mgcwjn1q4dvhjiqwnw3zmp2gbhirjvgfr71y72ys1wsy4";
   };
 
   meta = with stdenv.lib; {

From 2f371536f2674239d639c6d2ea83f4676c1a197c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 20 Jun 2018 05:11:46 -0700
Subject: [PATCH 115/117] facter: 3.11.1 -> 3.11.2 (#42273)

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

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 22c25bfd567..a88cca41fa6 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.11.1";
+  version = "3.11.2";
 
   src = fetchFromGitHub {
-    sha256 = "10ai59vyx1ssb3jyfwnmi4y5kchlnbi7vn7wbax36pa90l1j7jqk";
+    sha256 = "0sxxd05r7ika2m4p76kld1xclyi8yf4b79gb86084m1rcv692ap1";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";

From 6ce9c5e97cc19ff6fb8609b91c55ea0433de4cbb Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Wed, 20 Jun 2018 16:43:43 +0900
Subject: [PATCH 116/117] fcitx-qt5: fix build with Qt 5.11

---
 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index 1a3352676b1..50ab7d85c5a 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }:
+{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules
+, fetchpatch
+}:
 
 stdenv.mkDerivation rec {
   name = "fcitx-qt5-${version}";
@@ -9,6 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c";
   };
 
+  patches = [
+    # Fix build with Qt 5.11
+    # https://github.com/fcitx/fcitx-qt5/issues/34
+    (fetchpatch {
+      url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff;
+      sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b";
+    })
+  ];
+
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
 
   buildInputs = [ fcitx qtbase ];

From f9218b1346a025d213dec6b838ef33864b3e3456 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 20 Jun 2018 05:17:26 +0300
Subject: [PATCH 117/117] nixos/stage-1: Make find-libs not choke on dynamic
 linker being in DT_NEEDED

find-libs is currently choking when it finds the dynamic linker
as a DT_NEEDED dependency (from glibc) and bails out like this
(as glibc doesn't have a RPATH):

Couldn't satisfy dependency ld-linux-x86-64.so.2

Actually the caller of find-libs ignores the exit status, so the issue
almost always goes unnoticed and happens to work by chance. But
additionally what happens is that indirect .so dependencies are
left out from the dependency closure calculation, which breaks
latest cryptsetup as libssl.so isn't found anymore.
---
 nixos/modules/system/boot/stage-1.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 55bb6d3449c..6756f68cdf7 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -56,6 +56,12 @@ let
       left=("''${left[@]:3}")
       if [ -z ''${seen[$next]+x} ]; then
         seen[$next]=1
+
+        # Ignore the dynamic linker which for some reason appears as a DT_NEEDED of glibc but isn't in glibc's RPATH.
+        case "$next" in
+          ld*.so.?) continue;;
+        esac
+
         IFS=: read -ra paths <<< $rpath
         res=
         for path in "''${paths[@]}"; do