From 0935cbf2872d2b6fff3b700eeae324ad6e317068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 09:24:31 +0100
Subject: [PATCH 001/170] gnomeExtensions.system-monitor: fix this package and
 upgrade to v33

---
 .../default.nix}                                | 17 ++++++++++++-----
 .../remove_nonexisting_mounts.patch             | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                 |  1 +
 3 files changed, 26 insertions(+), 5 deletions(-)
 rename pkgs/desktops/gnome-3/extensions/{system-monitor.nix => system-monitor/default.nix} (53%)
 create mode 100644 pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
similarity index 53%
rename from pkgs/desktops/gnome-3/extensions/system-monitor.nix
rename to pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 0c3e65633c8..2c2f9870c7f 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,26 +1,33 @@
-{ stdenv, fetchFromGitHub, glib }:
+# This package needs the following configuration in configuration.nix:
+# services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.libgtop pkgs.glib_networking ];
+{ config, stdenv, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
-  version = "8b31f070e9e59109d729661ced313d6a63e31787";
+  version = "v33";
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "gnome-shell-system-monitor-applet";
     rev = version;
-    sha256 = "0fm5zb6qp53jjy2mnkb8ybxygzjwpb314giiq0ywq87hhrpch8m3";
+    sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk";
   };
 
   buildInputs = [
     glib
+    glib_networking
+    libgtop
   ];
 
+  patches = [ ./remove_nonexisting_mounts.patch ];
+
   buildPhase = ''
     ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
   '';
 
   installPhase = ''
-    cp -r ${uuid} $out
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r ${uuid} $out/share/gnome-shell/extensions
   '';
 
   uuid = "system-monitor@paradoxxx.zero.gmail.com";
@@ -28,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Display system informations in gnome shell status bar";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aneeshusa ];
+    maintainers = with maintainers; [ aneeshusa tiramiseb ];
     homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
new file mode 100644
index 00000000000..8bff7fbe24f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
@@ -0,0 +1,13 @@
+diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js
+index b4b7f15..d645654 100644
+--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js
++++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js
+@@ -386,7 +386,7 @@ const smMountsMonitor = new Lang.Class({
+     connected: false,
+     _init: function () {
+         this._volumeMonitor = Gio.VolumeMonitor.get();
+-        let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local'];
++        let sys_mounts = ['/home', '/tmp', '/boot'];
+         this.base_mounts = ['/'];
+         sys_mounts.forEach(Lang.bind(this, function (sMount) {
+             if (this.is_sys_mount(sMount + '/')) {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c017f8d93..319133b89db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19289,6 +19289,7 @@ with pkgs;
     nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
     remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
+    system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { };
     taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { };
     topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
   };

From 2d047efe7fc851f25a31bbf8f1aa73b9fb554b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 10:19:31 +0100
Subject: [PATCH 002/170] gnomeExtensions.impatience: fix the package and
 upgrade to version 0.4.5

---
 pkgs/desktops/gnome-3/extensions/impatience.nix | 9 +++++----
 pkgs/top-level/all-packages.nix                 | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
index d82ff652bd0..78baec6dd30 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-impatience-${version}";
-  version = "6564c21e4caf4a6bc5fe2bf21116d7c15408d494";
+  version = "version-0.4.5";
 
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "gnome-shell-impatience";
     rev = version;
-    sha256 = "10zyj42i07dcvaciv47qgkcs5g5n2bpc8a0m6fsimfi0442iwlcn";
+    sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx";
   };
 
   buildInputs = [
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    cp -r impatience $out
+    mkdir -p $out/share/gnome-shell/extensions
+    cp -r impatience $out/share/gnome-shell/extensions/${uuid}
   '';
 
   uuid = "impatience@gfxmonk.net";
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Speed up builtin gnome-shell animations";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aneeshusa timbertson ];
+    maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ];
     homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5c017f8d93..e2344e9257c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19285,6 +19285,7 @@ with pkgs;
     dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
     dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
     icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
+    impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { };
     mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { };
     nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };

From e864675e10cc1af98dcb37d6882e358c134e5425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 19:57:55 +0100
Subject: [PATCH 003/170] gnomeExtensions.impatience: Fix the version number

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

diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix
index 78baec6dd30..24b4c1cf703 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-impatience-${version}";
-  version = "version-0.4.5";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "gnome-shell-impatience";
-    rev = version;
+    rev = "version-${version}";
     sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx";
   };
 

From 058be360d367e7180f1d736b271762aa1367cc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Wed, 7 Mar 2018 19:59:00 +0100
Subject: [PATCH 004/170] gnomeExtensions.system-monitor: Fix the version
 number

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

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 2c2f9870c7f..01b3fbad7c2 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
-  version = "v33";
+  version = "33";
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "gnome-shell-system-monitor-applet";
-    rev = version;
+    rev = "v${version}";
     sha256 = "0abqaanl5r26x8f0mm0jgrjsr86hcx7mk75dx5c3zz7csw4nclkk";
   };
 

From 4398a9e9b9002cc27e4a07e0e918c2fd8df58270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 4 Mar 2018 22:57:22 -0300
Subject: [PATCH 005/170] gsettings-qt: init at 0.1.20170824

---
 .../libraries/gsettings-qt/default.nix        | 58 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/libraries/gsettings-qt/default.nix

diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
new file mode 100644
index 00000000000..9e893932a64
--- /dev/null
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gsettings-qt-${version}";
+  version = "0.1.20170824";
+
+  src = fetchbzr {
+    url = http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk;
+    rev = "85";
+    sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+    gobjectIntrospection
+  ];
+
+  buildInputs = [
+    glib
+    qtdeclarative
+  ];
+
+  patchPhase = ''
+    # force ordered build of subdirs
+    sed -i -e "\$aCONFIG += ordered" gsettings-qt.pro
+
+    # It seems that there is a bug in qtdeclarative: qmlplugindump fails
+    # because it can not find or load the Qt platform plugin "minimal".
+    # A workaround is to set QT_PLUGIN_PATH and QML2_IMPORT_PATH explicitly.
+    export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
+    export QML2_IMPORT_PATH=${qtdeclarative.bin}/${qtbase.qtQmlPrefix}
+
+    substituteInPlace GSettings/gsettings-qt.pro \
+      --replace '$$[QT_INSTALL_QML]' "$out/$qtQmlPrefix" \
+      --replace '$$[QT_INSTALL_BINS]/qmlplugindump' "qmlplugindump"
+
+    substituteInPlace src/gsettings-qt.pro \
+      --replace '$$[QT_INSTALL_LIBS]' "$out/lib" \
+      --replace '$$[QT_INSTALL_HEADERS]' "$out/include"
+  '';
+
+  preInstall = ''
+    # do not install tests
+    for f in tests/Makefile{,.cpptest}; do
+      substituteInPlace $f \
+        --replace "install: install_target" "install: "
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Qt/QML bindings for GSettings";
+    homepage = https://launchpad.net/gsettings-qt;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 970a6d4b18d..0a7f18325a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8986,6 +8986,8 @@ with pkgs;
 
   grpc = callPackage ../development/libraries/grpc { };
 
+  gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
+
   gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
     callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });
   });

From a180a52dd330388d489ae8100d188ffc0e82b3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maccagnoni?= <sebastien@maccagnoni.eu>
Date: Sun, 11 Mar 2018 21:55:21 +0100
Subject: [PATCH 006/170] gnomeExtensions.system-monitor: do not need global
 sessionPath modification

---
 .../gnome-3/extensions/system-monitor/default.nix  | 12 ++++++++----
 ...unts.patch => paths_and_nonexisting_dirs.patch} | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)
 rename pkgs/desktops/gnome-3/extensions/system-monitor/{remove_nonexisting_mounts.patch => paths_and_nonexisting_dirs.patch} (52%)

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 01b3fbad7c2..eed34ae523d 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,6 +1,4 @@
-# This package needs the following configuration in configuration.nix:
-# services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.libgtop pkgs.glib_networking ];
-{ config, stdenv, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
+{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib_networking, libgtop, pkgs }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
@@ -19,7 +17,13 @@ stdenv.mkDerivation rec {
     libgtop
   ];
 
-  patches = [ ./remove_nonexisting_mounts.patch ];
+  patches = [
+    (substituteAll {
+      src = ./paths_and_nonexisting_dirs.patch;
+      gtop_path = "${libgtop}/lib/girepository-1.0";
+      glib_net_path = "${glib_networking}/lib/girepository-1.0";
+    })
+  ];
 
   buildPhase = ''
     ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
similarity index 52%
rename from pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
rename to pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
index 8bff7fbe24f..82e3d7c541b 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/remove_nonexisting_mounts.patch
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
@@ -1,8 +1,18 @@
 diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js
-index b4b7f15..d645654 100644
+index b4b7f15..d139135 100644
 --- a/system-monitor@paradoxxx.zero.gmail.com/extension.js
 +++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js
-@@ -386,7 +386,7 @@ const smMountsMonitor = new Lang.Class({
+@@ -18,6 +18,9 @@
+ 
+ // Author: Florian Mounier aka paradoxxxzero
+ 
++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
++imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@');
++
+ /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily
+  * by loading the new libnm.so. Should go away eventually */
+ const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0");
+@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({
      connected: false,
      _init: function () {
          this._volumeMonitor = Gio.VolumeMonitor.get();

From ef7a25fcc0063390a108049e69148fdb36430668 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 14 Feb 2018 17:42:48 +0000
Subject: [PATCH 007/170] godot: 2.1.4 -> 3.0

---
 pkgs/development/tools/godot/default.nix      | 30 ++++++++++++-------
 .../tools/godot/pkg_config_additions.patch    |  7 +++--
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 1ea4d160b4c..067ac4aa694 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
-, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
-, libpulseaudio, libGLU, zlib }:
+{ stdenv, lib, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
+, libXinerama, libXrandr, libXrender, libpulseaudio ? null
+, libXi ? null, libXext, libXfixes, freetype, openssl
+, alsaLib, libGLU, zlib, yasm ? null }:
 
-stdenv.mkDerivation rec {
+let
+  options = {
+    touch = libXi != null;
+    pulseaudio = false;
+  };
+in stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "2.1.4";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48";
+    sha256 = "1pgs2hghjhs3vkgxsi50i5myr7yac3jhpk4vi4bcra1cvdmkgr39";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
-    freetype openssl alsaLib libpulseaudio libGLU zlib
+    libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
+    libGLU zlib
   ];
 
   patches = [ ./pkg_config_additions.patch ];
@@ -24,12 +31,14 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildPhase = ''
-    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES
+    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \
+      ${lib.concatStringsSep " "
+          (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}
   '';
 
   installPhase = ''
-    mkdir $out/bin -p
-    cp bin/godot.* $out/bin/
+    mkdir $out
+    cp -r bin $out
   '';
 
   meta = {
@@ -37,5 +46,6 @@ stdenv.mkDerivation rec {
     description = "Free and Open Source 2D and 3D game engine";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index 2302710ac7e..4870ec3cd70 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,9 +1,12 @@
 +++ build/platform/x11/detect.py
-@@ -139,6 +139,10 @@
-     env.ParseConfig('pkg-config xinerama --cflags --libs')
+@@ -142,3 +142,10 @@
      env.ParseConfig('pkg-config xcursor --cflags --libs')
+     env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
 +    env.ParseConfig('pkg-config xrender --cflags --libs')
++    env.ParseConfig('pkg-config xi --cflags --libs')
++    env.ParseConfig('pkg-config xext --cflags --libs')
++    env.ParseConfig('pkg-config xfixes --cflags --libs')
 +    env.ParseConfig('pkg-config oslibGLU_combined --cflags')
 +    env.ParseConfig('pkg-config glu --cflags --libs')
 +    env.ParseConfig('pkg-config zlib --cflags --libs')

From 494a4ef3ce33d7edc1661273e18cee2a2f10b9d2 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 14 Feb 2018 17:43:33 +0000
Subject: [PATCH 008/170] godot_headers: init at
 51bca3bf5d917341f3e15076c5a9191f8a5118ae

---
 .../libraries/godot_headers/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/godot_headers/default.nix

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
new file mode 100644
index 00000000000..07f901bf9ac
--- /dev/null
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name = "godot_headers";
+  version = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
+  src = fetchFromGitHub {
+    owner = "GodotNativeTools";
+    repo = "godot_headers";
+    rev = version;
+    sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
+  };
+  buildPhase = "true";
+  installPhase = "cp -r . $out";
+  meta = {
+    homepage = "https://github.com/GodotNativeTools/godot_headers/";
+    description = "Headers for the Godot API supplied by the GDNative module";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.twey ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b900829..e7119965b02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2560,6 +2560,7 @@ with pkgs;
   gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
 
   godot = callPackage ../development/tools/godot {};
+  godot_headers = callPackage ../development/libraries/godot_headers {};
 
   goklp = callPackage ../tools/networking/goklp {};
 

From 62ab6170523962c2a2b0bb743b5f02715fdeb680 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Feb 2018 11:41:13 +0000
Subject: [PATCH 009/170] godot_headers: clean up output path

---
 pkgs/development/libraries/godot_headers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
index 07f901bf9ac..aa29d2788fe 100644
--- a/pkgs/development/libraries/godot_headers/default.nix
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
   };
   buildPhase = "true";
-  installPhase = "cp -r . $out";
+  installPhase = ''
+    mkdir $out
+    cp -r . $out/include
+  '';
   meta = {
     homepage = "https://github.com/GodotNativeTools/godot_headers/";
     description = "Headers for the Godot API supplied by the GDNative module";

From ef5fd1cf27e0b2cd62c7bcb78defd83dd355ff86 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Feb 2018 11:41:26 +0000
Subject: [PATCH 010/170] godot: clean up output path

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 067ac4aa694..395080c3da5 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -37,8 +37,8 @@ in stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir $out
-    cp -r bin $out
+    mkdir -p $out/bin
+    cp -r bin/godot.x11.tools.64 $out/bin/godot
   '';
 
   meta = {

From 2b96b03333e8d1c78c9ecd96df3182bd9c0b991d Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Tue, 20 Feb 2018 11:58:59 +0000
Subject: [PATCH 011/170] godot_headers: provide a better version string

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

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
index aa29d2788fe..c60fbdd3acc 100644
--- a/pkgs/development/libraries/godot_headers/default.nix
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "godot_headers";
-  version = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
+  version = "2018-02-09";
   src = fetchFromGitHub {
     owner = "GodotNativeTools";
     repo = "godot_headers";
-    rev = version;
+    rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
     sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
   };
   buildPhase = "true";

From 7ba969f87e68cad7c813210e758cff0b2cdd4047 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 21 Feb 2018 12:23:11 +0000
Subject: [PATCH 012/170] godot: stop build process from looking in global
 directories

---
 pkgs/development/tools/godot/default.nix         |  7 +++++--
 .../tools/godot/dont_clobber_environment.patch   | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/godot/dont_clobber_environment.patch

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 395080c3da5..9b515511953 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -23,10 +23,13 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
     libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
-    libGLU zlib
+    libGLU zlib yasm
   ];
 
-  patches = [ ./pkg_config_additions.patch ];
+  patches = [
+    ./pkg_config_additions.patch
+    ./dont_clobber_environment.patch
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch
new file mode 100644
index 00000000000..c57c85588a0
--- /dev/null
+++ b/pkgs/development/tools/godot/dont_clobber_environment.patch
@@ -0,0 +1,16 @@
++++ build/SConstruct
+@@ -69,10 +69,10 @@
+         custom_tools = ['mingw']
+ 
+ env_base = Environment(tools=custom_tools)
+-if 'TERM' in os.environ:
+-    env_base['ENV']['TERM'] = os.environ['TERM']
+-env_base.AppendENVPath('PATH', os.getenv('PATH'))
+-env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
++for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
++    if (k in os.environ):
++        env_base["ENV"][k] = os.environ[k]
++
+ env_base.global_defaults = global_defaults
+ env_base.android_maven_repos = []
+ env_base.android_flat_dirs = []

From 998f42aa4898f05bc7b25d3180f5402d20b7064b Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Mar 2018 17:44:44 +0000
Subject: [PATCH 013/170] godot: restrict build platforms to [ "i686-linux"
 "x86_64-linux" ]

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 9b515511953..375638a8220 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
     homepage    = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
     license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = [ "i646-linux" "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }

From 5fbbd5e02bf73e3edb589e99b4f95658cf7109cd Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 16 Mar 2018 19:54:32 +0000
Subject: [PATCH 014/170] godot: 3.0 -> 3.0.2

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 375638a8220..b2a4684ffeb 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "3.0";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "1pgs2hghjhs3vkgxsi50i5myr7yac3jhpk4vi4bcra1cvdmkgr39";
+    sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 4708b4e03b9bfa18435dbd2eb368c7726e1cb82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Sun, 18 Mar 2018 15:57:57 +0000
Subject: [PATCH 015/170] godot: fix stupid typo

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index b2a4684ffeb..3c4914cd7cd 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -41,14 +41,14 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -r bin/godot.x11.tools.64 $out/bin/godot
+    cp bin/godot.x11.tools.* $out/bin/godot
   '';
 
   meta = {
     homepage    = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine";
     license     = stdenv.lib.licenses.mit;
-    platforms   = [ "i646-linux" "x86_64-linux" ];
+    platforms   = [ "i686-linux" "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }

From d1d320f4935408b4535e8d4feaffc69cec2038a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Sun, 18 Mar 2018 16:18:03 +0000
Subject: [PATCH 016/170] godot_headers: set platforms = all

---
 pkgs/development/libraries/godot_headers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
index c60fbdd3acc..940882b1742 100644
--- a/pkgs/development/libraries/godot_headers/default.nix
+++ b/pkgs/development/libraries/godot_headers/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/GodotNativeTools/godot_headers/";
     description = "Headers for the Godot API supplied by the GDNative module";
     license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.twey ];
   };
 }

From 2d9f031334f123e56637ab613adf1985406769dd Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 18 Mar 2018 10:06:00 -0700
Subject: [PATCH 017/170] libsForQt5.quazip: 0.7.1 -> 0.7.3

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

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/fd2172c4a80f17d789d4e62fcb99e8a0
---
 pkgs/development/libraries/quazip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 4379f5cf667..8d096e18f08 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, zip, zlib, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "quazip-0.7.1";
+  name = "quazip-0.7.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/quazip/${name}.tar.gz";
-    sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq";
+    sha256 = "1db9w8ax1ki0p67a47h4cnbwfgi2di4y3k9nc3a610kffiag7m1a";
   };
 
   preConfigure = "cd quazip";

From 2220b5fe99acf5f31f825ee659f23c9b729c228f Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Mon, 19 Mar 2018 11:59:55 +0000
Subject: [PATCH 018/170] godot: update patches for 3.0.2

---
 .../tools/godot/pkg_config_additions.patch         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index 4870ec3cd70..f20226c5819 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,15 +1,17 @@
 +++ build/platform/x11/detect.py
-@@ -142,3 +142,10 @@
+@@ -142,8 +142,13 @@
      env.ParseConfig('pkg-config xcursor --cflags --libs')
      env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
+-
+-    if (env['touch']):
 +    env.ParseConfig('pkg-config xrender --cflags --libs')
-+    env.ParseConfig('pkg-config xi --cflags --libs')
 +    env.ParseConfig('pkg-config xext --cflags --libs')
 +    env.ParseConfig('pkg-config xfixes --cflags --libs')
-+    env.ParseConfig('pkg-config oslibGLU_combined --cflags')
 +    env.ParseConfig('pkg-config glu --cflags --libs')
 +    env.ParseConfig('pkg-config zlib --cflags --libs')
-
-     if (env['builtin_openssl'] == 'no'):
-         # Currently not compatible with OpenSSL 1.1.0+
++
++    if (env['touch']):
+         x11_error = os.system("pkg-config xi --modversion > /dev/null ")
+         if (x11_error):
+             print("xi not found.. cannot build with touch. Aborting.")

From 368ed89aa08e1e27c8bd210c160ec301c38832d1 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Mon, 19 Mar 2018 14:51:18 +0000
Subject: [PATCH 019/170] godot: simplify pkg_config_additions.patch

---
 .../tools/godot/pkg_config_additions.patch           | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index f20226c5819..286372f060a 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,17 +1,13 @@
-+++ build/platform/x11/detect.py
-@@ -142,8 +142,13 @@
++++ b/platform/x11/detect.py
+@@ -142,6 +142,11 @@
      env.ParseConfig('pkg-config xcursor --cflags --libs')
      env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
--
--    if (env['touch']):
 +    env.ParseConfig('pkg-config xrender --cflags --libs')
 +    env.ParseConfig('pkg-config xext --cflags --libs')
 +    env.ParseConfig('pkg-config xfixes --cflags --libs')
 +    env.ParseConfig('pkg-config glu --cflags --libs')
 +    env.ParseConfig('pkg-config zlib --cflags --libs')
-+
-+    if (env['touch']):
+ 
+     if (env['touch']):
          x11_error = os.system("pkg-config xi --modversion > /dev/null ")
-         if (x11_error):
-             print("xi not found.. cannot build with touch. Aborting.")

From 9508150198c2d02b4b674eecd06834fd049639e0 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Mon, 19 Mar 2018 14:51:36 +0000
Subject: [PATCH 020/170] godot: don't require gcc5

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

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 3c4914cd7cd..e89b2f62b15 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor
+{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor
 , libXinerama, libXrandr, libXrender, libpulseaudio ? null
 , libXi ? null, libXext, libXfixes, freetype, openssl
 , alsaLib, libGLU, zlib, yasm ? null }:
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender
+    scons libX11 libXcursor libXinerama libXrandr libXrender
     libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
     libGLU zlib yasm
   ];

From b08560fb0abcca6f2c704d1d0664e3cd17580172 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 21 Mar 2018 00:58:41 +0100
Subject: [PATCH 021/170] nixos/tests/atd : remove test of batch command

"batch" executes jobs based on system load.
test was not deterministic.
---
 nixos/tests/atd.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index c2c0a716e0d..5260c8ddfb8 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -17,20 +17,14 @@ import ./make-test.nix ({ pkgs, lib, ... }:
     startAll;
 
     $machine->fail("test -f ~root/at-1");
-    $machine->fail("test -f ~root/batch-1");
     $machine->fail("test -f ~alice/at-1");
-    $machine->fail("test -f ~alice/batch-1");
 
     $machine->succeed("echo 'touch ~root/at-1' | at now+1min");
-    $machine->succeed("echo 'touch ~root/batch-1' | batch");
     $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\"");
-    $machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\"");
 
     $machine->succeed("sleep 1.5m");
 
     $machine->succeed("test -f ~root/at-1");
-    $machine->succeed("test -f ~root/batch-1");
     $machine->succeed("test -f ~alice/at-1");
-    $machine->succeed("test -f ~alice/batch-1");
   '';
 })

From d9292429e73659fca200aeed73cfb0078adaf3e6 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 7 Mar 2018 08:57:40 +0900
Subject: [PATCH 022/170] alot: 0.5.1 to 0.7.0

- added gnupg to checkInputs
- generate manpage (optional)
- move alot.desktop file to $out/share/applications
- disabled tests as they need the network (dependency on twisted)

Thanks to Sarah Brofeldt, Ben Mcginnes for their help (and other) and
to FRidh for the repeated careful reviews.
---
 pkgs/development/libraries/gpgme/default.nix  | 23 ++++++++--
 .../python-modules/alot/default.nix           | 42 +++++++++++++------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 1e59e8f1d65..8958ce45741 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,10 +1,18 @@
 { stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
-, qtbase ? null }:
+, file, which
+, autoreconfHook
+# git can apparently be removed when setting some envvar
+, git
+, texinfo5
+, qtbase ? null
+, withPython ? false, swig2 ? null, python ? null
+}:
 
 let inherit (stdenv) lib system; in
 
 stdenv.mkDerivation rec {
-  name = "gpgme-1.10.0";
+  name = "gpgme-${version}";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
@@ -18,11 +26,17 @@ stdenv.mkDerivation rec {
     [ libgpgerror glib libassuan pth ]
     ++ lib.optional (qtbase != null) qtbase;
 
-  nativeBuildInputs = [ pkgconfig gnupg ];
+  nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ]
+  ++ lib.optionals withPython [ python swig2 which ];
+
+  postPatch =''
+    substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
+  '';
 
   configureFlags = [
     "--enable-fixed-path=${gnupg}/bin"
-  ];
+    "--with-libgpg-error-prefix=${libgpgerror.dev}"
+  ] ++ lib.optional withPython "--enable-languages=python";
 
   NIX_CFLAGS_COMPILE =
     # qgpgme uses Q_ASSERT which retains build inputs at runtime unless
@@ -45,3 +59,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ fuuzetsu primeos ];
   };
 }
+
diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index 67cd7eafd12..7c704c9dc55 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k
-, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme}:
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme
+, service-identity, gpg
+, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
+, withManpage ? false }:
+
 
 buildPythonPackage rec {
-  version = "0.5.1";
   pname = "alot";
+  version = "0.7";
+  outputs = [ "out" ] ++ lib.optional withManpage "man";
 
   disabled = isPy3k;
 
   src = fetchFromGitHub {
     owner = "pazz";
-    repo = pname;
-    rev = "version";
-    sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8";
+    repo = "alot";
+    rev = "${version}";
+    sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi";
   };
 
   postPatch = ''
@@ -20,6 +25,8 @@ buildPythonPackage rec {
                 "themes_dir = string(default='$out/share/themes')"
   '';
 
+  nativeBuildInputs = lib.optional withManpage sphinx;
+
   propagatedBuildInputs = [
     notmuch
     urwid
@@ -27,21 +34,32 @@ buildPythonPackage rec {
     twisted
     python_magic
     configobj
-    pygpgme
-    mock
+    service-identity
     file
+    gpg
   ];
 
-  postInstall = ''
-    mkdir -p $out/share
+  # some twisted tests need the network (test_env_set... )
+  doCheck = false;
+  postBuild = lib.optionalString withManpage "make -C docs man";
+
+  checkInputs =  [ awk future mock gnupg procps ];
+
+  postInstall = lib.optionalString withManpage ''
+    mkdir -p $out/man
+    cp -r docs/build/man $out/man
+  ''
+  + ''
+    mkdir -p $out/share/applications
     cp -r extra/themes $out/share
-    wrapProgram $out/bin/alot \
-      --prefix LD_LIBRARY_PATH : '${stdenv.lib.makeLibraryPath [ notmuch file gpgme ]}'
+
+    sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
   '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/pazz/alot;
     description = "Terminal MUA using notmuch mail";
+    license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ garbas ];
   };

From ee482f85bfb28626c4dc115ee062cc032d3aef4d Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 7 Mar 2018 08:56:48 +0900
Subject: [PATCH 023/170] service_identity: cosmetic changes

---
 pkgs/development/python-modules/service_identity/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix
index 779e974f15e..93e172a4f60 100644
--- a/pkgs/development/python-modules/service_identity/default.nix
+++ b/pkgs/development/python-modules/service_identity/default.nix
@@ -13,8 +13,6 @@
 buildPythonPackage rec {
   pname = "service_identity";
   version = "17.0.0";
-  name = "${pname}-${version}";
-
 
   src = fetchFromGitHub {
     owner = "pyca";
@@ -33,6 +31,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Service identity verification for pyOpenSSL";
     license = licenses.mit;
-    homepage = "https://service-identity.readthedocs.io";
+    homepage = https://service-identity.readthedocs.io;
   };
 }

From a8403b64f837e0e12fc329fd313bc56e8ea94b6c Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 7 Mar 2018 08:52:01 +0900
Subject: [PATCH 024/170] gpgme: add withPython ? false to enable bindings

Useful for MUAs mostly, like alot
---
 pkgs/development/libraries/gpgme/default.nix | 2 --
 pkgs/top-level/python-packages.nix           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 8958ce45741..68762e344bd 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
 , file, which
 , autoreconfHook
-# git can apparently be removed when setting some envvar
 , git
 , texinfo5
 , qtbase ? null
@@ -59,4 +58,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ fuuzetsu primeos ];
   };
 }
-
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c49b6bc0c8..7ad86720bb6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8173,6 +8173,8 @@ in {
 
   google_gax = callPackage ../development/python-modules/google_gax { };
 
+  gpg = toPythonModule (pkgs.gpgme.override { withPython=true; });
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   greenlet = buildPythonPackage rec {

From a9a7580c3fe85c8497c3aa3dbe8b7a27ebdda7a5 Mon Sep 17 00:00:00 2001
From: Daniel Kuehn <daniel@kuehn.se>
Date: Wed, 21 Mar 2018 21:53:02 +0100
Subject: [PATCH 025/170] ceph: Add makeWrapper to dependencies and
 nativeBuildInputs

The ceph-mgr daemon needs to know the location of cephs own-made python modules for some of the modules
that you can enable for it.
With wrapProgram, a wrapper is added that sets the proper pythonpath environment variable for the ceph-mgr
daemon so its modules can find the ceph python modules
---
 pkgs/tools/filesystems/ceph/generic.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 32b85eaa681..a637d3891ec 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -5,7 +5,7 @@
 , openldap, lttngUst
 , babeltrace, gperf
 , cunit, snappy
-, rocksdb
+, rocksdb, makeWrapper
 
 # Optional Dependencies
 , yasm ? null, fcgi ? null, expat ? null
@@ -97,6 +97,7 @@ let
     ps.pecan
     ps.prettytable
     ps.webob
+    ps.cherrypy
 	]);
 
 in
@@ -114,7 +115,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig which git python2Packages.wrapPython
+    pkgconfig which git python2Packages.wrapPython makeWrapper
     (ensureNewerSourcesHook { year = "1980"; })
   ];
   
@@ -159,6 +160,7 @@ stdenv.mkDerivation {
 
   postFixup = ''
     wrapPythonPrograms
+    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/lib/python2.7/site-packages
   '';
 
   enableParallelBuilding = true;

From 8c7883c027c7e4cecf3d2cf06283100ae6576c13 Mon Sep 17 00:00:00 2001
From: Alex Vorobiev <alexander.vorobiev@gmail.com>
Date: Thu, 22 Mar 2018 12:21:12 -0500
Subject: [PATCH 026/170] Update default.nix

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

diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index 3b05c9be451..3cb416a5f7c 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableGUI) ''
     wrapProgram $out/bin/xpdf \
       --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}
   '';

From d74bcbc8ad0d683a368fde8ec5ad5ae168989199 Mon Sep 17 00:00:00 2001
From: Daniel Kuehn <daniel@kuehn.se>
Date: Thu, 22 Mar 2018 21:08:28 +0100
Subject: [PATCH 027/170] ceph: Change hardcoded site-packages path to
 utilizing the python2Packages.python.sitePackages attribute instead

---
 pkgs/tools/filesystems/ceph/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index a637d3891ec..764f082aa89 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation {
 
   postFixup = ''
     wrapPythonPrograms
-    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/lib/python2.7/site-packages
+    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages}
   '';
 
   enableParallelBuilding = true;

From e26810069eb093b991d8d4f4c9caab321efba7b0 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 16 Mar 2018 18:09:50 +0100
Subject: [PATCH 028/170] spice-gtk: fix symlink errors, add withPolkit option

---
 .../libraries/spice-gtk/default.nix           | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f9b3de36b2c..d03e39ac943 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,8 +1,29 @@
 { stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1
 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
 , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
-, polkit, acl, usbutils, vala
-, gtk3, epoxy }:
+, withPolkit ? true, polkit, acl, usbutils
+, vala, gtk3, epoxy }:
+
+# If this package is built with polkit support (withPolkit=true),
+# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
+# The helper confirms via polkit that the user has an active session,
+# then adds a device acl entry for that user.
+# Example NixOS config to create a setuid wrapper for the helper:
+# security.wrappers.spice-client-glib-usb-acl-helper.source =
+#   "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper";
+# On non-NixOS installations, make a setuid copy of the helper
+# outside the store and adjust PATH to find the setuid version.
+
+# If this package is built without polkit support (withPolkit=false),
+# usb redirection requires read-write access to usb devices.
+# This can be granted by adding users to a custom group like "usb"
+# and using a udev rule to put all usb devices in that group.
+# Example NixOS config:
+#  users.groups.usb = {};
+#  users.users.dummy.extraGroups = [ "usb" ];
+#  services.udev.extraRules = ''
+#    KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb"
+#  '';
 
 with stdenv.lib;
 
@@ -18,11 +39,16 @@ in stdenv.mkDerivation rec {
     sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";
   };
 
+  postPatch = ''
+    # get rid of absolute path to helper in store so we can use a setuid wrapper
+    substituteInPlace src/usb-acl-helper.c \
+      --replace 'ACL_HELPER_PATH"/' '"'
+  '';
+
   buildInputs = [
     spice-protocol celt_0_5_1 openssl libpulseaudio pixman
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy
-    polkit acl usbutils
-  ];
+  ] ++ optionals withPolkit [ polkit acl usbutils ] ;
 
   nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
 
@@ -34,16 +60,6 @@ in stdenv.mkDerivation rec {
     "--enable-vala"
   ];
 
-  # usb redirection needs spice-client-glib-usb-acl-helper to run setuid root
-  # the helper then uses polkit to check access
-  # in nixos, enable this with
-  # security.wrappers.spice-client-glib-usb-acl-helper.source =
-  #   "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper.real";
-  postFixup = ''
-    mv $out/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper.real
-    ln -sf /run/wrappers/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper
-  '';
-
   dontDisableStatic = true; # Needed by the coroutine test
 
   enableParallelBuilding = true;

From 880d8c16b5b8a2281a8f26b5f0bd76a3aad8dd46 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 11:55:31 +0100
Subject: [PATCH 029/170] libsepol: 2.4 -> 2.7

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

diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index f7f393afb39..59962e911d4 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsepol-${version}";
-  version = "2.4";
-  se_release = "20150202";
+  version = "2.7";
+  se_release = "20170804";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
-    sha256 = "0ncnwhpc1gx4hrrb822fqkwy5h75zzngsrfkd5mlqh1jk7aib419";
+    sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn";
   };
 
   nativeBuildInputs = [ flex ];
@@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
   '';
 
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ];
 
   passthru = { inherit se_release se_url; };
 

From ea7507b9dc990814ca6d69997add7fe7c9e36f7b Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 13:25:41 +0100
Subject: [PATCH 030/170] libselinux: 2.4 -> 2.7

---
 pkgs/os-specific/linux/libselinux/default.nix | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 541ead7258f..0175f79483f 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libsepol, pcre
+{ stdenv, fetchurl, pcre, pkgconfig, libsepol
 , enablePython ? true, swig ? null, python ? null
 }:
 
@@ -8,48 +8,34 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libselinux-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
-    sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126";
+    sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libsepol pcre ]
              ++ optionals enablePython [ swig python ];
 
-  # Avoid this false warning:
-  # avc_internal.c: In function 'avc_netlink_receive':
-  # avc_internal.c:105:25: error: cast increases required alignment of target type [-Werror=cast-align]
-  #  struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
-  #                         ^
-
-  NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-error=cast-align";
-
-  # Unreleased upstream patch that fixes Python package issue arising
-  # from recent SWIG changes.
-  patches = optional enablePython (fetchpatch {
-    name = "fix-python-swig.patch";
-    url = "https://github.com/SELinuxProject/selinux/commit/a9604c30a5e2f71007d31aa6ba41cf7b95d94822.patch";
-    sha256 = "0mjrclh0sd8m7vq0wvl6pg29ss415j3kn0266v8ixy4fprafagfp";
-    stripLen = 1;
-  });
+  # drop fortify here since package uses it by default, leading to compile error:
+  # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
+  hardeningDisable = [ "fortify" ];
 
   postPatch = optionalString enablePython ''
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
-  ''
-  + ''
-    sed '1i#include <sys/uio.h>' -i src/setrans_client.c
   '';
 
+  # fix install locations
   preBuild = ''
-    # Build fails without this precreated
-    mkdir -p $out/include
-
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
+    makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
   '';
 
   installTargets = [ "install" ] ++ optional enablePython "install-pywrap";

From 232c39e7abdb86c3533c258dc0bcacd380c34369 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 13:43:48 +0100
Subject: [PATCH 031/170] libsemanage: 2.4 -> 2.7

---
 .../os-specific/linux/libsemanage/default.nix | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 587349e4067..303853c9ee2 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -1,31 +1,33 @@
-{ stdenv, fetchurl, bison, flex, libsepol, libselinux, ustr, bzip2, libaudit }:
+{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, libaudit
+, enablePython ? true, swig ? null, python ? null
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libsemanage-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
-    sha256 = "1134ka4mi4387ac5yv68bpp2y7ln5xxhwp07xhqnay0nxzjaqk0s";
+    sha256 = "0xnlp1yg8b1aqc6kq3pss1i1nl06rfj4x4pyl5blasnf2ivlgs87";
   };
 
-  nativeBuildInputs = [ bison flex ];
-  buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
-
-  NIX_CFLAGS_COMPILE = [
-    "-fstack-protector-all"
-    "-std=gnu89"
-    # these were added to fix build with gcc7. review on update
-    "-Wno-error=format-truncation"
-    "-Wno-error=implicit-fallthrough"
-  ];
+  nativeBuildInputs = [ bison flex pkgconfig ];
+  buildInputs = [ libsepol libselinux bzip2 libaudit ]
+    ++ optionals enablePython [ swig python ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
   '';
 
+  installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
+
   meta = libsepol.meta // {
     description = "Policy management tools for SELinux";
     license = stdenv.lib.licenses.lgpl21;

From 70044c899ebda11f24ccacfe397084c4ea12a2c3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 20:06:58 +0100
Subject: [PATCH 032/170] policycoreutils: 2.4 -> 2.7

---
 .../linux/policycoreutils/default.nix         | 53 ++++---------------
 .../policycoreutils/fix-printf-type.patch     | 12 -----
 2 files changed, 11 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch

diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index 536c69ff557..d2f6371225f 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -1,64 +1,33 @@
-{ stdenv, fetchurl, pythonPackages, gettext
-, setools, libsepol, libselinux, libcap_ng, libsemanage, sepolgen
-}:
+{ stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }:
 
 stdenv.mkDerivation rec {
   name = "policycoreutils-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
-    sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq";
+    sha256 = "1x742c7lkw30namhkw87yg7z384qzqjz0pvmqs0lk19v6958l6qa";
   };
 
-  patches = [ ./fix-printf-type.patch ];
-
   postPatch = ''
-    # Fix references to libsepol.a
-    find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \;
-
     # Fix install references
-    substituteInPlace po/Makefile --replace /usr/bin/install install
-
-    # Fix references to /usr/share
-    grep -r '/usr/share' | awk -F: '{print $1}' | xargs sed -i "s,\(\$(DESTDIR)\)*/usr/share,$out/share,g"
-
-    # Fix sepolicy install
-    sed -i "s,\(setup.py install\).*,\1 --prefix=$out,g" sepolicy/Makefile
-
-    # Fix setuid install
-    sed -i 's|-m 4755|-m 755|' sandbox/Makefile
+    substituteInPlace po/Makefile \
+       --replace /usr/bin/install install --replace /usr/share /share
+    substituteInPlace newrole/Makefile --replace /usr/share /share
   '';
 
-  nativeBuildInputs = [ pythonPackages.python gettext ];
-  buildInputs = [ setools libsepol libselinux libcap_ng libsemanage ];
-  pythonPath = [ libselinux sepolgen ];
+  nativeBuildInputs = [ gettext ];
+  buildInputs = [ libsepol libselinux libsemanage ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
+    makeFlagsArray+=("LOCALEDIR=$out/share/locale")
+    makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
   '';
 
-  # Creation of the system-config-selinux directory is broken
-  preInstall = ''
-    mkdir -p $out/share/system-config-selinux
-  '';
-
-  # Fix the python scripts to include paths to libraries
-  # NOTE: We are not using wrapPythonPrograms or makeWrapper as these scripts
-  # purge the environment as a security measure
-  postInstall = ''
-    grep -r '#!.*python' $out/bin | awk -F: '{print $1}' | xargs sed -i "1a \
-    import sys; \
-    sys.path.append('$(toPythonPath "$out")'); \
-    ${stdenv.lib.flip stdenv.lib.concatMapStrings pythonPath (lib: ''
-      sys.path.append('$(toPythonPath "${lib}")'); \
-    '')}"
-  '';
-
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-
   meta = with stdenv.lib; {
     description = "SELinux policy core utilities";
     license = licenses.gpl2;
diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
deleted file mode 100644
index 6ab2d6dccc7..00000000000
--- a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c
---- policycoreutils-2.4/setfiles/restore.c	2015-02-02 09:38:10.000000000 -0500
-+++ policycoreutils-2.4.new/setfiles/restore.c	2015-08-29 20:44:13.693023222 -0400
-@@ -118,7 +118,7 @@
- 		r_opts->count++;
- 		if (r_opts->count % STAR_COUNT == 0) {
- 			if (r_opts->progress == 1) {
--				fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT );
-+				fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT );
- 			} else {
- 				if (r_opts->nfile > 0) {
- 					progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100;

From ac90dffdc70408ef14f99171c8a99f323db655f0 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 14 Mar 2018 20:17:04 +0100
Subject: [PATCH 033/170] checkpolicy: 2.4 -> 2.7

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

diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 8e01bb2a5c8..6ea73c9ac6c 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -2,27 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "checkpolicy-${version}";
-  version = "2.4";
+  version = "2.7";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
-    sha256 = "1m5wjm43lzp6bld8higsvdm2dkddydihhwv9qw2w9r4dm0largcv";
+    sha256 = "009j9jc0hi4l7k8f21hn8fm25n0mqgzdpd4nk30nds6d3nglf4sl";
   };
 
-  # Don't build tests
-  postPatch = ''
-    sed '/-C test/d' -i Makefile
-    sed '1i#include <ctype.h>' -i checkpolicy.c
-  '';
-
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-
   preBuild = ''
-    makeFlagsArray+=("LEX=flex")
     makeFlagsArray+=("LIBDIR=${libsepol}/lib")
     makeFlagsArray+=("PREFIX=$out")
   '';

From 07fe29741b0c9fa4d8f6554bfac2b0160fee1016 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 13:11:07 +0100
Subject: [PATCH 034/170] setools: 2015-02-12 -> 2017-11-10

---
 pkgs/os-specific/linux/setools/default.nix | 49 ++++++++++++----------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 8262c03e1e5..9cb5785ca98 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -1,35 +1,42 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, bison, flex
-, python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }:
+{ stdenv, fetchFromGitHub, bison, flex, python3 , swig
+, libsepol, libselinux, checkpolicy
+, withGraphics ? false
+}:
 
-stdenv.mkDerivation rec {
-  name = "setools-2015-02-12";
+with stdenv.lib;
+with python3.pkgs;
+
+buildPythonApplication rec {
+  pname = "setools";
+  version = "2017-11-10";
 
   src = fetchFromGitHub {
     owner = "TresysTechnology";
-    repo = "setools3";
-    rev = "f1e5b208d507171968ca4d2eeefd7980f1004a3c";
-    sha256 = "02gzy2kpszhr13f0d9qfiwh2hj4201g2x366j53v5n5qz481aykd";
+    repo = pname;
+    rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7";
+    sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn";
   };
 
-  configureFlags = [
-    "--disable-gui"
-    "--with-sepol-devel=${libsepol}"
-    "--with-selinux-devel=${libselinux}"
-    "--with-tcl=${tcl}/lib"
-  ];
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ libsepol swig ];
+  propagatedBuildInputs = [ enum34 libselinux networkx ]
+    ++ optionals withGraphics [ pyqt5 ];
 
-  hardeningDisable = [ "format" ];
+  checkInputs = [ tox checkpolicy ];
+  preCheck = ''
+    export CHECKPOLICY=${checkpolicy}/bin/checkpolicy
+  '';
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-  NIX_LDFLAGS = "-L${libsepol}/lib -L${libselinux}/lib";
+  setupPyBuildFlags = [ "-i" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python swig2 bison flex ];
-  buildInputs = [ tcl libxml2 sqlite bzip2 ];
+  preBuild = ''
+    export SEPOL="${libsepol}/lib/libsepol.a"
+  '';
 
   meta = {
     description = "SELinux Tools";
-    homepage = http://oss.tresys.com/projects/setools/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/TresysTechnology/setools/wiki;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 7ff15900f8a570232c01fba9b33f7c00939c1461 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 14:52:05 +0100
Subject: [PATCH 035/170] libsemanage: fix python lib path

---
 pkgs/os-specific/linux/libsemanage/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 303853c9ee2..45222bee6b0 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=("DESTDIR=$out")
     makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
     makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
-    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
   '';
 
   installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];

From cc8bf58427a39c765f3c039951ab3cf7e9533e24 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 14:52:37 +0100
Subject: [PATCH 036/170] libselinux: fix python lib path

---
 pkgs/os-specific/linux/libselinux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 0175f79483f..4ddc3010221 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
     makeFlagsArray+=("MAN5DIR=$out/share/man/man5")
     makeFlagsArray+=("MAN8DIR=$out/share/man/man8")
-    makeFlagsArray+=("PYSITEDIR=$out/lib/python2.7/site-packages")
+    makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages")
   '';
 
   installTargets = [ "install" ] ++ optional enablePython "install-pywrap";

From 905f4725562b8cf07d1a75fd6e5d6573d5cb5520 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 20 Mar 2018 14:56:08 +0100
Subject: [PATCH 037/170] selinux-python: init at 2.7

tools written in python that upstream moved from policycoreutils
into a separate package
---
 .../linux/selinux-python/default.nix          | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/os-specific/linux/selinux-python/default.nix

diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix
new file mode 100644
index 00000000000..8ac207d6421
--- /dev/null
+++ b/pkgs/os-specific/linux/selinux-python/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, python3
+, libselinux, libsemanage, libsepol, setools }:
+
+# this is python3 only because setools only supports python3
+
+with stdenv.lib;
+with python3.pkgs;
+
+stdenv.mkDerivation rec {
+  name = "selinux-python-${version}";
+  version = "2.7";
+  se_release = "20170804";
+  se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
+
+  src = fetchurl {
+    url = "${se_url}/${se_release}/selinux-python-${version}.tar.gz";
+    sha256 = "1va0y4b7cah7rprh04b3ylmwqgnivpkw5z2zw68nrafdbsbcn5s2";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+  buildInputs = [ libsepol python3 ];
+  propagatedBuildInputs = [ libselinux libsemanage setools ipy ];
+
+  postPatch = ''
+    substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix"
+  '';
+
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("LOCALEDIR=$out/share/locale")
+    makeFlagsArray+=("LIBSEPOLA=${libsepol}/lib/libsepol.a")
+    makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions")
+    makeFlagsArray+=("PYTHON=${python3}/bin/python")
+    makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages")
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "SELinux policy core utilities written in Python";
+    license = licenses.gpl2;
+    homepage = https://selinuxproject.org;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85fbb8894ec..28ef4f64be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20660,6 +20660,11 @@ with pkgs;
   seafile-shared = callPackage ../misc/seafile-shared { };
 
   serviio = callPackage ../servers/serviio {};
+  selinux-python = callPackage ../os-specific/linux/selinux-python {
+    # needs python3 bindings
+    libselinux = libselinux.override { python = python3; };
+    libsemanage = libsemanage.override { python = python3; };
+  };
 
   slock = callPackage ../misc/screensavers/slock {
     conf = config.slock.conf or null;

From f7fe3f51840d6d978cb644ce209ce3466de480eb Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 15 Mar 2018 23:57:19 +0100
Subject: [PATCH 038/170] selinux-sandbox: init at 2.7

---
 .../linux/selinux-sandbox/default.nix         | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/os-specific/linux/selinux-sandbox/default.nix

diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix
new file mode 100644
index 00000000000..71d2ee6e80a
--- /dev/null
+++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, bash, coreutils, python3
+, libcap_ng, policycoreutils, selinux-python, dbus
+, xorgserver, openbox, xmodmap }:
+
+# this is python3 only as it depends on selinux-python
+
+with stdenv.lib; 
+with python3.pkgs;
+
+stdenv.mkDerivation rec {
+  name = "selinux-sandbox-${version}";
+  version = "2.7";
+  se_release = "20170804";
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${se_release}/selinux-sandbox-${version}.tar.gz";
+    sha256 = "0hf5chm90iapb42njaps6p5460ys3ajh5446ja544vdbh01n544l";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+  buildInputs = [ bash coreutils libcap_ng policycoreutils python3 xorgserver openbox xmodmap dbus ];
+  propagatedBuildInputs = [ pygobject3 selinux-python ];
+
+  postPatch = ''
+    # Fix setuid install
+    substituteInPlace Makefile --replace "-m 4755" "-m 755"
+    substituteInPlace sandboxX.sh \
+      --replace "#!/bin/sh" "#!${bash}/bin/sh" \
+      --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
+      --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
+      --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
+      --replace "secon" "${policycoreutils}/bin/secon"
+    substituteInPlace sandbox \
+      --replace "/usr/sbin/seunshare" "$out/bin/seunshare" \
+      --replace "/usr/share/sandbox" "$out/share/sandbox" \
+      --replace "/usr/share/locale" "${policycoreutils}/share/locale" \
+      --replace "/usr/bin/openbox" "${openbox}/bin/openbox" \
+      --replace "#!/bin/sh" "#!${bash}/bin/sh" \
+      --replace "dbus-" "${dbus}/bin/dbus-" \
+      --replace "/usr/bin/xmodmap" "${xmodmap}/bin/xmodmap" \
+      --replace "/usr/bin/shred" "${coreutils}/bin/shred" \
+      --replace "/usr/bin/test" "${coreutils}/bin/test" \
+  '';
+
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "SELinux sandbox utility";
+    license = licenses.gpl2;
+    homepage = https://selinuxproject.org;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28ef4f64be7..d0f3121bbac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11357,6 +11357,8 @@ with pkgs;
 
   sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};
 
+  selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { };
+
   serd = callPackage ../development/libraries/serd {};
 
   serf = callPackage ../development/libraries/serf {};

From 72e898706871e60076003b2070ec7626fc500432 Mon Sep 17 00:00:00 2001
From: Peter Romfeld <peter.romfeld.hk@gmail.com>
Date: Sat, 24 Mar 2018 15:35:52 +0800
Subject: [PATCH 039/170] nodePackages_8_x.swagger: init at 0.7.5

---
 .../node-packages/node-packages-v8.json       |    1 +
 .../node-packages/node-packages-v8.nix        | 3956 ++++++++++++++++-
 2 files changed, 3799 insertions(+), 158 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 8abdc0e608c..59de12c29f7 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -11,5 +11,6 @@
 , "pnpm"
 , "semver"
 , "sloc"
+, "swagger"
 , "npm"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 3f6765bb008..bb1c7eba168 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -4,6 +4,15 @@
 
 let
   sources = {
+    "URIjs-1.16.1" = {
+      name = "URIjs";
+      packageName = "URIjs";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/URIjs/-/URIjs-1.16.1.tgz";
+        sha1 = "edebc678b8b74b26b05d2b481e12383f5ae04b8b";
+      };
+    };
     "abbrev-1.1.1" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -31,13 +40,49 @@ let
         sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "ansi-diff-stream-1.2.0" = {
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
+    "ansi-align-2.0.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
+        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
+      };
+    };
+    "ansi-diff-stream-1.2.1" = {
       name = "ansi-diff-stream";
       packageName = "ansi-diff-stream";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz";
-        sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e";
+        url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz";
+        sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix";
+      };
+    };
+    "ansi-escapes-1.4.0" = {
+      name = "ansi-escapes";
+      packageName = "ansi-escapes";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz";
+        sha1 = "d3a8a83b319aa67793662b13e761c7911422306e";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -58,6 +103,15 @@ let
         sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
     "ansi-styles-3.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
@@ -76,6 +130,15 @@ let
         sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi";
       };
     };
+    "anymatch-2.0.0" = {
+      name = "anymatch";
+      packageName = "anymatch";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz";
+        sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6";
+      };
+    };
     "ap-0.1.0" = {
       name = "ap";
       packageName = "ap";
@@ -85,6 +148,15 @@ let
         sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150";
       };
     };
+    "append-field-0.1.0" = {
+      name = "append-field";
+      packageName = "append-field";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz";
+        sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a";
+      };
+    };
     "append-tree-2.4.1" = {
       name = "append-tree";
       packageName = "append-tree";
@@ -112,6 +184,15 @@ let
         sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d";
       };
     };
+    "argparse-1.0.10" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+        sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
+      };
+    };
     "arr-diff-2.0.0" = {
       name = "arr-diff";
       packageName = "arr-diff";
@@ -121,6 +202,15 @@ let
         sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf";
       };
     };
+    "arr-diff-4.0.0" = {
+      name = "arr-diff";
+      packageName = "arr-diff";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz";
+        sha1 = "d6461074febfec71e7e15235761a329a5dc7c520";
+      };
+    };
     "arr-flatten-1.1.0" = {
       name = "arr-flatten";
       packageName = "arr-flatten";
@@ -130,6 +220,15 @@ let
         sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
+    "arr-union-3.1.0" = {
+      name = "arr-union";
+      packageName = "arr-union";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz";
+        sha1 = "e39b09aea9def866a8f206e288af63919bae39c4";
+      };
+    };
     "array-lru-1.1.1" = {
       name = "array-lru";
       packageName = "array-lru";
@@ -148,6 +247,15 @@ let
         sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53";
       };
     };
+    "array-unique-0.3.2" = {
+      name = "array-unique";
+      packageName = "array-unique";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz";
+        sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
+      };
+    };
     "asn1-0.2.3" = {
       name = "asn1";
       packageName = "asn1";
@@ -166,6 +274,15 @@ let
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
+    "assign-symbols-1.0.0" = {
+      name = "assign-symbols";
+      packageName = "assign-symbols";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz";
+        sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
+      };
+    };
     "async-0.9.2" = {
       name = "async";
       packageName = "async";
@@ -184,6 +301,15 @@ let
         sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
       };
     };
+    "async-1.5.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+      };
+    };
     "async-2.1.5" = {
       name = "async";
       packageName = "async";
@@ -193,6 +319,15 @@ let
         sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
+    "async-each-1.0.1" = {
+      name = "async-each";
+      packageName = "async-each";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz";
+        sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -202,6 +337,15 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
+    "atob-2.0.3" = {
+      name = "atob";
+      packageName = "atob";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz";
+        sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d";
+      };
+    };
     "atomic-batcher-1.0.2" = {
       name = "atomic-batcher";
       packageName = "atomic-batcher";
@@ -238,6 +382,15 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
+    "base-0.11.2" = {
+      name = "base";
+      packageName = "base";
+      version = "0.11.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
+        sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5";
+      };
+    };
     "bcrypt-pbkdf-1.0.1" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
@@ -265,6 +418,15 @@ let
         sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2";
       };
     };
+    "binary-extensions-1.11.0" = {
+      name = "binary-extensions";
+      packageName = "binary-extensions";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz";
+        sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205";
+      };
+    };
     "bitfield-rle-2.1.0" = {
       name = "bitfield-rle";
       packageName = "bitfield-rle";
@@ -319,6 +481,15 @@ let
         sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8";
       };
     };
+    "body-parser-1.12.4" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.12.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz";
+        sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
+      };
+    };
     "boom-4.3.1" = {
       name = "boom";
       packageName = "boom";
@@ -337,6 +508,15 @@ let
         sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
       };
     };
+    "boxen-1.3.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz";
+        sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc";
+      };
+    };
     "brace-expansion-1.1.11" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
@@ -355,6 +535,15 @@ let
         sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7";
       };
     };
+    "braces-2.3.1" = {
+      name = "braces";
+      packageName = "braces";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz";
+        sha512 = "2fpcx8h100fhpaffr6mh5ysp6dv06nl5xkii807fw0c603i15sg3wsxmj63fdn4apxdnn8an2ks883mvrdsv7mfryhfxg1pf1h6bvj8";
+      };
+    };
     "browser-stdout-1.3.1" = {
       name = "browser-stdout";
       packageName = "browser-stdout";
@@ -364,6 +553,33 @@ let
         sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a";
       };
     };
+    "buffer-alloc-1.1.0" = {
+      name = "buffer-alloc";
+      packageName = "buffer-alloc";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz";
+        sha1 = "05514d33bf1656d3540c684f65b1202e90eca303";
+      };
+    };
+    "buffer-alloc-unsafe-0.1.1" = {
+      name = "buffer-alloc-unsafe";
+      packageName = "buffer-alloc-unsafe";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz";
+        sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a";
+      };
+    };
+    "buffer-alloc-unsafe-1.0.0" = {
+      name = "buffer-alloc-unsafe";
+      packageName = "buffer-alloc-unsafe";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz";
+        sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe";
+      };
+    };
     "buffer-equals-1.0.4" = {
       name = "buffer-equals";
       packageName = "buffer-equals";
@@ -373,6 +589,24 @@ let
         sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5";
       };
     };
+    "buffer-fill-0.1.0" = {
+      name = "buffer-fill";
+      packageName = "buffer-fill";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.0.tgz";
+        sha1 = "ca9470e8d4d1b977fd7543f4e2ab6a7dc95101a8";
+      };
+    };
+    "buffer-from-1.0.0" = {
+      name = "buffer-from";
+      packageName = "buffer-from";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz";
+        sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk";
+      };
+    };
     "buffer-indexof-1.1.1" = {
       name = "buffer-indexof";
       packageName = "buffer-indexof";
@@ -382,13 +616,40 @@ let
         sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3";
       };
     };
-    "bulk-write-stream-1.1.3" = {
+    "bulk-write-stream-1.1.4" = {
       name = "bulk-write-stream";
       packageName = "bulk-write-stream";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz";
-        sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275";
+        url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz";
+        sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs";
+      };
+    };
+    "busboy-0.2.14" = {
+      name = "busboy";
+      packageName = "busboy";
+      version = "0.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz";
+        sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453";
+      };
+    };
+    "bytes-1.0.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+      };
+    };
+    "bytes-2.1.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz";
+        sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4";
       };
     };
     "bytes-3.0.0" = {
@@ -400,6 +661,15 @@ let
         sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
       };
     };
+    "cache-base-1.0.1" = {
+      name = "cache-base";
+      packageName = "cache-base";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
+        sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0";
+      };
+    };
     "call-me-maybe-1.0.1" = {
       name = "call-me-maybe";
       packageName = "call-me-maybe";
@@ -409,6 +679,33 @@ let
         sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b";
       };
     };
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "capture-stack-trace-1.0.0" = {
+      name = "capture-stack-trace";
+      packageName = "capture-stack-trace";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
+        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -418,6 +715,24 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
     "chalk-2.3.2" = {
       name = "chalk";
       packageName = "chalk";
@@ -427,6 +742,24 @@ let
         sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
       };
     };
+    "charenc-0.0.2" = {
+      name = "charenc";
+      packageName = "charenc";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz";
+        sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
+      };
+    };
+    "chokidar-2.0.3" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz";
+        sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd";
+      };
+    };
     "chownr-1.0.1" = {
       name = "chownr";
       packageName = "chownr";
@@ -436,6 +769,42 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
+    "circular-append-file-1.0.1" = {
+      name = "circular-append-file";
+      packageName = "circular-append-file";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz";
+        sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05";
+      };
+    };
+    "class-utils-0.3.6" = {
+      name = "class-utils";
+      packageName = "class-utils";
+      version = "0.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
+        sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58";
+      };
+    };
+    "cli-boxes-1.0.0" = {
+      name = "cli-boxes";
+      packageName = "cli-boxes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
+        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
+      };
+    };
+    "cli-cursor-1.0.2" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz";
+        sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987";
+      };
+    };
     "cli-table-0.3.1" = {
       name = "cli-table";
       packageName = "cli-table";
@@ -454,6 +823,15 @@ let
         sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc";
       };
     };
+    "cli-width-1.1.1" = {
+      name = "cli-width";
+      packageName = "cli-width";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz";
+        sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d";
+      };
+    };
     "cliclopts-1.1.1" = {
       name = "cliclopts";
       packageName = "cliclopts";
@@ -463,6 +841,24 @@ let
         sha1 = "69431c7cb5af723774b0d3911b4c37512431910f";
       };
     };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "clone-2.0.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz";
+        sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e";
+      };
+    };
     "co-4.6.0" = {
       name = "co";
       packageName = "co";
@@ -490,6 +886,15 @@ let
         sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8";
       };
     };
+    "collection-visit-1.0.0" = {
+      name = "collection-visit";
+      packageName = "collection-visit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz";
+        sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
+      };
+    };
     "color-convert-1.9.1" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -535,6 +940,15 @@ let
         sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
       };
     };
+    "commander-0.6.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+      };
+    };
     "commander-2.11.0" = {
       name = "commander";
       packageName = "commander";
@@ -544,6 +958,24 @@ let
         sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg";
       };
     };
+    "commander-2.15.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.15.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
+        sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn";
+      };
+    };
+    "commander-2.3.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+        sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
+      };
+    };
     "commander-2.9.0" = {
       name = "commander";
       packageName = "commander";
@@ -553,6 +985,15 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
     "concat-map-0.0.1" = {
       name = "concat-map";
       packageName = "concat-map";
@@ -562,13 +1003,31 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "concat-stream-1.6.1" = {
+    "concat-stream-1.6.2" = {
       name = "concat-stream";
       packageName = "concat-stream";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz";
-        sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv";
+      };
+    };
+    "configstore-3.1.1" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz";
+        sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6";
+      };
+    };
+    "connect-3.6.6" = {
+      name = "connect";
+      packageName = "connect";
+      version = "3.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz";
+        sha1 = "09eff6c55af7236e137135a72574858b6786f524";
       };
     };
     "connections-1.4.2" = {
@@ -589,6 +1048,15 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
+    "content-type-1.0.4" = {
+      name = "content-type";
+      packageName = "content-type";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
+        sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4";
+      };
+    };
     "content-types-0.1.0" = {
       name = "content-types";
       packageName = "content-types";
@@ -598,6 +1066,33 @@ let
         sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578";
       };
     };
+    "cookiejar-2.0.6" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz";
+        sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe";
+      };
+    };
+    "cookiejar-2.1.1" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz";
+        sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a";
+      };
+    };
+    "copy-descriptor-0.1.1" = {
+      name = "copy-descriptor";
+      packageName = "copy-descriptor";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
+        sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
+      };
+    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -616,6 +1111,33 @@ let
         sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0";
       };
     };
+    "create-error-class-3.0.2" = {
+      name = "create-error-class";
+      packageName = "create-error-class";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
+        sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
+      };
+    };
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+      };
+    };
+    "crypt-0.0.2" = {
+      name = "crypt";
+      packageName = "crypt";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz";
+        sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b";
+      };
+    };
     "cryptiles-3.1.2" = {
       name = "cryptiles";
       packageName = "cryptiles";
@@ -625,6 +1147,15 @@ let
         sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
       };
     };
+    "crypto-random-string-1.0.0" = {
+      name = "crypto-random-string";
+      packageName = "crypto-random-string";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
+        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
+      };
+    };
     "cycle-1.0.3" = {
       name = "cycle";
       packageName = "cycle";
@@ -634,6 +1165,15 @@ let
         sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
       };
     };
+    "dag-map-1.0.2" = {
+      name = "dag-map";
+      packageName = "dag-map";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dag-map/-/dag-map-1.0.2.tgz";
+        sha1 = "e8379f041000ed561fc515475c1ed2c85eece8d7";
+      };
+    };
     "dashdash-1.14.1" = {
       name = "dashdash";
       packageName = "dashdash";
@@ -679,22 +1219,22 @@ let
         sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w";
       };
     };
-    "dat-ignore-2.0.0" = {
+    "dat-ignore-2.1.0" = {
       name = "dat-ignore";
       packageName = "dat-ignore";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz";
-        sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8";
+        url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.0.tgz";
+        sha512 = "2lngf74v9m0xibm5g6lj1aj988bpmx69bd7m8b1kpzlbz7kh0binbyadaj993isk679pljasygycilmwb976bhywq8b46fgl0lmagqs";
       };
     };
-    "dat-json-1.0.1" = {
+    "dat-json-1.0.2" = {
       name = "dat-json";
       packageName = "dat-json";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz";
-        sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq";
+        url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz";
+        sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi";
       };
     };
     "dat-link-resolve-2.1.0" = {
@@ -769,6 +1309,15 @@ let
         sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0";
       };
     };
+    "debug-2.2.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+      };
+    };
     "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
@@ -787,6 +1336,24 @@ let
         sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
       };
     };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "decode-uri-component-0.2.0" = {
+      name = "decode-uri-component";
+      packageName = "decode-uri-component";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    };
     "deep-equal-0.2.2" = {
       name = "deep-equal";
       packageName = "deep-equal";
@@ -805,6 +1372,33 @@ let
         sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
       };
     };
+    "define-property-0.2.5" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz";
+        sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116";
+      };
+    };
+    "define-property-1.0.0" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz";
+        sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6";
+      };
+    };
+    "define-property-2.0.2" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
+        sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg";
+      };
+    };
     "delayed-stream-1.0.0" = {
       name = "delayed-stream";
       packageName = "delayed-stream";
@@ -823,6 +1417,42 @@ let
         sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
       };
     };
+    "depd-1.0.1" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+        sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
+      };
+    };
+    "depd-1.1.1" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz";
+        sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
+      };
+    };
+    "depd-1.1.2" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
+        sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+      };
+    };
+    "destroy-1.0.4" = {
+      name = "destroy";
+      packageName = "destroy";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+        sha1 = "978857442c44749e4206613e37946205826abd80";
+      };
+    };
     "detect-libc-1.0.3" = {
       name = "detect-libc";
       packageName = "detect-libc";
@@ -832,6 +1462,24 @@ let
         sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
       };
     };
+    "dicer-0.2.5" = {
+      name = "dicer";
+      packageName = "dicer";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+        sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
     "diff-3.5.0" = {
       name = "diff";
       packageName = "diff";
@@ -850,13 +1498,13 @@ let
         sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338";
       };
     };
-    "discovery-channel-5.4.7" = {
+    "discovery-channel-5.5.1" = {
       name = "discovery-channel";
       packageName = "discovery-channel";
-      version = "5.4.7";
+      version = "5.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz";
-        sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78";
+        url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz";
+        sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h";
       };
     };
     "discovery-swarm-4.4.2" = {
@@ -877,6 +1525,15 @@ let
         sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg";
       };
     };
+    "dns-discovery-6.1.0" = {
+      name = "dns-discovery";
+      packageName = "dns-discovery";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz";
+        sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a";
+      };
+    };
     "dns-packet-1.3.1" = {
       name = "dns-packet";
       packageName = "dns-packet";
@@ -886,6 +1543,15 @@ let
         sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i";
       };
     };
+    "dns-packet-4.1.0" = {
+      name = "dns-packet";
+      packageName = "dns-packet";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.1.0.tgz";
+        sha512 = "1jkqjdbc3dchmbkg3nn7ymayqix9gh3ll3rgbqps2qc484zgkj6a2v1wgy4agybkh8719i36b6fi8mx1m4h00gvpdmhdnxx5x1r1m3h";
+      };
+    };
     "dns-socket-1.6.3" = {
       name = "dns-socket";
       packageName = "dns-socket";
@@ -895,6 +1561,15 @@ let
         sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy";
       };
     };
+    "dns-socket-3.0.0" = {
+      name = "dns-socket";
+      packageName = "dns-socket";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz";
+        sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k";
+      };
+    };
     "dns-txt-2.0.2" = {
       name = "dns-txt";
       packageName = "dns-txt";
@@ -913,6 +1588,33 @@ let
         sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     };
+    "dot-prop-4.2.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz";
+        sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm";
+      };
+    };
+    "duplexer-0.1.1" = {
+      name = "duplexer";
+      packageName = "duplexer";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+      };
+    };
+    "duplexer3-0.1.4" = {
+      name = "duplexer3";
+      packageName = "duplexer3";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz";
+        sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
+      };
+    };
     "duplexify-3.5.4" = {
       name = "duplexify";
       packageName = "duplexify";
@@ -931,6 +1633,33 @@ let
         sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
+    "ee-first-1.1.0" = {
+      name = "ee-first";
+      packageName = "ee-first";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
+        sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
+      };
+    };
+    "ee-first-1.1.1" = {
+      name = "ee-first";
+      packageName = "ee-first";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+      };
+    };
+    "encodeurl-1.0.2" = {
+      name = "encodeurl";
+      packageName = "encodeurl";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
+        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+      };
+    };
     "end-of-stream-1.4.1" = {
       name = "end-of-stream";
       packageName = "end-of-stream";
@@ -940,6 +1669,24 @@ let
         sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl";
       };
     };
+    "escape-html-1.0.3" = {
+      name = "escape-html";
+      packageName = "escape-html";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+      };
+    };
+    "escape-string-regexp-1.0.2" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+        sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
+      };
+    };
     "escape-string-regexp-1.0.5" = {
       name = "escape-string-regexp";
       packageName = "escape-string-regexp";
@@ -949,6 +1696,51 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
+    "esprima-4.0.0" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
+        sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1";
+      };
+    };
+    "etag-1.8.1" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
+        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+      };
+    };
+    "event-stream-3.3.4" = {
+      name = "event-stream";
+      packageName = "event-stream";
+      version = "3.3.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
+        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
+      };
+    };
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
+    "exit-hook-1.1.1" = {
+      name = "exit-hook";
+      packageName = "exit-hook";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz";
+        sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8";
+      };
+    };
     "expand-brackets-0.1.5" = {
       name = "expand-brackets";
       packageName = "expand-brackets";
@@ -958,6 +1750,15 @@ let
         sha1 = "df07284e342a807cd733ac5af72411e581d1177b";
       };
     };
+    "expand-brackets-2.1.4" = {
+      name = "expand-brackets";
+      packageName = "expand-brackets";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz";
+        sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622";
+      };
+    };
     "expand-range-1.8.2" = {
       name = "expand-range";
       packageName = "expand-range";
@@ -967,6 +1768,15 @@ let
         sha1 = "a299effd335fe2721ebae8e257ec79644fc85337";
       };
     };
+    "extend-3.0.0" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+        sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+      };
+    };
     "extend-3.0.1" = {
       name = "extend";
       packageName = "extend";
@@ -976,6 +1786,24 @@ let
         sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
       };
     };
+    "extend-shallow-2.0.1" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz";
+        sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+      };
+    };
+    "extend-shallow-3.0.2" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz";
+        sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
+      };
+    };
     "extglob-0.3.2" = {
       name = "extglob";
       packageName = "extglob";
@@ -985,6 +1813,15 @@ let
         sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1";
       };
     };
+    "extglob-2.0.4" = {
+      name = "extglob";
+      packageName = "extglob";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
+        sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin";
+      };
+    };
     "extsprintf-1.3.0" = {
       name = "extsprintf";
       packageName = "extsprintf";
@@ -1030,6 +1867,15 @@ let
         sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1";
       };
     };
+    "figures-1.7.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz";
+        sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e";
+      };
+    };
     "filename-regex-2.0.1" = {
       name = "filename-regex";
       packageName = "filename-regex";
@@ -1048,6 +1894,24 @@ let
         sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723";
       };
     };
+    "fill-range-4.0.0" = {
+      name = "fill-range";
+      packageName = "fill-range";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz";
+        sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
+      };
+    };
+    "finalhandler-1.1.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz";
+        sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5";
+      };
+    };
     "findup-sync-0.3.0" = {
       name = "findup-sync";
       packageName = "findup-sync";
@@ -1102,6 +1966,15 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
+    "form-data-1.0.0-rc3" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "1.0.0-rc3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+        sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
+      };
+    };
     "form-data-2.3.2" = {
       name = "form-data";
       packageName = "form-data";
@@ -1111,6 +1984,51 @@ let
         sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
       };
     };
+    "formidable-1.0.17" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.0.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
+        sha1 = "ef5491490f9433b705faa77249c99029ae348559";
+      };
+    };
+    "formidable-1.2.1" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
+        sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn";
+      };
+    };
+    "fragment-cache-0.2.1" = {
+      name = "fragment-cache";
+      packageName = "fragment-cache";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz";
+        sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
+      };
+    };
+    "fresh-0.5.2" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+      };
+    };
+    "from-0.1.7" = {
+      name = "from";
+      packageName = "from";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz";
+        sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe";
+      };
+    };
     "from2-2.3.0" = {
       name = "from2";
       packageName = "from2";
@@ -1120,6 +2038,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "fs-extra-0.24.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "0.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz";
+        sha1 = "d4e4342a96675cb7846633a6099249332b539952";
+      };
+    };
     "fs-minipass-1.2.5" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
@@ -1138,6 +2065,15 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
+    "fsevents-1.1.3" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz";
+        sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq";
+      };
+    };
     "fstream-1.0.11" = {
       name = "fstream";
       packageName = "fstream";
@@ -1156,6 +2092,24 @@ let
         sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
       };
     };
+    "get-stream-3.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+      };
+    };
+    "get-value-2.0.6" = {
+      name = "get-value";
+      packageName = "get-value";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz";
+        sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
+      };
+    };
     "getpass-0.1.7" = {
       name = "getpass";
       packageName = "getpass";
@@ -1165,6 +2119,15 @@ let
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     };
+    "glob-3.2.11" = {
+      name = "glob";
+      packageName = "glob";
+      version = "3.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+      };
+    };
     "glob-5.0.15" = {
       name = "glob";
       packageName = "glob";
@@ -1201,6 +2164,15 @@ let
         sha1 = "81383d72db054fcccf5336daa902f182f6edbb28";
       };
     };
+    "glob-parent-3.1.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+      };
+    };
     "global-4.3.2" = {
       name = "global";
       packageName = "global";
@@ -1210,6 +2182,24 @@ let
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     };
+    "global-dirs-0.1.1" = {
+      name = "global-dirs";
+      packageName = "global-dirs";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz";
+        sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445";
+      };
+    };
+    "got-6.7.1" = {
+      name = "got";
+      packageName = "got";
+      version = "6.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
+      };
+    };
     "graceful-fs-4.1.11" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
@@ -1228,6 +2218,15 @@ let
         sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
       };
     };
+    "graphlib-2.1.5" = {
+      name = "graphlib";
+      packageName = "graphlib";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz";
+        sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy";
+      };
+    };
     "growl-1.10.3" = {
       name = "growl";
       packageName = "growl";
@@ -1237,6 +2236,15 @@ let
         sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4";
       };
     };
+    "growl-1.9.2" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+      };
+    };
     "grunt-known-options-1.1.0" = {
       name = "grunt-known-options";
       packageName = "grunt-known-options";
@@ -1246,6 +2254,15 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
+    "handlebars-4.0.11" = {
+      name = "handlebars";
+      packageName = "handlebars";
+      version = "4.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz";
+        sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc";
+      };
+    };
     "har-schema-2.0.0" = {
       name = "har-schema";
       packageName = "har-schema";
@@ -1264,6 +2281,15 @@ let
         sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
       };
     };
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    };
     "has-flag-2.0.0" = {
       name = "has-flag";
       packageName = "has-flag";
@@ -1291,6 +2317,42 @@ let
         sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
       };
     };
+    "has-value-0.3.1" = {
+      name = "has-value";
+      packageName = "has-value";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz";
+        sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f";
+      };
+    };
+    "has-value-1.0.0" = {
+      name = "has-value";
+      packageName = "has-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz";
+        sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177";
+      };
+    };
+    "has-values-0.1.4" = {
+      name = "has-values";
+      packageName = "has-values";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz";
+        sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771";
+      };
+    };
+    "has-values-1.0.0" = {
+      name = "has-values";
+      packageName = "has-values";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz";
+        sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
+      };
+    };
     "hawk-6.0.2" = {
       name = "hawk";
       packageName = "hawk";
@@ -1318,6 +2380,15 @@ let
         sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20";
       };
     };
+    "http-errors-1.6.2" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
+      };
+    };
     "http-methods-0.1.0" = {
       name = "http-methods";
       packageName = "http-methods";
@@ -1336,22 +2407,22 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "hypercore-6.12.3" = {
+    "hypercore-6.12.5" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.12.3";
+      version = "6.12.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.3.tgz";
-        sha512 = "0gxq17xmp2926g01dram5fdny52r40lvvanf83d35vvrhsck95zx2ymrhn6hv81hp8wvlwlqs84zbz35xp6d0nf3396pa0kra44ma4k";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.5.tgz";
+        sha512 = "247lnm7sq3fx7ihflpp3pmrdd47hpl68y0ifmg2jmaw4kn745s3i9m9r6c1kmzq4i14zb3k251xhq1s0vldc1yxa9wkvial78cn27hz";
       };
     };
-    "hypercore-protocol-6.6.0" = {
+    "hypercore-protocol-6.6.2" = {
       name = "hypercore-protocol";
       packageName = "hypercore-protocol";
-      version = "6.6.0";
+      version = "6.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.0.tgz";
-        sha512 = "3kwmsg8vfza3i9nbx84v43sh4gi5bjpmj7mn15xyvxg30k0074yvgpng16g8310r88dsk055awlj9zf5zpsk1r0zy61890k9y7bpppg";
+        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.2.tgz";
+        sha512 = "3d62qzd0spz8j902qgvjg4wqr2bcjhvrxhg12a44x3rv0dwn9n0l78bgz8cghbsiwk36bivz7wsyf0fdpgif9a41yyi81mslf8wkdmf";
       };
     };
     "hyperdrive-9.12.3" = {
@@ -1390,6 +2461,33 @@ let
         sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
+    "iconv-lite-0.4.19" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
+        sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
+      };
+    };
+    "iconv-lite-0.4.8" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
+        sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
+      };
+    };
+    "ignore-by-default-1.0.1" = {
+      name = "ignore-by-default";
+      packageName = "ignore-by-default";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz";
+        sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
+      };
+    };
     "ignore-walk-3.0.1" = {
       name = "ignore-walk";
       packageName = "ignore-walk";
@@ -1399,6 +2497,24 @@ let
         sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d";
       };
     };
+    "import-lazy-2.1.0" = {
+      name = "import-lazy";
+      packageName = "import-lazy";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
+        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
+      };
+    };
+    "imurmurhash-0.1.4" = {
+      name = "imurmurhash";
+      packageName = "imurmurhash";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+      };
+    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -1426,6 +2542,15 @@ let
         sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
       };
     };
+    "inquirer-0.10.1" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz";
+        sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a";
+      };
+    };
     "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
@@ -1435,6 +2560,33 @@ let
         sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
       };
     };
+    "is-accessor-descriptor-0.1.6" = {
+      name = "is-accessor-descriptor";
+      packageName = "is-accessor-descriptor";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz";
+        sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6";
+      };
+    };
+    "is-accessor-descriptor-1.0.0" = {
+      name = "is-accessor-descriptor";
+      packageName = "is-accessor-descriptor";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
+        sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
+      };
+    };
+    "is-binary-path-1.0.1" = {
+      name = "is-binary-path";
+      packageName = "is-binary-path";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz";
+        sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
+      };
+    };
     "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
@@ -1444,6 +2596,42 @@ let
         sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm";
       };
     };
+    "is-data-descriptor-0.1.4" = {
+      name = "is-data-descriptor";
+      packageName = "is-data-descriptor";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz";
+        sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56";
+      };
+    };
+    "is-data-descriptor-1.0.0" = {
+      name = "is-data-descriptor";
+      packageName = "is-data-descriptor";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
+        sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d";
+      };
+    };
+    "is-descriptor-0.1.6" = {
+      name = "is-descriptor";
+      packageName = "is-descriptor";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
+        sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a";
+      };
+    };
+    "is-descriptor-1.0.2" = {
+      name = "is-descriptor";
+      packageName = "is-descriptor";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
+        sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r";
+      };
+    };
     "is-dotfile-1.0.3" = {
       name = "is-dotfile";
       packageName = "is-dotfile";
@@ -1471,6 +2659,15 @@ let
         sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
       };
     };
+    "is-extendable-1.0.1" = {
+      name = "is-extendable";
+      packageName = "is-extendable";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
+        sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba";
+      };
+    };
     "is-extglob-1.0.0" = {
       name = "is-extglob";
       packageName = "is-extglob";
@@ -1480,6 +2677,15 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
+    "is-extglob-2.1.1" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+      };
+    };
     "is-fullwidth-code-point-1.0.0" = {
       name = "is-fullwidth-code-point";
       packageName = "is-fullwidth-code-point";
@@ -1516,6 +2722,51 @@ let
         sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863";
       };
     };
+    "is-glob-3.1.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+      };
+    };
+    "is-glob-4.0.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz";
+        sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
+      };
+    };
+    "is-installed-globally-0.1.0" = {
+      name = "is-installed-globally";
+      packageName = "is-installed-globally";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz";
+        sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
+      };
+    };
+    "is-invalid-path-0.1.0" = {
+      name = "is-invalid-path";
+      packageName = "is-invalid-path";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz";
+        sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34";
+      };
+    };
+    "is-npm-1.0.0" = {
+      name = "is-npm";
+      packageName = "is-npm";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
+        sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
+      };
+    };
     "is-number-2.1.0" = {
       name = "is-number";
       packageName = "is-number";
@@ -1534,6 +2785,51 @@ let
         sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
       };
     };
+    "is-number-4.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz";
+        sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd";
+      };
+    };
+    "is-obj-1.0.1" = {
+      name = "is-obj";
+      packageName = "is-obj";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
+        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+      };
+    };
+    "is-odd-2.0.0" = {
+      name = "is-odd";
+      packageName = "is-odd";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz";
+        sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r";
+      };
+    };
+    "is-path-inside-1.0.1" = {
+      name = "is-path-inside";
+      packageName = "is-path-inside";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz";
+        sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036";
+      };
+    };
+    "is-plain-object-2.0.4" = {
+      name = "is-plain-object";
+      packageName = "is-plain-object";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
+        sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7";
+      };
+    };
     "is-posix-bracket-0.1.1" = {
       name = "is-posix-bracket";
       packageName = "is-posix-bracket";
@@ -1552,6 +2848,33 @@ let
         sha1 = "207bab91638499c07b2adf240a41a87210034575";
       };
     };
+    "is-redirect-1.0.0" = {
+      name = "is-redirect";
+      packageName = "is-redirect";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
+        sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
+      };
+    };
+    "is-retry-allowed-1.1.0" = {
+      name = "is-retry-allowed";
+      packageName = "is-retry-allowed";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
+        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
     "is-string-1.0.4" = {
       name = "is-string";
       packageName = "is-string";
@@ -1570,6 +2893,33 @@ let
         sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     };
+    "is-valid-path-0.1.1" = {
+      name = "is-valid-path";
+      packageName = "is-valid-path";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz";
+        sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df";
+      };
+    };
+    "is-windows-1.0.2" = {
+      name = "is-windows";
+      packageName = "is-windows";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
+        sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr";
+      };
+    };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
     "isarray-1.0.0" = {
       name = "isarray";
       packageName = "isarray";
@@ -1597,6 +2947,15 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
+    "isobject-3.0.1" = {
+      name = "isobject";
+      packageName = "isobject";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz";
+        sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+      };
+    };
     "isstream-0.1.2" = {
       name = "isstream";
       packageName = "isstream";
@@ -1615,6 +2974,24 @@ let
         sha1 = "d03f666ca4e6130138565997cacea54164203156";
       };
     };
+    "jade-0.26.3" = {
+      name = "jade";
+      packageName = "jade";
+      version = "0.26.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+        sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
+      };
+    };
+    "js-yaml-3.11.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz";
+        sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi";
+      };
+    };
     "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
@@ -1624,6 +3001,15 @@ let
         sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
+    "json-refs-2.1.7" = {
+      name = "json-refs";
+      packageName = "json-refs";
+      version = "2.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz";
+        sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89";
+      };
+    };
     "json-schema-0.2.3" = {
       name = "json-schema";
       packageName = "json-schema";
@@ -1633,6 +3019,15 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
+    "json-schema-deref-sync-0.3.4" = {
+      name = "json-schema-deref-sync";
+      packageName = "json-schema-deref-sync";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.3.4.tgz";
+        sha512 = "1q3093cgk00pbsrzpb8h1j8cxl21gmnw5xb7wd5i3f47yawm6qmbg5ls94d1h1nhay2vh5fcz0wgfzy2ra2ylw77hrr0306apxj6az1";
+      };
+    };
     "json-schema-traverse-0.3.1" = {
       name = "json-schema-traverse";
       packageName = "json-schema-traverse";
@@ -1651,6 +3046,15 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
+    "jsonfile-2.4.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
+      };
+    };
     "jsprim-1.4.1" = {
       name = "jsprim";
       packageName = "jsprim";
@@ -1714,6 +3118,24 @@ let
         sha1 = "20813df3d712928b207378691a45066fae72dd57";
       };
     };
+    "kind-of-5.1.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
+        sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l";
+      };
+    };
+    "kind-of-6.0.2" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
+        sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk";
+      };
+    };
     "last-one-wins-1.0.4" = {
       name = "last-one-wins";
       packageName = "last-one-wins";
@@ -1723,6 +3145,24 @@ let
         sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a";
       };
     };
+    "latest-version-3.1.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
+        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
     "length-prefixed-message-3.0.3" = {
       name = "length-prefixed-message";
       packageName = "length-prefixed-message";
@@ -1732,6 +3172,15 @@ let
         sha1 = "245474d69abc0614dca368dc35aa8074982a23ac";
       };
     };
+    "lodash-3.10.1" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "3.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
+        sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
+      };
+    };
     "lodash-4.17.5" = {
       name = "lodash";
       packageName = "lodash";
@@ -1741,6 +3190,177 @@ let
         sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
       };
     };
+    "lodash-compat-3.10.2" = {
+      name = "lodash-compat";
+      packageName = "lodash-compat";
+      version = "3.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash-compat/-/lodash-compat-3.10.2.tgz";
+        sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183";
+      };
+    };
+    "lodash._arraypool-2.4.1" = {
+      name = "lodash._arraypool";
+      packageName = "lodash._arraypool";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz";
+        sha1 = "e88eecb92e2bb84c9065612fd958a0719cd47f94";
+      };
+    };
+    "lodash._basebind-2.4.1" = {
+      name = "lodash._basebind";
+      packageName = "lodash._basebind";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz";
+        sha1 = "e940b9ebdd27c327e0a8dab1b55916c5341e9575";
+      };
+    };
+    "lodash._baseclone-2.4.1" = {
+      name = "lodash._baseclone";
+      packageName = "lodash._baseclone";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz";
+        sha1 = "30f823e57e17e3735d383bd62b60b387543b4186";
+      };
+    };
+    "lodash._basecreate-2.4.1" = {
+      name = "lodash._basecreate";
+      packageName = "lodash._basecreate";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz";
+        sha1 = "f8e6f5b578a9e34e541179b56b8eeebf4a287e08";
+      };
+    };
+    "lodash._basecreatecallback-2.4.1" = {
+      name = "lodash._basecreatecallback";
+      packageName = "lodash._basecreatecallback";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz";
+        sha1 = "7d0b267649cb29e7a139d0103b7c11fae84e4851";
+      };
+    };
+    "lodash._basecreatewrapper-2.4.1" = {
+      name = "lodash._basecreatewrapper";
+      packageName = "lodash._basecreatewrapper";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz";
+        sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f";
+      };
+    };
+    "lodash._createwrapper-2.4.1" = {
+      name = "lodash._createwrapper";
+      packageName = "lodash._createwrapper";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz";
+        sha1 = "51d6957973da4ed556e37290d8c1a18c53de1607";
+      };
+    };
+    "lodash._getarray-2.4.1" = {
+      name = "lodash._getarray";
+      packageName = "lodash._getarray";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz";
+        sha1 = "faf1f7f810fa985a251c2187404481094839e5ee";
+      };
+    };
+    "lodash._isnative-2.4.1" = {
+      name = "lodash._isnative";
+      packageName = "lodash._isnative";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
+        sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
+      };
+    };
+    "lodash._maxpoolsize-2.4.1" = {
+      name = "lodash._maxpoolsize";
+      packageName = "lodash._maxpoolsize";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz";
+        sha1 = "9d482f463b8e66afbe59c2c14edb117060172334";
+      };
+    };
+    "lodash._objecttypes-2.4.1" = {
+      name = "lodash._objecttypes";
+      packageName = "lodash._objecttypes";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
+        sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+      };
+    };
+    "lodash._releasearray-2.4.1" = {
+      name = "lodash._releasearray";
+      packageName = "lodash._releasearray";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz";
+        sha1 = "a6139630d76d1536b07ddc80962889b082f6a641";
+      };
+    };
+    "lodash._setbinddata-2.4.1" = {
+      name = "lodash._setbinddata";
+      packageName = "lodash._setbinddata";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz";
+        sha1 = "f7c200cd1b92ef236b399eecf73c648d17aa94d2";
+      };
+    };
+    "lodash._shimkeys-2.4.1" = {
+      name = "lodash._shimkeys";
+      packageName = "lodash._shimkeys";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz";
+        sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203";
+      };
+    };
+    "lodash._slice-2.4.1" = {
+      name = "lodash._slice";
+      packageName = "lodash._slice";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz";
+        sha1 = "745cf41a53597b18f688898544405efa2b06d90f";
+      };
+    };
+    "lodash.assign-2.4.1" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz";
+        sha1 = "84c39596dd71181a97b0652913a7c9675e49b1aa";
+      };
+    };
+    "lodash.bind-2.4.1" = {
+      name = "lodash.bind";
+      packageName = "lodash.bind";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz";
+        sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267";
+      };
+    };
+    "lodash.clonedeep-2.4.1" = {
+      name = "lodash.clonedeep";
+      packageName = "lodash.clonedeep";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-2.4.1.tgz";
+        sha1 = "f29203b40b12fee0a45d3631648259bebabc7868";
+      };
+    };
     "lodash.flattendeep-4.4.0" = {
       name = "lodash.flattendeep";
       packageName = "lodash.flattendeep";
@@ -1750,6 +3370,105 @@ let
         sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2";
       };
     };
+    "lodash.foreach-2.4.1" = {
+      name = "lodash.foreach";
+      packageName = "lodash.foreach";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz";
+        sha1 = "fe3fc3a34c86c94cab6f9522560282741e016309";
+      };
+    };
+    "lodash.forown-2.4.1" = {
+      name = "lodash.forown";
+      packageName = "lodash.forown";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz";
+        sha1 = "78b41eafe1405fa966459ea4193fd502d084524b";
+      };
+    };
+    "lodash.get-4.4.2" = {
+      name = "lodash.get";
+      packageName = "lodash.get";
+      version = "4.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
+      };
+    };
+    "lodash.identity-2.4.1" = {
+      name = "lodash.identity";
+      packageName = "lodash.identity";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz";
+        sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1";
+      };
+    };
+    "lodash.isarray-2.4.1" = {
+      name = "lodash.isarray";
+      packageName = "lodash.isarray";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz";
+        sha1 = "b52a326c1f62f6d7da73a31d5401df6ef44f0fa1";
+      };
+    };
+    "lodash.isequal-4.5.0" = {
+      name = "lodash.isequal";
+      packageName = "lodash.isequal";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+      };
+    };
+    "lodash.isfunction-2.4.1" = {
+      name = "lodash.isfunction";
+      packageName = "lodash.isfunction";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
+        sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
+      };
+    };
+    "lodash.isobject-2.4.1" = {
+      name = "lodash.isobject";
+      packageName = "lodash.isobject";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
+        sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+      };
+    };
+    "lodash.keys-2.4.1" = {
+      name = "lodash.keys";
+      packageName = "lodash.keys";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz";
+        sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727";
+      };
+    };
+    "lodash.noop-2.4.1" = {
+      name = "lodash.noop";
+      packageName = "lodash.noop";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz";
+        sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a";
+      };
+    };
+    "lodash.support-2.4.1" = {
+      name = "lodash.support";
+      packageName = "lodash.support";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz";
+        sha1 = "320e0b67031673c28d7a2bb5d9e0331a45240515";
+      };
+    };
     "lodash.throttle-4.1.1" = {
       name = "lodash.throttle";
       packageName = "lodash.throttle";
@@ -1759,6 +3478,24 @@ let
         sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4";
       };
     };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "lowercase-keys-1.0.1" = {
+      name = "lowercase-keys";
+      packageName = "lowercase-keys";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+        sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
+      };
+    };
     "lru-2.0.1" = {
       name = "lru";
       packageName = "lru";
@@ -1777,6 +3514,87 @@ let
         sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5";
       };
     };
+    "lru-cache-2.7.3" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+        sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+      };
+    };
+    "lru-cache-4.1.2" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz";
+        sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2";
+      };
+    };
+    "make-dir-1.2.0" = {
+      name = "make-dir";
+      packageName = "make-dir";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz";
+        sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8";
+      };
+    };
+    "map-cache-0.2.2" = {
+      name = "map-cache";
+      packageName = "map-cache";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz";
+        sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
+      };
+    };
+    "map-stream-0.1.0" = {
+      name = "map-stream";
+      packageName = "map-stream";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+        sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
+      };
+    };
+    "map-visit-1.0.0" = {
+      name = "map-visit";
+      packageName = "map-visit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz";
+        sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
+      };
+    };
+    "md5-2.2.1" = {
+      name = "md5";
+      packageName = "md5";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz";
+        sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9";
+      };
+    };
+    "media-typer-0.3.0" = {
+      name = "media-typer";
+      packageName = "media-typer";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+      };
+    };
+    "memory-cache-0.1.6" = {
+      name = "memory-cache";
+      packageName = "memory-cache";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-cache/-/memory-cache-0.1.6.tgz";
+        sha1 = "2ed9933ed7a8c718249be7366f7ca8749acf8a24";
+      };
+    };
     "memory-pager-1.1.0" = {
       name = "memory-pager";
       packageName = "memory-pager";
@@ -1795,6 +3613,15 @@ let
         sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081";
       };
     };
+    "methods-1.1.2" = {
+      name = "methods";
+      packageName = "methods";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+      };
+    };
     "micromatch-2.3.11" = {
       name = "micromatch";
       packageName = "micromatch";
@@ -1804,6 +3631,33 @@ let
         sha1 = "86677c97d1720b363431d04d0d15293bd38c1565";
       };
     };
+    "micromatch-3.1.10" = {
+      name = "micromatch";
+      packageName = "micromatch";
+      version = "3.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
+        sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i";
+      };
+    };
+    "mime-1.3.4" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+      };
+    };
+    "mime-1.4.1" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
+        sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398";
+      };
+    };
     "mime-1.6.0" = {
       name = "mime";
       packageName = "mime";
@@ -1840,6 +3694,15 @@ let
         sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685";
       };
     };
+    "minimatch-0.3.0" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+      };
+    };
     "minimatch-3.0.4" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -1867,13 +3730,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "minipass-2.2.1" = {
+    "minipass-2.2.4" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.2.1";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
-        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz";
+        sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7";
       };
     };
     "minizlib-1.1.0" = {
@@ -1894,6 +3757,24 @@ let
         sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604";
       };
     };
+    "mixin-deep-1.3.1" = {
+      name = "mixin-deep";
+      packageName = "mixin-deep";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz";
+        sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi";
+      };
+    };
+    "mkdirp-0.3.0" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+        sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+      };
+    };
     "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -1903,6 +3784,33 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
+    "mocha-2.5.3" = {
+      name = "mocha";
+      packageName = "mocha";
+      version = "2.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz";
+        sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58";
+      };
+    };
+    "mpath-0.2.1" = {
+      name = "mpath";
+      packageName = "mpath";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz";
+        sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e";
+      };
+    };
+    "ms-0.7.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+      };
+    };
     "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
@@ -1912,6 +3820,15 @@ let
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
+    "multer-1.3.0" = {
+      name = "multer";
+      packageName = "multer";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz";
+        sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2";
+      };
+    };
     "multi-random-access-2.1.1" = {
       name = "multi-random-access";
       packageName = "multi-random-access";
@@ -1930,6 +3847,15 @@ let
         sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf";
       };
     };
+    "multicast-dns-7.0.0" = {
+      name = "multicast-dns";
+      packageName = "multicast-dns";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz";
+        sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806";
+      };
+    };
     "multicb-1.2.2" = {
       name = "multicb";
       packageName = "multicb";
@@ -1939,6 +3865,24 @@ let
         sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx";
       };
     };
+    "multistream-2.1.0" = {
+      name = "multistream";
+      packageName = "multistream";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz";
+        sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d";
+      };
+    };
+    "mute-stream-0.0.5" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
+        sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0";
+      };
+    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -1957,13 +3901,13 @@ let
         sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2";
       };
     };
-    "nan-2.9.2" = {
+    "nan-2.10.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.9.2";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz";
-        sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn";
+        url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
+        sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc";
       };
     };
     "nanoassert-1.1.0" = {
@@ -1984,6 +3928,15 @@ let
         sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86";
       };
     };
+    "nanomatch-1.2.9" = {
+      name = "nanomatch";
+      packageName = "nanomatch";
+      version = "1.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz";
+        sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z";
+      };
+    };
     "nanotiming-1.0.1" = {
       name = "nanotiming";
       packageName = "nanotiming";
@@ -1993,6 +3946,15 @@ let
         sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3";
       };
     };
+    "native-promise-only-0.8.1" = {
+      name = "native-promise-only";
+      packageName = "native-promise-only";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz";
+        sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
+      };
+    };
     "ncp-1.0.1" = {
       name = "ncp";
       packageName = "ncp";
@@ -2011,6 +3973,15 @@ let
         sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d";
       };
     };
+    "needle-2.2.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz";
+        sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq";
+      };
+    };
     "nets-3.2.0" = {
       name = "nets";
       packageName = "nets";
@@ -2038,6 +4009,24 @@ let
         sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
       };
     };
+    "nodemon-1.17.2" = {
+      name = "nodemon";
+      packageName = "nodemon";
+      version = "1.17.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.2.tgz";
+        sha512 = "21s43bf7rf7cgnff0spwl9hnzvnqf5gwd11k4dg70pp5vh1kkkf03zzcbali25iazcifw8xbqh8mqnsggap6kpn7x3p0slr0rzdamxz";
+      };
+    };
+    "nopt-1.0.10" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+      };
+    };
     "nopt-3.0.6" = {
       name = "nopt";
       packageName = "nopt";
@@ -2083,6 +4072,15 @@ let
         sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001";
       };
     };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
     "npmlog-4.1.2" = {
       name = "npmlog";
       packageName = "npmlog";
@@ -2110,6 +4108,15 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
+    "object-assign-3.0.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
+        sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
+      };
+    };
     "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -2119,6 +4126,24 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
+    "object-copy-0.1.0" = {
+      name = "object-copy";
+      packageName = "object-copy";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz";
+        sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
+      };
+    };
+    "object-visit-1.0.1" = {
+      name = "object-visit";
+      packageName = "object-visit";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz";
+        sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
+      };
+    };
     "object.omit-2.0.1" = {
       name = "object.omit";
       packageName = "object.omit";
@@ -2128,6 +4153,33 @@ let
         sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa";
       };
     };
+    "object.pick-1.3.0" = {
+      name = "object.pick";
+      packageName = "object.pick";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz";
+        sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
+      };
+    };
+    "on-finished-2.2.1" = {
+      name = "on-finished";
+      packageName = "on-finished";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
+        sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
+      };
+    };
+    "on-finished-2.3.0" = {
+      name = "on-finished";
+      packageName = "on-finished";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+      };
+    };
     "once-1.4.0" = {
       name = "once";
       packageName = "once";
@@ -2137,6 +4189,24 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
+    "onetime-1.1.0" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz";
+        sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
+      };
+    };
+    "optimist-0.6.1" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+      };
+    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -2173,6 +4243,24 @@ let
         sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
       };
     };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "package-json-4.0.1" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz";
+        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
+      };
+    };
     "parse-glob-3.0.4" = {
       name = "parse-glob";
       packageName = "parse-glob";
@@ -2191,6 +4279,33 @@ let
         sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536";
       };
     };
+    "parseurl-1.3.2" = {
+      name = "parseurl";
+      packageName = "parseurl";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
+        sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
+      };
+    };
+    "pascalcase-0.1.1" = {
+      name = "pascalcase";
+      packageName = "pascalcase";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz";
+        sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14";
+      };
+    };
+    "path-dirname-1.0.2" = {
+      name = "path-dirname";
+      packageName = "path-dirname";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+      };
+    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -2200,6 +4315,51 @@ let
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
+    "path-is-inside-1.0.2" = {
+      name = "path-is-inside";
+      packageName = "path-is-inside";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
+        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+      };
+    };
+    "path-loader-1.0.4" = {
+      name = "path-loader";
+      packageName = "path-loader";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz";
+        sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk";
+      };
+    };
+    "path-to-regexp-1.7.0" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
+        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+      };
+    };
+    "pause-stream-0.0.11" = {
+      name = "pause-stream";
+      packageName = "pause-stream";
+      version = "0.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+        sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
+      };
+    };
     "performance-now-2.1.0" = {
       name = "performance-now";
       packageName = "performance-now";
@@ -2209,6 +4369,15 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
+    "pify-3.0.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    };
     "pkginfo-0.3.1" = {
       name = "pkginfo";
       packageName = "pkginfo";
@@ -2227,6 +4396,24 @@ let
         sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff";
       };
     };
+    "posix-character-classes-0.1.1" = {
+      name = "posix-character-classes";
+      packageName = "posix-character-classes";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz";
+        sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
+      };
+    };
+    "prepend-http-1.0.4" = {
+      name = "prepend-http";
+      packageName = "prepend-http";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+      };
+    };
     "preserve-0.2.0" = {
       name = "preserve";
       packageName = "preserve";
@@ -2308,6 +4495,33 @@ let
         sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a";
       };
     };
+    "ps-tree-1.1.0" = {
+      name = "ps-tree";
+      packageName = "ps-tree";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz";
+        sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014";
+      };
+    };
+    "pseudomap-1.0.2" = {
+      name = "pseudomap";
+      packageName = "pseudomap";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    };
+    "pstree.remy-1.1.0" = {
+      name = "pstree.remy";
+      packageName = "pstree.remy";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz";
+        sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb";
+      };
+    };
     "pump-1.0.3" = {
       name = "pump";
       packageName = "pump";
@@ -2326,6 +4540,15 @@ let
         sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf";
       };
     };
+    "pump-3.0.0" = {
+      name = "pump";
+      packageName = "pump";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
+        sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
+      };
+    };
     "punycode-1.4.1" = {
       name = "punycode";
       packageName = "punycode";
@@ -2335,6 +4558,42 @@ let
         sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
       };
     };
+    "punycode-2.1.0" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz";
+        sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d";
+      };
+    };
+    "qs-2.3.3" = {
+      name = "qs";
+      packageName = "qs";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+        sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+      };
+    };
+    "qs-2.4.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
+        sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
+      };
+    };
+    "qs-4.0.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
+        sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
+      };
+    };
     "qs-6.5.1" = {
       name = "qs";
       packageName = "qs";
@@ -2398,13 +4657,22 @@ let
         sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
       };
     };
-    "rc-1.2.5" = {
+    "raw-body-2.0.2" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.0.2.tgz";
+        sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca";
+      };
+    };
+    "rc-1.2.6" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz";
-        sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz";
+        sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092";
       };
     };
     "read-1.0.7" = {
@@ -2416,6 +4684,24 @@ let
         sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
+    "readable-stream-1.0.27-1" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.0.27-1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+        sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
+      };
+    };
+    "readable-stream-1.1.14" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+      };
+    };
     "readable-stream-2.3.5" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -2434,6 +4720,15 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
+    "readline2-1.0.1" = {
+      name = "readline2";
+      packageName = "readline2";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz";
+        sha1 = "41059608ffc154757b715d9989d199ffbf372e35";
+      };
+    };
     "recursive-watch-1.1.3" = {
       name = "recursive-watch";
       packageName = "recursive-watch";
@@ -2443,6 +4738,15 @@ let
         sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx";
       };
     };
+    "reduce-component-1.0.1" = {
+      name = "reduce-component";
+      packageName = "reduce-component";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
+        sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
+      };
+    };
     "regex-cache-0.4.4" = {
       name = "regex-cache";
       packageName = "regex-cache";
@@ -2452,6 +4756,33 @@ let
         sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx";
       };
     };
+    "regex-not-1.0.2" = {
+      name = "regex-not";
+      packageName = "regex-not";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
+        sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917";
+      };
+    };
+    "registry-auth-token-3.3.2" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
+        sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94";
+      };
+    };
+    "registry-url-3.1.0" = {
+      name = "registry-url";
+      packageName = "registry-url";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
+        sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+      };
+    };
     "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
@@ -2479,15 +4810,6 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "request-2.83.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.83.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
-        sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
-      };
-    };
     "request-2.85.0" = {
       name = "request";
       packageName = "request";
@@ -2506,6 +4828,33 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
+    "resolve-url-0.2.1" = {
+      name = "resolve-url";
+      packageName = "resolve-url";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz";
+        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+      };
+    };
+    "restore-cursor-1.0.1" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz";
+        sha1 = "34661f46886327fed2991479152252df92daa541";
+      };
+    };
+    "ret-0.1.15" = {
+      name = "ret";
+      packageName = "ret";
+      version = "0.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
+        sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad";
+      };
+    };
     "revalidator-0.1.8" = {
       name = "revalidator";
       packageName = "revalidator";
@@ -2515,6 +4864,15 @@ let
         sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
       };
     };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
     "rimraf-2.6.2" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -2524,6 +4882,15 @@ let
         sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
       };
     };
+    "run-async-0.1.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz";
+        sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389";
+      };
+    };
     "rusha-0.8.13" = {
       name = "rusha";
       packageName = "rusha";
@@ -2533,6 +4900,15 @@ let
         sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a";
       };
     };
+    "rx-lite-3.1.2" = {
+      name = "rx-lite";
+      packageName = "rx-lite";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz";
+        sha1 = "19ce502ca572665f3b647b10939f97fd1615f102";
+      };
+    };
     "safe-buffer-5.1.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -2542,6 +4918,33 @@ let
         sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
+    "safe-regex-1.1.0" = {
+      name = "safe-regex";
+      packageName = "safe-regex";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz";
+        sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
+      };
+    };
+    "sanitize-filename-1.6.1" = {
+      name = "sanitize-filename";
+      packageName = "sanitize-filename";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz";
+        sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a";
+      };
+    };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
+      };
+    };
     "semver-5.3.0" = {
       name = "semver";
       packageName = "semver";
@@ -2560,6 +4963,33 @@ let
         sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
       };
     };
+    "semver-diff-2.1.0" = {
+      name = "semver-diff";
+      packageName = "semver-diff";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
+        sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+      };
+    };
+    "send-0.16.2" = {
+      name = "send";
+      packageName = "send";
+      version = "0.16.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
+        sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk";
+      };
+    };
+    "serve-static-1.13.2" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
+        sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7";
+      };
+    };
     "set-blocking-2.0.0" = {
       name = "set-blocking";
       packageName = "set-blocking";
@@ -2578,6 +5008,60 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
+    "set-value-0.4.3" = {
+      name = "set-value";
+      packageName = "set-value";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz";
+        sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1";
+      };
+    };
+    "set-value-2.0.0" = {
+      name = "set-value";
+      packageName = "set-value";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz";
+        sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7";
+      };
+    };
+    "setprototypeof-1.0.3" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
+        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+      };
+    };
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
+    "sigmund-1.0.1" = {
+      name = "sigmund";
+      packageName = "sigmund";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+      };
+    };
     "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
@@ -2614,6 +5098,15 @@ let
         sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w";
       };
     };
+    "slash-1.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+      };
+    };
     "slasp-0.0.4" = {
       name = "slasp";
       packageName = "slasp";
@@ -2632,6 +5125,33 @@ let
         sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw";
       };
     };
+    "snapdragon-0.8.2" = {
+      name = "snapdragon";
+      packageName = "snapdragon";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
+        sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n";
+      };
+    };
+    "snapdragon-node-2.1.1" = {
+      name = "snapdragon-node";
+      packageName = "snapdragon-node";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
+        sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv";
+      };
+    };
+    "snapdragon-util-3.0.1" = {
+      name = "snapdragon-util";
+      packageName = "snapdragon-util";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
+        sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr";
+      };
+    };
     "sntp-2.1.0" = {
       name = "sntp";
       packageName = "sntp";
@@ -2641,13 +5161,13 @@ let
         sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
-    "sodium-javascript-0.5.4" = {
+    "sodium-javascript-0.5.5" = {
       name = "sodium-javascript";
       packageName = "sodium-javascript";
-      version = "0.5.4";
+      version = "0.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz";
-        sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30";
+        url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz";
+        sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
       };
     };
     "sodium-native-2.1.4" = {
@@ -2686,6 +5206,51 @@ let
         sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899";
       };
     };
+    "source-map-0.4.4" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    };
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    };
+    "source-map-resolve-0.5.1" = {
+      name = "source-map-resolve";
+      packageName = "source-map-resolve";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz";
+        sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh";
+      };
+    };
+    "source-map-url-0.4.0" = {
+      name = "source-map-url";
+      packageName = "source-map-url";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz";
+        sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+      };
+    };
+    "spark-md5-1.0.1" = {
+      name = "spark-md5";
+      packageName = "spark-md5";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spark-md5/-/spark-md5-1.0.1.tgz";
+        sha1 = "c4b9a8d41cf7b0845423a821824f8dffa0f51b7c";
+      };
+    };
     "sparse-bitfield-3.0.3" = {
       name = "sparse-bitfield";
       packageName = "sparse-bitfield";
@@ -2704,13 +5269,40 @@ let
         sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2";
       };
     };
-    "sshpk-1.13.1" = {
+    "split-0.3.3" = {
+      name = "split";
+      packageName = "split";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz";
+        sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
+      };
+    };
+    "split-string-3.1.0" = {
+      name = "split-string";
+      packageName = "split-string";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
+        sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp";
+      };
+    };
+    "sprintf-js-1.0.3" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+      };
+    };
+    "sshpk-1.14.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.13.1";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
-        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
+        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
       };
     };
     "stack-trace-0.0.10" = {
@@ -2722,6 +5314,15 @@ let
         sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     };
+    "static-extend-0.1.2" = {
+      name = "static-extend";
+      packageName = "static-extend";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz";
+        sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
+      };
+    };
     "status-logger-3.1.1" = {
       name = "status-logger";
       packageName = "status-logger";
@@ -2731,6 +5332,24 @@ let
         sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl";
       };
     };
+    "statuses-1.3.1" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
+      };
+    };
+    "statuses-1.4.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
+        sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f";
+      };
+    };
     "stream-collector-1.0.1" = {
       name = "stream-collector";
       packageName = "stream-collector";
@@ -2740,6 +5359,15 @@ let
         sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15";
       };
     };
+    "stream-combiner-0.0.4" = {
+      name = "stream-combiner";
+      packageName = "stream-combiner";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+        sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
+      };
+    };
     "stream-each-1.2.2" = {
       name = "stream-each";
       packageName = "stream-each";
@@ -2767,6 +5395,24 @@ let
         sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
       };
     };
+    "streamsearch-0.1.2" = {
+      name = "streamsearch";
+      packageName = "streamsearch";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+        sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
+      };
+    };
+    "string-3.3.3" = {
+      name = "string";
+      packageName = "string";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string/-/string-3.3.3.tgz";
+        sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0";
+      };
+    };
     "string-width-1.0.2" = {
       name = "string-width";
       packageName = "string-width";
@@ -2785,6 +5431,15 @@ let
         sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw";
       };
     };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
     "string_decoder-1.0.3" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -2821,6 +5476,15 @@ let
         sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
     "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
@@ -2839,6 +5503,42 @@ let
         sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760";
       };
     };
+    "superagent-1.8.5" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "1.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz";
+        sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55";
+      };
+    };
+    "superagent-3.8.2" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz";
+        sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1";
+      };
+    };
+    "supports-color-1.2.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz";
+        sha1 = "ff1ed1e61169d06b3cf2d588e188b18d8847e17e";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
     "supports-color-4.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -2857,6 +5557,51 @@ let
         sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
       };
     };
+    "swagger-converter-0.1.7" = {
+      name = "swagger-converter";
+      packageName = "swagger-converter";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.1.7.tgz";
+        sha1 = "a097519c6f1ee4dd67e308d9b53ddc9c2b257f97";
+      };
+    };
+    "swagger-converter-0.2.0" = {
+      name = "swagger-converter";
+      packageName = "swagger-converter";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.2.0.tgz";
+        sha1 = "354023cfc5ed3d4ef6895c310189067bbe66d616";
+      };
+    };
+    "swagger-editor-2.10.5" = {
+      name = "swagger-editor";
+      packageName = "swagger-editor";
+      version = "2.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-editor/-/swagger-editor-2.10.5.tgz";
+        sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a";
+      };
+    };
+    "swagger-test-templates-1.4.3" = {
+      name = "swagger-test-templates";
+      packageName = "swagger-test-templates";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz";
+        sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0";
+      };
+    };
+    "swagger-tools-0.9.16" = {
+      name = "swagger-tools";
+      packageName = "swagger-tools";
+      version = "0.9.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/swagger-tools/-/swagger-tools-0.9.16.tgz";
+        sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb";
+      };
+    };
     "tar-2.2.1" = {
       name = "tar";
       packageName = "tar";
@@ -2866,13 +5611,22 @@ let
         sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
       };
     };
-    "tar-4.4.0" = {
+    "tar-4.4.1" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz";
-        sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz";
+        sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv";
+      };
+    };
+    "term-size-1.2.0" = {
+      name = "term-size";
+      packageName = "term-size";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz";
+        sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
       };
     };
     "throttle-1.0.3" = {
@@ -2884,6 +5638,15 @@ let
         sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7";
       };
     };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
     "through2-2.0.3" = {
       name = "through2";
       packageName = "through2";
@@ -2911,6 +5674,15 @@ let
         sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
+    "timed-out-4.0.1" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
+        sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
+      };
+    };
     "to-buffer-1.1.0" = {
       name = "to-buffer";
       packageName = "to-buffer";
@@ -2920,6 +5692,42 @@ let
         sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa";
       };
     };
+    "to-iso-string-0.0.2" = {
+      name = "to-iso-string";
+      packageName = "to-iso-string";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz";
+        sha1 = "4dc19e664dfccbe25bd8db508b00c6da158255d1";
+      };
+    };
+    "to-object-path-0.3.0" = {
+      name = "to-object-path";
+      packageName = "to-object-path";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz";
+        sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
+      };
+    };
+    "to-regex-3.0.2" = {
+      name = "to-regex";
+      packageName = "to-regex";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
+        sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm";
+      };
+    };
+    "to-regex-range-2.1.1" = {
+      name = "to-regex-range";
+      packageName = "to-regex-range";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz";
+        sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
+      };
+    };
     "toiletdb-1.4.1" = {
       name = "toiletdb";
       packageName = "toiletdb";
@@ -2929,6 +5737,15 @@ let
         sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l";
       };
     };
+    "touch-3.1.0" = {
+      name = "touch";
+      packageName = "touch";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz";
+        sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q";
+      };
+    };
     "tough-cookie-2.3.4" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -2947,6 +5764,15 @@ let
         sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78";
       };
     };
+    "traverse-0.6.6" = {
+      name = "traverse";
+      packageName = "traverse";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+        sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+      };
+    };
     "trim-0.0.1" = {
       name = "trim";
       packageName = "trim";
@@ -2956,6 +5782,15 @@ let
         sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
       };
     };
+    "truncate-utf8-bytes-1.0.2" = {
+      name = "truncate-utf8-bytes";
+      packageName = "truncate-utf8-bytes";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz";
+        sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
+      };
+    };
     "ttl-1.3.1" = {
       name = "ttl";
       packageName = "ttl";
@@ -2983,6 +5818,15 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
+    "type-is-1.6.16" = {
+      name = "type-is";
+      packageName = "type-is";
+      version = "1.6.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz";
+        sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x";
+      };
+    };
     "typedarray-0.0.6" = {
       name = "typedarray";
       packageName = "typedarray";
@@ -2992,13 +5836,58 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "uint64be-2.0.1" = {
+    "uglify-js-2.8.29" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.8.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz";
+        sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
+      };
+    };
+    "uglify-to-browserify-1.0.2" = {
+      name = "uglify-to-browserify";
+      packageName = "uglify-to-browserify";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+      };
+    };
+    "uint64be-2.0.2" = {
       name = "uint64be";
       packageName = "uint64be";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz";
-        sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428";
+        url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz";
+        sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm";
+      };
+    };
+    "undefsafe-2.0.2" = {
+      name = "undefsafe";
+      packageName = "undefsafe";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz";
+        sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76";
+      };
+    };
+    "union-value-1.0.0" = {
+      name = "union-value";
+      packageName = "union-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz";
+        sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4";
+      };
+    };
+    "unique-string-1.0.0" = {
+      name = "unique-string";
+      packageName = "unique-string";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz";
+        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
     "unixify-1.0.0" = {
@@ -3037,6 +5926,24 @@ let
         sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec";
       };
     };
+    "unpipe-1.0.0" = {
+      name = "unpipe";
+      packageName = "unpipe";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+        sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+      };
+    };
+    "unset-value-1.0.0" = {
+      name = "unset-value";
+      packageName = "unset-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz";
+        sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
+      };
+    };
     "untildify-3.0.2" = {
       name = "untildify";
       packageName = "untildify";
@@ -3046,6 +5953,78 @@ let
         sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1";
       };
     };
+    "unzip-response-2.0.1" = {
+      name = "unzip-response";
+      packageName = "unzip-response";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz";
+        sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
+      };
+    };
+    "upath-1.0.4" = {
+      name = "upath";
+      packageName = "upath";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz";
+        sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
+      };
+    };
+    "update-notifier-2.3.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz";
+        sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451";
+      };
+    };
+    "uri-js-3.0.2" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz";
+        sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
+      };
+    };
+    "urix-0.1.0" = {
+      name = "urix";
+      packageName = "urix";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz";
+        sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+      };
+    };
+    "url-parse-lax-1.0.0" = {
+      name = "url-parse-lax";
+      packageName = "url-parse-lax";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz";
+        sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73";
+      };
+    };
+    "use-3.1.0" = {
+      name = "use";
+      packageName = "use";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz";
+        sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9";
+      };
+    };
+    "utf8-byte-length-1.0.4" = {
+      name = "utf8-byte-length";
+      packageName = "utf8-byte-length";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz";
+        sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61";
+      };
+    };
     "util-deprecate-1.0.2" = {
       name = "util-deprecate";
       packageName = "util-deprecate";
@@ -3064,13 +6043,22 @@ let
         sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a";
       };
     };
-    "utp-native-1.6.2" = {
+    "utils-merge-1.0.1" = {
+      name = "utils-merge";
+      packageName = "utils-merge";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+      };
+    };
+    "utp-native-1.7.0" = {
       name = "utp-native";
       packageName = "utp-native";
-      version = "1.6.2";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz";
-        sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg";
+        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz";
+        sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz";
       };
     };
     "uuid-3.2.1" = {
@@ -3082,6 +6070,24 @@ let
         sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
       };
     };
+    "valid-url-1.0.9" = {
+      name = "valid-url";
+      packageName = "valid-url";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz";
+        sha1 = "1c14479b40f1397a75782f115e4086447433a200";
+      };
+    };
+    "validator-9.4.1" = {
+      name = "validator";
+      packageName = "validator";
+      version = "9.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
+        sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1";
+      };
+    };
     "varint-3.0.1" = {
       name = "varint";
       packageName = "varint";
@@ -3136,6 +6142,24 @@ let
         sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
+    "widest-line-2.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz";
+        sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
     "winston-2.1.1" = {
       name = "winston";
       packageName = "winston";
@@ -3145,6 +6169,24 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
     "wrap-ansi-3.0.1" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -3163,6 +6205,24 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
+    "write-file-atomic-2.3.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz";
+        sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6";
+      };
+    };
+    "xdg-basedir-3.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
+        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
+      };
+    };
     "xhr-2.4.1" = {
       name = "xhr";
       packageName = "xhr";
@@ -3190,6 +6250,15 @@ let
         sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
       };
     };
+    "yallist-2.1.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    };
     "yallist-3.0.2" = {
       name = "yallist";
       packageName = "yallist";
@@ -3199,6 +6268,24 @@ let
         sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
       };
     };
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+      };
+    };
+    "z-schema-3.19.1" = {
+      name = "z-schema";
+      packageName = "z-schema";
+      version = "3.19.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz";
+        sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc";
+      };
+    };
   };
 in
 {
@@ -3247,7 +6334,7 @@ in
     dependencies = [
       sources."abstract-random-access-1.1.2"
       sources."ajv-5.5.2"
-      sources."ansi-diff-stream-1.2.0"
+      sources."ansi-diff-stream-1.2.1"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-1.3.2"
@@ -3283,13 +6370,18 @@ in
           sources."kind-of-4.0.0"
         ];
       })
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-1.0.0"
       sources."buffer-equals-1.0.4"
+      sources."buffer-fill-0.1.0"
+      sources."buffer-from-1.0.0"
       sources."buffer-indexof-1.1.1"
-      sources."bulk-write-stream-1.1.3"
+      sources."bulk-write-stream-1.1.4"
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.3.2"
+      sources."circular-append-file-1.0.1"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
       sources."co-4.6.0"
@@ -3299,7 +6391,7 @@ in
       sources."colors-1.2.1"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.1"
+      sources."concat-stream-1.6.2"
       sources."connections-1.4.2"
       sources."content-types-0.1.0"
       sources."core-util-is-1.0.2"
@@ -3315,13 +6407,16 @@ in
       (sources."dat-doctor-1.3.1" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."dns-packet-1.3.1"
+          sources."dns-socket-1.6.3"
           sources."lru-2.0.1"
+          sources."multicast-dns-6.2.3"
           sources."pump-1.0.3"
         ];
       })
       sources."dat-encoding-5.0.1"
-      sources."dat-ignore-2.0.0"
-      (sources."dat-json-1.0.1" // {
+      sources."dat-ignore-2.1.0"
+      (sources."dat-json-1.0.2" // {
         dependencies = [
           sources."dat-encoding-4.0.2"
           sources."debug-2.6.9"
@@ -3339,6 +6434,7 @@ in
       })
       (sources."dat-node-3.5.8" // {
         dependencies = [
+          sources."buffer-alloc-unsafe-0.1.1"
           sources."minimist-0.0.8"
           sources."process-nextick-args-1.0.7"
           sources."pump-1.0.3"
@@ -3355,15 +6451,24 @@ in
       sources."deep-equal-0.2.2"
       sources."delayed-stream-1.0.0"
       sources."directory-index-html-2.1.0"
-      sources."discovery-channel-5.4.7"
+      (sources."discovery-channel-5.5.1" // {
+        dependencies = [
+          sources."pump-3.0.0"
+        ];
+      })
       (sources."discovery-swarm-4.4.2" // {
         dependencies = [
+          (sources."dns-discovery-6.1.0" // {
+            dependencies = [
+              sources."thunky-1.0.2"
+            ];
+          })
           sources."thunky-0.1.0"
         ];
       })
       sources."dns-discovery-5.6.1"
-      sources."dns-packet-1.3.1"
-      sources."dns-socket-1.6.3"
+      sources."dns-packet-4.1.0"
+      sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
       sources."duplexify-3.5.4"
@@ -3401,12 +6506,12 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.12.3" // {
+      (sources."hypercore-6.12.5" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
       })
-      sources."hypercore-protocol-6.6.0"
+      sources."hypercore-protocol-6.6.2"
       (sources."hyperdrive-9.12.3" // {
         dependencies = [
           sources."varint-4.0.1"
@@ -3468,11 +6573,12 @@ in
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
-      sources."multicast-dns-6.2.3"
+      sources."multicast-dns-7.0.0"
       sources."multicb-1.2.2"
+      sources."multistream-2.1.0"
       sources."mute-stream-0.0.7"
       sources."mutexify-1.2.0"
-      sources."nan-2.9.2"
+      sources."nan-2.10.0"
       sources."nanoassert-1.1.0"
       sources."nanobus-3.3.0"
       sources."nanotiming-1.0.1"
@@ -3541,14 +6647,14 @@ in
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
-      sources."sodium-javascript-0.5.4"
+      sources."sodium-javascript-0.5.5"
       sources."sodium-native-2.1.4"
       sources."sodium-universal-2.0.0"
       sources."sorted-array-functions-1.1.0"
       sources."sorted-indexof-1.0.0"
       sources."sparse-bitfield-3.0.3"
       sources."speedometer-1.0.0"
-      sources."sshpk-1.13.1"
+      sources."sshpk-1.14.1"
       sources."stack-trace-0.0.10"
       sources."status-logger-3.1.1"
       sources."stream-collector-1.0.1"
@@ -3581,14 +6687,14 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      sources."uint64be-2.0.1"
+      sources."uint64be-2.0.2"
       sources."unixify-1.0.0"
       sources."unordered-array-remove-1.0.2"
       sources."unordered-set-1.1.0"
       sources."untildify-3.0.2"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
-      sources."utp-native-1.6.2"
+      sources."utp-native-1.7.0"
       sources."uuid-3.2.1"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
@@ -3650,10 +6756,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.4";
+    version = "5.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz";
-      sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz";
+      sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -3807,7 +6913,7 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."sntp-2.1.0"
-      sources."sshpk-1.13.1"
+      sources."sshpk-1.14.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
       sources."stringstream-0.0.5"
@@ -3852,124 +6958,76 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.8.0";
+    version = "0.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.8.0.tgz";
-      sha512 = "3z3mz92ya4hx3mg902sb6kwlkfz8dkc12hxcnp4sygbiahbiknzh585jrf9zf3bqd9xgsh9109dz5mqwjh268zl0nmn2n30fl7cqa49";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz";
+      sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8";
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-5.5.2"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.4"
-      sources."asn1-0.2.3"
-      sources."assert-plus-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.6.0"
       sources."balanced-match-1.0.0"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
-      sources."caseless-0.12.0"
       sources."chownr-1.0.1"
-      sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      (sources."cryptiles-3.1.2" // {
-        dependencies = [
-          sources."boom-5.2.0"
-        ];
-      })
-      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
       sources."deep-extend-0.4.2"
-      sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
-      sources."ecc-jsbn-0.1.1"
-      sources."extend-3.0.1"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-1.1.0"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
       sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
-      sources."getpass-0.1.7"
       sources."glob-7.1.2"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.0.3"
       sources."has-unicode-2.0.1"
-      sources."hawk-6.0.2"
-      sources."hoek-4.2.1"
-      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.19"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.3.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.1"
-      sources."mime-db-1.33.0"
-      sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.1"
+      sources."minipass-2.2.4"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."needle-2.2.0"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.3"
       sources."npm-packlist-1.1.10"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
-      sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
-      sources."punycode-1.4.1"
-      sources."qs-6.5.1"
-      (sources."rc-1.2.5" // {
+      (sources."rc-1.2.6" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."readable-stream-2.3.5"
-      sources."request-2.83.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
+      sources."sax-1.2.4"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sntp-2.1.0"
-      sources."sshpk-1.13.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.0.3"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.0"
-      sources."tough-cookie-2.3.4"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
+      sources."tar-4.4.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
-      sources."verror-1.10.0"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
       sources."yallist-3.0.2"
@@ -3986,10 +7044,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "1.35.8";
+    version = "1.36.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.8.tgz";
-      sha1 = "de87c7b33f00189654aea49b4eb56317dcdbe7cd";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.36.1.tgz";
+      sha1 = "43537276c39cc2d9e749d1fd7a3c159b2db39877";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -4057,13 +7115,595 @@ in
     production = true;
     bypassCache = true;
   };
+  swagger = nodeEnv.buildNodePackage {
+    name = "swagger";
+    packageName = "swagger";
+    version = "0.7.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/swagger/-/swagger-0.7.5.tgz";
+      sha1 = "3be6ee3d392c3b006fc7a9b5b2d60c7e834860fd";
+    };
+    dependencies = [
+      sources."URIjs-1.16.1"
+      sources."abbrev-1.1.1"
+      sources."align-text-0.1.4"
+      sources."amdefine-1.0.1"
+      sources."ansi-align-2.0.0"
+      sources."ansi-escapes-1.4.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      (sources."anymatch-2.0.0" // {
+        dependencies = [
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."append-field-0.1.0"
+      sources."argparse-1.0.10"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-unique-0.3.2"
+      sources."assign-symbols-1.0.0"
+      sources."async-1.5.2"
+      sources."async-each-1.0.1"
+      sources."asynckit-0.4.0"
+      sources."atob-2.0.3"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          (sources."define-property-1.0.0" // {
+            dependencies = [
+              sources."kind-of-6.0.2"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."binary-extensions-1.11.0"
+      (sources."body-parser-1.12.4" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."qs-2.4.2"
+        ];
+      })
+      sources."boxen-1.3.0"
+      sources."brace-expansion-1.1.11"
+      (sources."braces-2.3.1" // {
+        dependencies = [
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."buffer-from-1.0.0"
+      sources."busboy-0.2.14"
+      sources."bytes-1.0.0"
+      sources."cache-base-1.0.1"
+      sources."camelcase-4.1.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."center-align-0.1.3"
+      sources."chalk-1.1.3"
+      sources."charenc-0.0.2"
+      (sources."chokidar-2.0.3" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."cli-boxes-1.0.0"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-1.1.1"
+      sources."cliui-2.1.0"
+      sources."clone-2.0.0"
+      sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
+      sources."color-convert-1.9.1"
+      sources."color-name-1.1.3"
+      sources."combined-stream-1.0.6"
+      sources."commander-2.15.1"
+      sources."component-emitter-1.2.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."configstore-3.1.1"
+      sources."connect-3.6.6"
+      sources."content-type-1.0.4"
+      sources."cookiejar-2.1.1"
+      sources."copy-descriptor-0.1.1"
+      sources."core-util-is-1.0.2"
+      sources."create-error-class-3.0.2"
+      sources."cross-spawn-5.1.0"
+      sources."crypt-0.0.2"
+      sources."crypto-random-string-1.0.0"
+      sources."dag-map-1.0.2"
+      sources."debug-2.6.9"
+      sources."decamelize-1.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."deep-extend-0.4.2"
+      sources."define-property-2.0.2"
+      sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."dicer-0.2.5"
+      sources."diff-1.4.0"
+      sources."dot-prop-4.2.0"
+      sources."duplexer-0.1.1"
+      sources."duplexer3-0.1.4"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."escape-html-1.0.3"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.0"
+      sources."etag-1.8.1"
+      sources."event-stream-3.3.4"
+      sources."execa-0.7.0"
+      sources."exit-hook-1.1.1"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."extend-3.0.1"
+      sources."extend-shallow-3.0.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."figures-1.7.0"
+      sources."fill-range-4.0.0"
+      sources."finalhandler-1.1.0"
+      sources."for-in-1.0.2"
+      sources."form-data-2.3.2"
+      sources."formidable-1.2.1"
+      sources."fragment-cache-0.2.1"
+      sources."fresh-0.5.2"
+      sources."from-0.1.7"
+      sources."fs-extra-0.24.0"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-1.1.3"
+      sources."get-stream-3.0.0"
+      sources."get-value-2.0.6"
+      sources."glob-7.1.2"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."global-dirs-0.1.1"
+      sources."got-6.7.1"
+      sources."graceful-fs-4.1.11"
+      sources."graphlib-2.1.5"
+      sources."growl-1.9.2"
+      sources."handlebars-4.0.11"
+      sources."has-ansi-2.0.0"
+      sources."has-flag-3.0.0"
+      sources."has-value-1.0.0"
+      sources."has-values-1.0.0"
+      (sources."http-errors-1.6.2" // {
+        dependencies = [
+          sources."depd-1.1.1"
+        ];
+      })
+      sources."iconv-lite-0.4.8"
+      sources."ignore-by-default-1.0.1"
+      sources."import-lazy-2.1.0"
+      sources."imurmurhash-0.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."inquirer-0.10.1"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-1.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-glob-4.0.0"
+      sources."is-installed-globally-0.1.0"
+      sources."is-invalid-path-0.1.0"
+      sources."is-npm-1.0.0"
+      sources."is-number-4.0.0"
+      sources."is-obj-1.0.1"
+      sources."is-odd-2.0.0"
+      sources."is-path-inside-1.0.1"
+      sources."is-plain-object-2.0.4"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."is-stream-1.1.0"
+      sources."is-valid-path-0.1.1"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      (sources."jade-0.26.3" // {
+        dependencies = [
+          sources."commander-0.6.1"
+          sources."mkdirp-0.3.0"
+        ];
+      })
+      sources."js-yaml-3.11.0"
+      (sources."json-refs-2.1.7" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+          sources."qs-6.5.1"
+          sources."superagent-3.8.2"
+        ];
+      })
+      (sources."json-schema-deref-sync-0.3.4" // {
+        dependencies = [
+          sources."lodash-4.17.5"
+        ];
+      })
+      sources."jsonfile-2.4.0"
+      sources."kind-of-6.0.2"
+      sources."latest-version-3.1.0"
+      sources."lazy-cache-1.0.4"
+      sources."lodash-3.10.1"
+      sources."lodash-compat-3.10.2"
+      sources."lodash._arraypool-2.4.1"
+      sources."lodash._basebind-2.4.1"
+      sources."lodash._baseclone-2.4.1"
+      sources."lodash._basecreate-2.4.1"
+      sources."lodash._basecreatecallback-2.4.1"
+      sources."lodash._basecreatewrapper-2.4.1"
+      sources."lodash._createwrapper-2.4.1"
+      sources."lodash._getarray-2.4.1"
+      sources."lodash._isnative-2.4.1"
+      sources."lodash._maxpoolsize-2.4.1"
+      sources."lodash._objecttypes-2.4.1"
+      sources."lodash._releasearray-2.4.1"
+      sources."lodash._setbinddata-2.4.1"
+      sources."lodash._shimkeys-2.4.1"
+      sources."lodash._slice-2.4.1"
+      sources."lodash.assign-2.4.1"
+      sources."lodash.bind-2.4.1"
+      sources."lodash.clonedeep-2.4.1"
+      sources."lodash.foreach-2.4.1"
+      sources."lodash.forown-2.4.1"
+      sources."lodash.get-4.4.2"
+      sources."lodash.identity-2.4.1"
+      sources."lodash.isarray-2.4.1"
+      sources."lodash.isequal-4.5.0"
+      sources."lodash.isfunction-2.4.1"
+      sources."lodash.isobject-2.4.1"
+      sources."lodash.keys-2.4.1"
+      sources."lodash.noop-2.4.1"
+      sources."lodash.support-2.4.1"
+      sources."longest-1.0.1"
+      sources."lowercase-keys-1.0.1"
+      sources."lru-cache-2.7.3"
+      sources."make-dir-1.2.0"
+      sources."map-cache-0.2.2"
+      sources."map-stream-0.1.0"
+      sources."map-visit-1.0.0"
+      sources."md5-2.2.1"
+      sources."media-typer-0.3.0"
+      sources."memory-cache-0.1.6"
+      sources."methods-1.1.2"
+      sources."micromatch-3.1.10"
+      sources."mime-1.4.1"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mixin-deep-1.3.1"
+      sources."mkdirp-0.5.1"
+      (sources."mocha-2.5.3" // {
+        dependencies = [
+          sources."commander-2.3.0"
+          sources."debug-2.2.0"
+          sources."escape-string-regexp-1.0.2"
+          sources."glob-3.2.11"
+          sources."minimatch-0.3.0"
+          sources."ms-0.7.1"
+          sources."supports-color-1.2.0"
+        ];
+      })
+      sources."mpath-0.2.1"
+      sources."ms-2.0.0"
+      (sources."multer-1.3.0" // {
+        dependencies = [
+          sources."ee-first-1.1.1"
+          sources."isarray-1.0.0"
+          sources."on-finished-2.3.0"
+          sources."readable-stream-2.3.5"
+          sources."string_decoder-1.0.3"
+        ];
+      })
+      sources."mute-stream-0.0.5"
+      sources."nan-2.10.0"
+      sources."nanomatch-1.2.9"
+      sources."native-promise-only-0.8.1"
+      (sources."nodemon-1.17.2" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.3.2"
+          sources."debug-3.1.0"
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."has-values-0.1.4"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."is-fullwidth-code-point-2.0.0"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."lru-cache-4.1.2"
+          sources."minimist-1.2.0"
+          sources."strip-ansi-4.0.0"
+          sources."supports-color-5.3.0"
+        ];
+      })
+      sources."nopt-1.0.10"
+      sources."normalize-path-2.1.1"
+      sources."npm-run-path-2.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."object-copy-0.1.0"
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."on-finished-2.3.0"
+      sources."once-1.4.0"
+      sources."onetime-1.1.0"
+      sources."optimist-0.6.1"
+      sources."p-finally-1.0.0"
+      sources."package-json-4.0.1"
+      sources."parseurl-1.3.2"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
+      sources."path-loader-1.0.4"
+      sources."path-to-regexp-1.7.0"
+      sources."pause-stream-0.0.11"
+      sources."pify-3.0.0"
+      sources."posix-character-classes-0.1.1"
+      sources."prepend-http-1.0.4"
+      sources."process-nextick-args-2.0.0"
+      sources."ps-tree-1.1.0"
+      sources."pseudomap-1.0.2"
+      sources."pstree.remy-1.1.0"
+      sources."punycode-2.1.0"
+      sources."qs-4.0.0"
+      sources."range-parser-1.2.0"
+      (sources."raw-body-2.0.2" // {
+        dependencies = [
+          sources."bytes-2.1.0"
+        ];
+      })
+      sources."rc-1.2.6"
+      sources."readable-stream-2.3.5"
+      sources."readdirp-2.1.0"
+      sources."readline2-1.0.1"
+      sources."reduce-component-1.0.1"
+      sources."regex-not-1.0.2"
+      sources."registry-auth-token-3.3.2"
+      sources."registry-url-3.1.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
+      sources."resolve-url-0.2.1"
+      sources."restore-cursor-1.0.1"
+      sources."ret-0.1.15"
+      sources."right-align-0.1.3"
+      sources."rimraf-2.6.2"
+      sources."run-async-0.1.0"
+      sources."rx-lite-3.1.2"
+      sources."safe-buffer-5.1.1"
+      sources."safe-regex-1.1.0"
+      sources."sanitize-filename-1.6.1"
+      sources."semver-5.5.0"
+      sources."semver-diff-2.1.0"
+      sources."send-0.16.2"
+      (sources."serve-static-1.13.2" // {
+        dependencies = [
+          sources."statuses-1.4.0"
+        ];
+      })
+      sources."set-immediate-shim-1.0.1"
+      sources."set-value-2.0.0"
+      sources."setprototypeof-1.0.3"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."sigmund-1.0.1"
+      sources."signal-exit-3.0.2"
+      sources."slash-1.0.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          (sources."define-property-0.2.5" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.1"
+      sources."source-map-url-0.4.0"
+      sources."spark-md5-1.0.1"
+      sources."split-0.3.3"
+      (sources."split-string-3.1.0" // {
+        dependencies = [
+          sources."extend-shallow-3.0.2"
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."sprintf-js-1.0.3"
+      sources."static-extend-0.1.2"
+      sources."statuses-1.3.1"
+      sources."stream-combiner-0.0.4"
+      sources."streamsearch-0.1.2"
+      sources."string-3.3.3"
+      sources."string-width-2.1.1"
+      sources."string_decoder-1.0.3"
+      sources."strip-ansi-3.0.1"
+      sources."strip-eof-1.0.0"
+      sources."strip-json-comments-2.0.1"
+      (sources."superagent-1.8.5" // {
+        dependencies = [
+          sources."qs-2.3.3"
+          sources."readable-stream-1.0.27-1"
+        ];
+      })
+      sources."supports-color-2.0.0"
+      sources."swagger-converter-0.2.0"
+      sources."swagger-editor-2.10.5"
+      (sources."swagger-test-templates-1.4.3" // {
+        dependencies = [
+          sources."camelcase-1.2.1"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+          sources."kind-of-3.2.2"
+          sources."source-map-0.4.4"
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      (sources."swagger-tools-0.9.16" // {
+        dependencies = [
+          sources."cookiejar-2.0.6"
+          sources."depd-1.0.1"
+          sources."ee-first-1.1.0"
+          sources."extend-3.0.0"
+          sources."form-data-1.0.0-rc3"
+          sources."formidable-1.0.17"
+          sources."isarray-0.0.1"
+          sources."lodash-4.17.5"
+          sources."mime-1.3.4"
+          sources."ms-0.7.1"
+          sources."object-assign-3.0.0"
+          sources."on-finished-2.2.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+          sources."swagger-converter-0.1.7"
+        ];
+      })
+      sources."term-size-1.2.0"
+      sources."through-2.3.8"
+      sources."timed-out-4.0.1"
+      sources."to-iso-string-0.0.2"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      sources."touch-3.1.0"
+      sources."traverse-0.6.6"
+      sources."truncate-utf8-bytes-1.0.2"
+      sources."type-is-1.6.16"
+      sources."typedarray-0.0.6"
+      (sources."uglify-js-2.8.29" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."uglify-to-browserify-1.0.2"
+      (sources."undefsafe-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."set-value-0.4.3"
+        ];
+      })
+      sources."unique-string-1.0.0"
+      sources."unpipe-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+        ];
+      })
+      sources."unzip-response-2.0.1"
+      sources."upath-1.0.4"
+      sources."update-notifier-2.3.0"
+      sources."uri-js-3.0.2"
+      sources."urix-0.1.0"
+      sources."url-parse-lax-1.0.0"
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."utf8-byte-length-1.0.4"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."valid-url-1.0.9"
+      sources."validator-9.4.1"
+      sources."which-1.3.0"
+      sources."widest-line-2.0.0"
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.3"
+      sources."wrappy-1.0.2"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
+      sources."xtend-4.0.1"
+      sources."yallist-2.1.2"
+      sources."yargs-3.10.0"
+      sources."z-schema-3.19.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The Swagger command-line. Provides Swagger utilities and project lifecycle support.";
+      homepage = "https://github.com/swagger-api/swagger-node#readme";
+      license = "Apache 2.0";
+    };
+    production = true;
+    bypassCache = true;
+  };
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.7.1";
+    version = "5.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz";
-      sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g";
+      url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz";
+      sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f";
     };
     buildInputs = globalBuildInputs;
     meta = {

From f8f067d62727b3c77dc0ac9d245808714f8500c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <balazs.lengyel@tuwien.ac.at>
Date: Sat, 24 Mar 2018 15:58:35 +0100
Subject: [PATCH 040/170] wine: Unstable 3.3 -> 3.4 & reenable wineStaging

---
 pkgs/misc/emulators/wine/default.nix | 11 ++++-------
 pkgs/misc/emulators/wine/sources.nix |  8 +++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 928e692df6b..91fb0da82d8 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -56,12 +56,9 @@ let wine-build = build: release:
       });
 
 in if wineRelease == "staging" then
-  let wineUnstable = wine-build wineBuild "unstable"; in
-    # wine staging is not yet at 3.0, using unstable
-    # FIXME update winestaging sources
-    wineUnstable
-    # callPackage ./staging.nix {
-    #   inherit libtxc_dxtn_Name wineUnstable;
-    # }
+  callPackage ./staging.nix {
+    inherit libtxc_dxtn_Name;
+    wineUnstable = wine-build wineBuild "unstable";
+  }
 else
   wine-build wineBuild wineRelease
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 5950310a73f..d17c0f295e8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,18 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.3";
+    version = "3.4";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "0cx31jsll7mxd9r7v0vpahajqwb6da6cpwybv06l5ydkgfrbv505";
+    sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    # FIXME update winestaging sources, when 3.3 is released
-    # FIXME then revert the staging derivation in ./default.nix
-    sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
+    sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 155dfe385eca240c31fd4deaa9e92fd77aa31225 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 03:12:28 -0400
Subject: [PATCH 041/170] callHackage: Keep deriver, like callCabal2nix

---
 .../haskell-modules/make-package-set.nix      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 9912d1bcde2..bde4f85f678 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -136,13 +136,26 @@ let
     src    = "${component}/${name}.cabal";
   };
 
+  # Adds a nix file as an input to the haskell derivation it
+  # produces. This is useful for callHackage / callCabal2nix to
+  # prevent the generated default.nix from being garbage collected
+  # (requiring it to be frequently rebuilt), which can be an
+  # annoyance.
+  callPackageKeepDeriver = src: args:
+    overrideCabal (self.callPackage src args) (orig: {
+      preConfigure = ''
+        # Generated from ${src}
+        ${orig.preConfigure or ""}
+      '';
+    });
+
 in package-set { inherit pkgs stdenv callPackage; } self // {
 
     inherit mkDerivation callPackage haskellSrc2nix hackage2nix;
 
     inherit (haskellLib) packageSourceOverrides;
 
-    callHackage = name: version: self.callPackage (self.hackage2nix name version);
+    callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
 
     # Creates a Haskell package from a source package by calling cabal2nix on the source.
     callCabal2nix = name: src: args: let
@@ -155,10 +168,8 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
                 then pkgs.lib.cleanSourceWith { inherit src filter; }
               else src;
       };
-    in overrideCabal (self.callPackage expr args) (orig: {
+    in overrideCabal (callPackageKeepDeriver expr args) (orig: {
          inherit src;
-         preConfigure =
-           "# Generated from ${expr}\n${orig.preConfigure or ""}";
        });
 
     # : { root : Path

From 2379cfc4ed98a88ce2c2b394b6768c0429f05da9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 25 Mar 2018 10:08:43 +0200
Subject: [PATCH 042/170] geogebra: add archive.org link for 5-0-444-0

The `geogebra` package is subject to break as upstream removes versioned
packages from their download server when five new releases are comming.

This is why I had to fix almost monthly the package by bumping the
version (these can be found by running `git log --online | grep
geogebra:`). As the package didn't cause any issues for several months
now I guess that using `archive.org` seems to be a suitable solution for
now.

/cc @sternenseemann @matthewbauer
---
 pkgs/applications/science/math/geogebra/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index b486d01a409..9e2c55d567c 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -7,7 +7,10 @@ stdenv.mkDerivation rec {
   preferLocalBuild = true;
 
   src = fetchurl {
-    urls = "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
+    urls = [
+      "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+      "http://web.archive.org/web/20180325075100/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
+    ];
     sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
   };
 

From f3ca47561c31a8eeeb24c722d57effe84a686d77 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 25 Mar 2018 16:14:48 +0200
Subject: [PATCH 043/170] fail2ban: install docs to $out/share/doc

fixes issue #28145
---
 pkgs/tools/security/fail2ban/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index a8de8742dd5..23061b6962e 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -26,6 +26,8 @@ pythonPackages.buildPythonApplication {
   doCheck = false;
 
   preInstall = ''
+    substituteInPlace setup.py --replace /usr/share/doc/ share/doc/
+  
     # see https://github.com/NixOS/nixpkgs/issues/4968
     ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
   '';

From f84eb11a8af81471c0f65b17c190b0fc7508f350 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 09:40:26 -0700
Subject: [PATCH 044/170] bird2: 2.0.1 -> 2.0.2

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird -h` got 0 exit code
- ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird --help` got 0 exit code
- ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird --version` and found version 2.0.2
- found 2.0.2 with grep in /nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2
- directory tree listing: https://gist.github.com/b5a31c5299059545befb8209b15fef9d
---
 pkgs/servers/bird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index ba29bfa433a..94bd92abb4f 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -48,7 +48,7 @@ in
   };
 
   bird2 = generic {
-    version = "2.0.1";
-    sha256 = "0qyh2cxj7hfz90x3fnczjdm3i9g7vr0nc4l4wjkj9qm0646vc52n";
+    version = "2.0.2";
+    sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3";
   };
 }

From 5bb96e7161fa5e8fde60b7b83fb33a0624c53f5b Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 25 Mar 2018 19:28:22 +0200
Subject: [PATCH 045/170] helmholtz: fix failing build

---
 pkgs/applications/audio/pd-plugins/helmholtz/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index 8f04bf116a6..3670fb8347d 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -20,13 +20,16 @@ stdenv.mkDerivation rec {
     mv helmholtz~/src/Makefile .
     rm -rf helmholtz~/src/
     rm helmholtz~/helmholtz~.pd_darwin
+    rm helmholtz~/helmholtz~.pd_linux
     rm helmholtz~/helmholtz~.dll
     rm -rf __MACOSX
   '';
 
   patchPhase = ''
+    mkdir -p $out/helmholtz~
     sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile
     sed -i "s@-Wl@@g" Makefile
+    sed -i "s@\$(NAME).pd_linux \.\./\$(NAME).pd_linux@helmholtz~.pd_linux $out/helmholtz~/@g" Makefile
   '';
 
   installPhase = ''

From 1c7e358e3f55874b624f83c90f42c74ee12ef298 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 11:42:59 -0700
Subject: [PATCH 046/170] blender: 2.79a -> 2.79b

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py help` got 0 exit code
- found 2.79b with grep in /nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b
- directory tree listing: https://gist.github.com/31e73f72bba2c0103ef5f038b4346d34
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 8133bf1c763..0ccca916a1e 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -11,11 +11,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.79a";
+  name = "blender-2.79b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc";
+    sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c";
   };
 
   buildInputs =

From f590d17d325faebebbe37ee19e8b69a101e1b4b7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 12:33:32 -0700
Subject: [PATCH 047/170] darktable: 2.4.1 -> 2.4.2

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/36vw0ki4wqgvwj1f0xgb17qpdxpzijm7-darktable-2.4.2/bin/darktable-cltest help` got 0 exit code
- found 2.4.2 with grep in /nix/store/36vw0ki4wqgvwj1f0xgb17qpdxpzijm7-darktable-2.4.2
- directory tree listing: https://gist.github.com/2fb5b4b7836751e43911e4337febf1ab
---
 pkgs/applications/graphics/darktable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 14659d796fc..d81fea5ea39 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.1";
+  version = "2.4.2";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";
+    sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r";
   };
 
   nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];

From 2a80448fed239d4cf15aad88a6387a611db9e5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 25 Mar 2018 18:46:28 +0200
Subject: [PATCH 048/170] keepassxc: fix darwin build

---
 pkgs/applications/misc/keepassx/community.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 4daa1938aba..620039b5a94 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -14,6 +14,7 @@
 , yubikey-personalization
 , libXi
 , qtx11extras
+, qtmacextras
 
 , withKeePassBrowser ? true
 , withKeePassSSHAgent ? true
@@ -34,8 +35,18 @@ stdenv.mkDerivation rec {
     sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f";
   };
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
+    "-Wno-old-style-cast"
+    "-Wno-error"
+    "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
+  ];
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace "/usr/local/bin" "../bin" \
+      --replace "/usr/local/share/man" "../share/man"
+  '';
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
   patches = [ ./darwin.patch ];
 
   cmakeFlags = [
@@ -72,7 +83,7 @@ stdenv.mkDerivation rec {
     qtx11extras
     yubikey-personalization
     zlib
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
 
   postInstall = optionalString stdenv.isDarwin ''
     # Make it work without Qt in PATH.

From 3f1a03b20ea5f8bd8dcb366656f33f32d91ec4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 25 Mar 2018 21:55:47 +0200
Subject: [PATCH 049/170] keepassxc: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 620039b5a94..0e1aecaab1d 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,13 +26,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassxc-${version}";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f";
+    sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [

From c948613a6532eb4fdce0329c3f0d5af1857ac0d6 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Sun, 25 Mar 2018 21:39:02 +0200
Subject: [PATCH 050/170] almir: also remove the corresponding module.

The almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 at about 2017-08
This module can no more be used without it.
---
 nixos/modules/misc/ids.nix              |   4 +-
 nixos/modules/module-list.nix           |   1 -
 nixos/modules/services/backup/almir.nix | 173 ------------------------
 3 files changed, 2 insertions(+), 176 deletions(-)
 delete mode 100644 nixos/modules/services/backup/almir.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 39a24cfecc5..c5dee2ca97a 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -106,7 +106,7 @@
       freenet = 79;
       ircd = 80;
       bacula = 81;
-      almir = 82;
+      #almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08
       deluge = 83;
       mysql = 84;
       rabbitmq = 85;
@@ -393,7 +393,7 @@
       freenet = 79;
       ircd = 80;
       bacula = 81;
-      almir = 82;
+      #almir = 82; # removed 2018-03-25, the almir package was removed in 30291227f2411abaca097773eedb49b8f259e297 during 2017-08
       deluge = 83;
       mysql = 84;
       rabbitmq = 85;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d47600fbc61..9e232ce1f4e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -158,7 +158,6 @@
   ./services/audio/slimserver.nix
   ./services/audio/squeezelite.nix
   ./services/audio/ympd.nix
-  ./services/backup/almir.nix
   ./services/backup/bacula.nix
   ./services/backup/borgbackup.nix
   ./services/backup/crashplan.nix
diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix
deleted file mode 100644
index fbb4ff4034f..00000000000
--- a/nixos/modules/services/backup/almir.nix
+++ /dev/null
@@ -1,173 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.almir;
-
-  bconsoleconf = pkgs.writeText "bconsole.conf"
-    ''
-      Director {
-        Name = ${cfg.director_name}
-        DIRport = ${toString cfg.director_port}
-        address = ${cfg.director_address}
-        Password = "${cfg.director_password}"
-      }
-    '';
-
-  productionini = pkgs.writeText "production.ini"
-    ''
-[app:main]
-use = egg:almir
-
-pyramid.reload_templates = false
-pyramid.debug_authorization = false
-pyramid.debug_notfound = false
-pyramid.debug_routematch = false
-pyramid.debug_templates = false
-pyramid.default_locale_name = en
-pyramid.includes =
-    pyramid_exclog
-exclog.extra_info = true
-
-sqlalchemy.url = ${cfg.sqlalchemy_engine_url}
-timezone = ${cfg.timezone}
-bconsole_config = ${bconsoleconf}
-
-[server:main]
-use = egg:waitress#main
-host = 127.0.0.1
-port = ${toString cfg.port}
-
-
-# Begin logging configuration
-
-[loggers]
-keys = root, almir, sqlalchemy, exc_logger
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-
-[logger_almir]
-level = WARN
-handlers =
-qualname = almir
-
-[logger_exc_logger]
-level = ERROR
-handlers =
-qualname = exc_logger
-
-[logger_sqlalchemy]
-level = WARN
-handlers =
-qualname = sqlalchemy.engine
-# "level = INFO" logs SQL queries.
-# "level = DEBUG" logs SQL queries and results.
-# "level = WARN" logs neither.  (Recommended for production systems.)
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-    '';
-in {
-  options = {
-    services.almir = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable Almir web server. Also configures postgresql database and installs bacula.
-        '';
-      };
-
-      port = mkOption {
-        default = 35000;
-        type = types.int;
-        description = ''
-          Port for Almir web server to listen on.
-        '';
-      };
-
-      timezone = mkOption {
-	description = ''
-         Timezone as specified in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-        '';
-        example = "Europe/Ljubljana";
-      };
-
-      sqlalchemy_engine_url = mkOption {
-        default = "postgresql:///bacula";
-        example = ''
-          postgresql://bacula:bacula@localhost:5432/bacula
-          mysql+mysqlconnector://<user>:<password>@<hostname>/<database>'
-          sqlite:////var/lib/bacula/bacula.db'
-        '';
-	description = ''
-         Define SQL database connection to bacula catalog as specified in http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls
-        '';
-      };
-
-      director_name = mkOption {
-        description = ''
-          Name of the Director to connect with bconsole.
-        '';
-      };
-
-      director_password = mkOption {
-        description = ''
-          Password for Director to connect with bconsole.
-        '';
-      };
-
-      director_port = mkOption {
-        default = 9101;
-        type = types.int;
-        description = ''
-          Port for Director to connect with bconsole.
-        '';
-      };
-
-      director_address = mkOption {
-        default = "127.0.0.1";
-        description = ''
-          IP/Hostname for Director to connect with bconsole.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.almir = {
-      after = [ "network.target" "postgresql.service" ];
-      description = "Almir web app";
-      wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.pythonPackages.almir ];
-      environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
-      serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}";
-    };
-
-    environment.systemPackages = [ pkgs.pythonPackages.almir ];
-
-    users.extraUsers.almir = {
-      group = "almir";
-      uid = config.ids.uids.almir;
-      createHome = true;
-      shell = "${pkgs.bash}/bin/bash";
-    };
-
-    users.extraGroups.almir.gid = config.ids.gids.almir;
-  };
-}

From adb58440e687440ecf70d2571d8bba8d215dea6a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 25 Mar 2018 23:32:44 +0200
Subject: [PATCH 051/170] gajim: Re-enable tests

Just because the tests need GTK+, I think it's not a good idea to simply
disable them when we're still able to use an X virtual framebuffer to
run them anyway.

As with the package we had prior to version 1.0 I've disabled the
resolver test, because this one requires networking.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92, @7c6f434c
---
 .../instant-messengers/gajim/default.nix        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index a60df1ead53..5a9f545bb0a 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,6 +1,7 @@
 { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
 , python, gtk3, gobjectIntrospection
 , nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, xvfb_run, dbus
 , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
 , enableE2E ? true, pycrypto, python-gnupg
 , enableSecrets ? true, libsecret
@@ -23,6 +24,11 @@ buildPythonApplication rec {
     sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
   };
 
+  postPatch = ''
+    # This test requires network access
+    echo "" > test/integration/test_resolver.py
+  '';
+
   buildInputs = [
     gobjectIntrospection gtk3
   ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
@@ -41,12 +47,13 @@ buildPythonApplication rec {
     ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
     ++ extraPythonPackages pythonPackages;
 
-  checkPhase = ''
-    ${python.interpreter} test/runtests.py
-  '';
+  checkInputs = [ xvfb_run dbus.daemon ];
 
-  # Tests try to use GTK+ which fails.
-  doCheck = false;
+  checkPhase = ''
+    xvfb-run dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      ${python.interpreter} test/runtests.py
+  '';
 
   meta = {
     homepage = http://gajim.org/;

From a0c525bd0a93fba70471392b8651882b52197788 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 25 Mar 2018 23:37:38 +0200
Subject: [PATCH 052/170] gajim: Add gnome3.defaultIconTheme to buildInputs

This is for systems that are not using a full desktop environment, so
Gajim can fall back to the default icon theme of Gnome 3.

Among just fixing aesthetics this also fixes a few exceptions that were
triggered by Gajim not finding the icons. One example of this is when
you enter the plugins dialog, the window is empty if the icons can't be
found.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar, @Mic92, @7c6f434c
---
 .../networking/instant-messengers/gajim/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 5a9f545bb0a..4b0533cefb4 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,6 +1,6 @@
 { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
 , python, gtk3, gobjectIntrospection
-, nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow
 , xvfb_run, dbus
 , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
 , enableE2E ? true, pycrypto, python-gnupg
@@ -30,7 +30,7 @@ buildPythonApplication rec {
   '';
 
   buildInputs = [
-    gobjectIntrospection gtk3
+    gobjectIntrospection gtk3 gnome3.defaultIconTheme
   ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
     ++ optional enableSecrets libsecret
     ++ optional enableSpelling gspell

From aeefaae044e09da97e1bc0e62f9e7ba4016c7dd0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 16:29:14 -0700
Subject: [PATCH 053/170] kotlin: 1.2.30 -> 1.2.31

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlin -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlin-dce-js -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlinc -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlinc-js -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/kotlinc-jvm -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlin-wrapped -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlin-dce-js-wrapped -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlinc-js-wrapped -h` got 0 exit code
- ran `/nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31/bin/.kotlinc-jvm-wrapped -h` got 0 exit code
- found 1.2.31 with grep in /nix/store/c8gxcm1qd27rc1q7m164vwys12rr7kzj-kotlin-1.2.31
- directory tree listing: https://gist.github.com/2abc86ffb8a29b93e0ee8cdc45c72125
---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index b6374908757..62c1c2c9670 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.2.30";
+  version = "1.2.31";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0wg08cncwfajxfx8860wdf5dr4h92j069qvdr90l5m01ff3nasad";
+    sha256 = "09l0vjff9kkiprf5irgq1sb9cils8plbzbrf55ajj8m5fyxcd6fs";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 92d53362d4da7e19b6a7a6b1b936a0a34a17c0c9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 10:47:41 -0400
Subject: [PATCH 054/170] Move all nixpkgs doc files in to the doc directory

This makes a makefile-driven developer workflow nicer.
---
 doc/default.nix                               |  40 +++---
 ...ntroduction.md => introduction.chapter.md} |   0
 .../{emscripten.md => emscripten.section.md}  |   0
 .../{haskell.md => haskell.section.md}        |   0
 doc/languages-frameworks/idris.section.md     |  39 ++++++
 doc/languages-frameworks/index.xml            |  16 +--
 doc/languages-frameworks/node.section.md      |  51 ++++++++
 .../{python.md => python.section.md}          |   0
 doc/languages-frameworks/r.section.md         | 120 +++++++++++++++++
 .../{rust.md => rust.section.md}              |   0
 .../{vim.md => vim.section.md}                |   0
 doc/manual.xml                                |   2 +-
 doc/{shell.md => shell.section.md}            |   0
 pkgs/development/idris-modules/README.md      |  40 +-----
 pkgs/development/node-packages/README.md      |  52 +-------
 pkgs/development/r-modules/README.md          | 121 +-----------------
 16 files changed, 242 insertions(+), 239 deletions(-)
 rename doc/{introduction.md => introduction.chapter.md} (100%)
 rename doc/languages-frameworks/{emscripten.md => emscripten.section.md} (100%)
 rename doc/languages-frameworks/{haskell.md => haskell.section.md} (100%)
 create mode 100644 doc/languages-frameworks/idris.section.md
 create mode 100644 doc/languages-frameworks/node.section.md
 rename doc/languages-frameworks/{python.md => python.section.md} (100%)
 create mode 100644 doc/languages-frameworks/r.section.md
 rename doc/languages-frameworks/{rust.md => rust.section.md} (100%)
 rename doc/languages-frameworks/{vim.md => vim.section.md} (100%)
 rename doc/{shell.md => shell.section.md} (100%)

diff --git a/doc/default.nix b/doc/default.nix
index ec458634a42..1adcd796820 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -45,45 +45,45 @@ pkgs.stdenv.mkDerivation {
     cp -s '${sources-langs}'/* ./languages-frameworks
   ''
   + toDocbook {
-      inputFile = ./introduction.md;
-      outputFile = "introduction.xml";
+      inputFile = ./introduction.chapter.md;
+      outputFile = "introduction.chapter.xml";
       useChapters = true;
     }
   + toDocbook {
-      inputFile = ./shell.md;
-      outputFile = "shell.xml";
+      inputFile = ./shell.section.md;
+      outputFile = "shell.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/python.md;
-      outputFile = "./languages-frameworks/python.xml";
+      inputFile = ./languages-frameworks/python.section.md;
+      outputFile = "./languages-frameworks/python.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/haskell.md;
-      outputFile = "./languages-frameworks/haskell.xml";
+      inputFile = ./languages-frameworks/haskell.section.md;
+      outputFile = "./languages-frameworks/haskell.section.xml";
     }
   + toDocbook {
-      inputFile = ../pkgs/development/idris-modules/README.md;
-      outputFile = "languages-frameworks/idris.xml";
+      inputFile = ./languages-frameworks/idris.section.md;
+      outputFile = "languages-frameworks/idris.section.xml";
     }
   + toDocbook {
-      inputFile = ../pkgs/development/node-packages/README.md;
-      outputFile = "languages-frameworks/node.xml";
+      inputFile = ./languages-frameworks/node.section.md;
+      outputFile = "languages-frameworks/node.section.xml";
     }
   + toDocbook {
-      inputFile = ../pkgs/development/r-modules/README.md;
-      outputFile = "languages-frameworks/r.xml";
+      inputFile = ./languages-frameworks/r.section.md;
+      outputFile = "languages-frameworks/r.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/rust.md;
-      outputFile = "./languages-frameworks/rust.xml";
+      inputFile = ./languages-frameworks/rust.section.md;
+      outputFile = "./languages-frameworks/rust.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/vim.md;
-      outputFile = "./languages-frameworks/vim.xml";
+      inputFile = ./languages-frameworks/vim.section.md;
+      outputFile = "./languages-frameworks/vim.section.xml";
     }
   + toDocbook {
-      inputFile = ./languages-frameworks/emscripten.md;
-      outputFile = "./languages-frameworks/emscripten.xml";
+      inputFile = ./languages-frameworks/emscripten.section.md;
+      outputFile = "./languages-frameworks/emscripten.section.xml";
     }
   + ''
     echo ${lib.nixpkgsVersion} > .version
diff --git a/doc/introduction.md b/doc/introduction.chapter.md
similarity index 100%
rename from doc/introduction.md
rename to doc/introduction.chapter.md
diff --git a/doc/languages-frameworks/emscripten.md b/doc/languages-frameworks/emscripten.section.md
similarity index 100%
rename from doc/languages-frameworks/emscripten.md
rename to doc/languages-frameworks/emscripten.section.md
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.section.md
similarity index 100%
rename from doc/languages-frameworks/haskell.md
rename to doc/languages-frameworks/haskell.section.md
diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md
new file mode 100644
index 00000000000..005ed360285
--- /dev/null
+++ b/doc/languages-frameworks/idris.section.md
@@ -0,0 +1,39 @@
+Idris packages
+==============
+
+This directory contains build rules for idris packages. In addition,
+it contains several functions to build and compose those packages.
+Everything is exposed to the user via the `idrisPackages` attribute.
+
+callPackage
+------------
+
+This is like the normal nixpkgs callPackage function, specialized to
+idris packages.
+
+builtins
+---------
+
+This is a list of all of the libraries that come packaged with Idris
+itself.
+
+build-idris-package
+--------------------
+
+A function to build an idris package. Its sole argument is a set like
+you might pass to `stdenv.mkDerivation`, except `build-idris-package`
+sets several attributes for you. See `build-idris-package.nix` for
+details.
+
+build-builtin-package
+----------------------
+
+A version of `build-idris-package` specialized to builtin libraries.
+Mostly for internal use.
+
+with-packages
+-------------
+
+Bundle idris together with a list of packages. Because idris currently
+only supports a single directory in its library path, you must include
+all desired libraries here, including `prelude` and `base`.
\ No newline at end of file
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 6743c131201..a1c265f6748 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -17,20 +17,20 @@ such as Perl or Haskell.  These are described in this chapter.</para>
 <xi:include href="bower.xml" />
 <xi:include href="coq.xml" />
 <xi:include href="go.xml" />
-<xi:include href="haskell.xml" />
-<xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md  -->
+<xi:include href="haskell.section.xml" />
+<xi:include href="idris.section.xml" />
 <xi:include href="java.xml" />
 <xi:include href="lua.xml" />
-<xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md  -->
+<xi:include href="node.section.xml" />
 <xi:include href="perl.xml" />
-<xi:include href="python.xml" />
+<xi:include href="python.section.xml" />
 <xi:include href="qt.xml" />
-<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md  -->
+<xi:include href="r.section.xml" />
 <xi:include href="ruby.xml" />
-<xi:include href="rust.xml" />
+<xi:include href="rust.section.xml" />
 <xi:include href="texlive.xml" />
-<xi:include href="vim.xml" />
-<xi:include href="emscripten.xml" />
+<xi:include href="vim.section.xml" />
+<xi:include href="emscripten.section.xml" />
 
 
 </chapter>
diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md
new file mode 100644
index 00000000000..17a203ed12b
--- /dev/null
+++ b/doc/languages-frameworks/node.section.md
@@ -0,0 +1,51 @@
+Node.js packages
+================
+The `pkgs/development/node-packages` folder contains a generated collection of
+[NPM packages](https://npmjs.com/) that can be installed with the Nix package
+manager.
+
+As a rule of thumb, the package set should only provide *end user* software
+packages, such as command-line utilities. Libraries should only be added to the
+package set if there is a non-NPM package that requires it.
+
+When it is desired to use NPM libraries in a development project, use the
+`node2nix` generator directly on the `package.json` configuration file of the
+project.
+
+The package set also provides support for multiple Node.js versions. The policy
+is that a new package should be added to the collection for the latest stable LTS
+release (which is currently 6.x), unless there is an explicit reason to support
+a different release.
+
+If your package uses native addons, you need to examine what kind of native
+build system it uses. Here are some examples:
+
+* `node-gyp`
+* `node-gyp-builder`
+* `node-pre-gyp`
+
+After you have identified the correct system, you need to override your package
+expression while adding in build system as a build input. For example, `dat`
+requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
+
+```nix
+dat = nodePackages.dat.override (oldAttrs: {
+  buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
+});
+```
+
+To add a package from NPM to nixpkgs:
+
+ 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
+    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
+    for packages depending on Node.js 4.x)
+ 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
+ 3. Build your new package to test your changes:
+    `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
+    To build against a specific Node.js version (e.g. 4.x):
+    `nix-build -A nodePackages_4_x.<new-or-updated-package>`
+ 4. Add and commit all modified and generated files.
+
+For more information about the generation process, consult the
+[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
+tool.
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.section.md
similarity index 100%
rename from doc/languages-frameworks/python.md
rename to doc/languages-frameworks/python.section.md
diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md
new file mode 100644
index 00000000000..c8f02bd1478
--- /dev/null
+++ b/doc/languages-frameworks/r.section.md
@@ -0,0 +1,120 @@
+R packages
+==========
+
+## Installation
+
+Define an environment for R that contains all the libraries that you'd like to
+use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
+
+```nix
+{
+    packageOverrides = super: let self = super.pkgs; in
+    {
+
+        rEnv = super.rWrapper.override {
+            packages = with self.rPackages; [
+                devtools
+                ggplot2
+                reshape2
+                yaml
+                optparse
+                ];
+        };
+    };
+}
+```
+
+Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
+profile. The set of available libraries can be discovered by running the
+command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
+output is the name that has to be passed to rWrapper in the code snipped above.
+
+However, if you'd like to add a file to your project source to make the
+environment available for other contributors, you can create a `default.nix`
+file like so:
+```nix
+let
+  pkgs = import <nixpkgs> {};
+  stdenv = pkgs.stdenv;
+in with pkgs; {
+  myProject = stdenv.mkDerivation {
+    name = "myProject";
+    version = "1";
+    src = if pkgs.lib.inNixShell then null else nix;
+
+    buildInputs = with rPackages; [
+      R
+      ggplot2
+      knitr
+    ];
+  };
+}
+```
+and then run `nix-shell .` to be dropped into a shell with those packages
+available.
+
+## RStudio
+
+RStudio uses a standard set of packages and ignores any custom R
+environments or installed packages you may have.  To create a custom
+environment, see `rstudioWrapper`, which functions similarly to
+`rWrapper`:
+
+```nix
+{
+    packageOverrides = super: let self = super.pkgs; in
+    {
+
+        rstudioEnv = super.rstudioWrapper.override {
+            packages = with self.rPackages; [
+                dplyr
+                ggplot2
+                reshape2
+                ];
+        };
+    };
+}
+```
+
+Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
+this into your user profile.
+
+Alternatively, you can create a self-contained `shell.nix` without the need to
+modify any configuration files:
+
+```nix
+{ pkgs ? import <nixpkgs> {}
+}:
+
+pkgs.rstudioWrapper.override {
+  packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
+}
+
+```
+
+Executing `nix-shell` will then drop you into an environment equivalent to the
+one above. If you need additional packages just add them to the list and
+re-enter the shell.
+
+## Updating the package set
+
+```bash
+nix-shell generate-shell.nix
+
+Rscript generate-r-packages.R cran  > cran-packages.nix.new
+mv cran-packages.nix.new cran-packages.nix
+
+Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
+mv bioc-packages.nix.new bioc-packages.nix
+```
+
+`generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
+
+
+## Testing if the Nix-expression could be evaluated
+
+```bash
+nix-build test-evaluation.nix --dry-run
+```
+
+If this exits fine, the expression is ok. If not, you have to edit `default.nix`
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.section.md
similarity index 100%
rename from doc/languages-frameworks/rust.md
rename to doc/languages-frameworks/rust.section.md
diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.section.md
similarity index 100%
rename from doc/languages-frameworks/vim.md
rename to doc/languages-frameworks/vim.section.md
diff --git a/doc/manual.xml b/doc/manual.xml
index eb0a24789d4..385079eb578 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -9,7 +9,7 @@
 
   </info>
 
-  <xi:include href="introduction.xml" />
+  <xi:include href="introduction.chapter.xml" />
   <xi:include href="quick-start.xml" />
   <xi:include href="stdenv.xml" />
   <xi:include href="multiple-output.xml" />
diff --git a/doc/shell.md b/doc/shell.section.md
similarity index 100%
rename from doc/shell.md
rename to doc/shell.section.md
diff --git a/pkgs/development/idris-modules/README.md b/pkgs/development/idris-modules/README.md
index 005ed360285..80b7ccefbcf 100644
--- a/pkgs/development/idris-modules/README.md
+++ b/pkgs/development/idris-modules/README.md
@@ -1,39 +1 @@
-Idris packages
-==============
-
-This directory contains build rules for idris packages. In addition,
-it contains several functions to build and compose those packages.
-Everything is exposed to the user via the `idrisPackages` attribute.
-
-callPackage
-------------
-
-This is like the normal nixpkgs callPackage function, specialized to
-idris packages.
-
-builtins
----------
-
-This is a list of all of the libraries that come packaged with Idris
-itself.
-
-build-idris-package
---------------------
-
-A function to build an idris package. Its sole argument is a set like
-you might pass to `stdenv.mkDerivation`, except `build-idris-package`
-sets several attributes for you. See `build-idris-package.nix` for
-details.
-
-build-builtin-package
-----------------------
-
-A version of `build-idris-package` specialized to builtin libraries.
-Mostly for internal use.
-
-with-packages
--------------
-
-Bundle idris together with a list of packages. Because idris currently
-only supports a single directory in its library path, you must include
-all desired libraries here, including `prelude` and `base`.
\ No newline at end of file
+Moved to [/doc/languages-frameworks/idris.section.md](/doc/languages-frameworks/idris.section.md)
diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index 17a203ed12b..9760285a915 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -1,51 +1 @@
-Node.js packages
-================
-The `pkgs/development/node-packages` folder contains a generated collection of
-[NPM packages](https://npmjs.com/) that can be installed with the Nix package
-manager.
-
-As a rule of thumb, the package set should only provide *end user* software
-packages, such as command-line utilities. Libraries should only be added to the
-package set if there is a non-NPM package that requires it.
-
-When it is desired to use NPM libraries in a development project, use the
-`node2nix` generator directly on the `package.json` configuration file of the
-project.
-
-The package set also provides support for multiple Node.js versions. The policy
-is that a new package should be added to the collection for the latest stable LTS
-release (which is currently 6.x), unless there is an explicit reason to support
-a different release.
-
-If your package uses native addons, you need to examine what kind of native
-build system it uses. Here are some examples:
-
-* `node-gyp`
-* `node-gyp-builder`
-* `node-pre-gyp`
-
-After you have identified the correct system, you need to override your package
-expression while adding in build system as a build input. For example, `dat`
-requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
-
-```nix
-dat = nodePackages.dat.override (oldAttrs: {
-  buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
-});
-```
-
-To add a package from NPM to nixpkgs:
-
- 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
-    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
-    for packages depending on Node.js 4.x)
- 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
- 3. Build your new package to test your changes:
-    `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
-    To build against a specific Node.js version (e.g. 4.x):
-    `nix-build -A nodePackages_4_x.<new-or-updated-package>`
- 4. Add and commit all modified and generated files.
-
-For more information about the generation process, consult the
-[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
-tool.
+Moved to [/doc/languages-frameworks/node.section.md](/doc/languages-frameworks/node.section.md)
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index c8f02bd1478..e6fd09d7647 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -1,120 +1 @@
-R packages
-==========
-
-## Installation
-
-Define an environment for R that contains all the libraries that you'd like to
-use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
-
-```nix
-{
-    packageOverrides = super: let self = super.pkgs; in
-    {
-
-        rEnv = super.rWrapper.override {
-            packages = with self.rPackages; [
-                devtools
-                ggplot2
-                reshape2
-                yaml
-                optparse
-                ];
-        };
-    };
-}
-```
-
-Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
-profile. The set of available libraries can be discovered by running the
-command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
-output is the name that has to be passed to rWrapper in the code snipped above.
-
-However, if you'd like to add a file to your project source to make the
-environment available for other contributors, you can create a `default.nix`
-file like so:
-```nix
-let
-  pkgs = import <nixpkgs> {};
-  stdenv = pkgs.stdenv;
-in with pkgs; {
-  myProject = stdenv.mkDerivation {
-    name = "myProject";
-    version = "1";
-    src = if pkgs.lib.inNixShell then null else nix;
-
-    buildInputs = with rPackages; [
-      R
-      ggplot2
-      knitr
-    ];
-  };
-}
-```
-and then run `nix-shell .` to be dropped into a shell with those packages
-available.
-
-## RStudio
-
-RStudio uses a standard set of packages and ignores any custom R
-environments or installed packages you may have.  To create a custom
-environment, see `rstudioWrapper`, which functions similarly to
-`rWrapper`:
-
-```nix
-{
-    packageOverrides = super: let self = super.pkgs; in
-    {
-
-        rstudioEnv = super.rstudioWrapper.override {
-            packages = with self.rPackages; [
-                dplyr
-                ggplot2
-                reshape2
-                ];
-        };
-    };
-}
-```
-
-Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
-this into your user profile.
-
-Alternatively, you can create a self-contained `shell.nix` without the need to
-modify any configuration files:
-
-```nix
-{ pkgs ? import <nixpkgs> {}
-}:
-
-pkgs.rstudioWrapper.override {
-  packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
-}
-
-```
-
-Executing `nix-shell` will then drop you into an environment equivalent to the
-one above. If you need additional packages just add them to the list and
-re-enter the shell.
-
-## Updating the package set
-
-```bash
-nix-shell generate-shell.nix
-
-Rscript generate-r-packages.R cran  > cran-packages.nix.new
-mv cran-packages.nix.new cran-packages.nix
-
-Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
-mv bioc-packages.nix.new bioc-packages.nix
-```
-
-`generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
-
-
-## Testing if the Nix-expression could be evaluated
-
-```bash
-nix-build test-evaluation.nix --dry-run
-```
-
-If this exits fine, the expression is ok. If not, you have to edit `default.nix`
+Moved to [/doc/languages-frameworks/r.section.md](/doc/languages-frameworks/r.section.md)

From 8c7be5927e8ba5c1925dad1d3af09624bd907116 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 10:50:05 -0400
Subject: [PATCH 055/170] Ignore generated XML and other generated files

---
 doc/.gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/.gitignore

diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000000..d8e765e38c2
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,5 @@
+*.chapter.xml
+*.section.xml
+.version
+out
+manual-full.xml

From 7e25ff7106f00bdca9957b1109e2fd9beca86ea1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 11:36:10 -0400
Subject: [PATCH 056/170] docs: Build with a makefile

---
 doc/Makefile         |  69 +++++++++++++++++++++++
 doc/default.nix      | 129 ++++++++-----------------------------------
 doc/shell.section.md |   2 +
 3 files changed, 95 insertions(+), 105 deletions(-)
 create mode 100644 doc/Makefile

diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 00000000000..366d971d781
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,69 @@
+MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
+
+.PHONY: all
+all: out/html/index.html out/epub/manual.epub
+
+.PHONY: clean
+clean:
+	rm -f ${MD_TARGETS} .version manual-full.xml
+	rm -rf ./out/
+
+validate: manual-full.xml
+	jing "$$RNG" manual-full.xml
+
+out/html/index.html: manual-full.xml style.css
+	mkdir -p out/html
+	xsltproc $$xsltFlags \
+		--nonet --xinclude \
+		--output $@ \
+		"$$XSL/docbook/xhtml/docbook.xsl" \
+		./manual-full.xml
+
+	cp ./style.css out/html/style.css
+
+	mkdir -p out/html/images/callouts
+	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
+
+out/epub/manual.epub: manual-full.xml
+	mkdir -p out/epub/scratch
+	xsltproc $$xsltFlags --nonet \
+		--output out/epub/scratch/ \
+		"$$XSL/docbook/epub/docbook.xsl" \
+		./manual-full.xml
+
+	cp "$$XSL/docbook/images/callouts/"*.gif out/epub/scratch/OEBPS
+	echo "application/epub+zip" > mimetype
+	zip -0Xq "out/epub/manual.epub" mimetype
+	rm mimetype
+	cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
+	rm -rf "out/epub/scratch/"
+
+manual-full.xml: ${MD_TARGETS} .version *.xml
+	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
+
+.version:
+	nix-instantiate --eval \
+		-E '(import ../lib).nixpkgsVersion' > .version
+
+%.section.xml: %.section.md
+	pandoc $^ -w docbook+smart \
+		-f markdown+smart \
+	  | sed -e 's|<ulink url=|<link xlink:href=|' \
+	      -e 's|</ulink>|</link>|' \
+	      -e 's|<sect. id=|<section xml:id=|' \
+	      -e 's|</sect[0-9]>|</section>|' \
+	      -e '1s| id=| xml:id=|' \
+	      -e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \
+	| cat  > $@
+
+%.chapter.xml: %.chapter.md
+	pandoc $^ -w docbook+smart \
+		--top-level-division=chapter \
+		-f markdown+smart \
+	  | sed -e 's|<ulink url=|<link xlink:href=|' \
+	      -e 's|</ulink>|</link>|' \
+	      -e 's|<sect. id=|<section xml:id=|' \
+	      -e 's|</sect[0-9]>|</section>|' \
+	      -e '1s| id=| xml:id=|' \
+	      -e '1s|\(<[^ ]* \)|\1|' \
+	| cat  > $@
diff --git a/doc/default.nix b/doc/default.nix
index 1adcd796820..b04c9c1b556 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -7,116 +7,35 @@ in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
-
   buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ];
 
-  xsltFlags = ''
-    --param section.autolabel 1
-    --param section.label.includes.component.label 1
-    --param html.stylesheet 'style.css'
-    --param xref.with.number.and.title 1
-    --param toc.section.depth 3
-    --param admon.style '''
-    --param callout.graphics.extension '.gif'
+  src = ./.;
+
+  XSL = "${pkgs.docbook5_xsl}/xml/xsl";
+  RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
+  xsltFlags = lib.concatStringsSep " " [
+    "--param section.autolabel 1"
+    "--param section.label.includes.component.label 1"
+    "--param html.stylesheet 'style.css'"
+    "--param xref.with.number.and.title 1"
+    "--param toc.section.depth 3"
+    "--param admon.style ''"
+    "--param callout.graphics.extension '.gif'"
+  ];
+
+  postPatch = ''
+    echo ${lib.nixpkgsVersion} > .version
   '';
 
+  installPhase = ''
+    dest="$out/share/doc/nixpkgs"
+    mkdir -p "$(dirname "$dest")"
+    mv out/html "$dest"
+    mv "$dest/index.html" "$dest/manual.html"
 
-  buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }:
-    let
-      extraHeader = lib.optionalString (!useChapters)
-        ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
-    in ''
-      {
-        pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \
-          -f markdown+smart \
-          | sed -e 's|<ulink url=|<link xlink:href=|' \
-              -e 's|</ulink>|</link>|' \
-              -e 's|<sect. id=|<section xml:id=|' \
-              -e 's|</sect[0-9]>|</section>|' \
-              -e '1s| id=| xml:id=|' \
-              -e '1s|\(<[^ ]* \)|\1${extraHeader}|'
-      } > '${outputFile}'
-    '';
-  in
+    mv out/epub/manual.epub "$dest/nixpkgs-manual.epub"
 
-  ''
-    ln -s '${sources}/'*.xml .
-    mkdir ./languages-frameworks
-    cp -s '${sources-langs}'/* ./languages-frameworks
-  ''
-  + toDocbook {
-      inputFile = ./introduction.chapter.md;
-      outputFile = "introduction.chapter.xml";
-      useChapters = true;
-    }
-  + toDocbook {
-      inputFile = ./shell.section.md;
-      outputFile = "shell.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/python.section.md;
-      outputFile = "./languages-frameworks/python.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/haskell.section.md;
-      outputFile = "./languages-frameworks/haskell.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/idris.section.md;
-      outputFile = "languages-frameworks/idris.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/node.section.md;
-      outputFile = "languages-frameworks/node.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/r.section.md;
-      outputFile = "languages-frameworks/r.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/rust.section.md;
-      outputFile = "./languages-frameworks/rust.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/vim.section.md;
-      outputFile = "./languages-frameworks/vim.section.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/emscripten.section.md;
-      outputFile = "./languages-frameworks/emscripten.section.xml";
-    }
-  + ''
-    echo ${lib.nixpkgsVersion} > .version
-
-    # validate against relaxng schema
-    xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
-    ${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml
-
-    dst=$out/share/doc/nixpkgs
-    mkdir -p $dst
-    xsltproc $xsltFlags --nonet --xinclude \
-      --output $dst/manual.html \
-      ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
-      ./manual.xml
-
-    cp ${./style.css} $dst/style.css
-
-    mkdir -p $dst/images/callouts
-    cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/
-
-    mkdir -p $out/nix-support
-    echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
-
-    xsltproc $xsltFlags --nonet --xinclude \
-      --output $dst/epub/ \
-      ${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
-      ./manual.xml
-
-    cp -r $dst/images $dst/epub/OEBPS
-    echo "application/epub+zip" > mimetype
-    manual="$dst/nixpkgs-manual.epub"
-    zip -0Xq "$manual" mimetype
-    cd $dst/epub && zip -Xr9D "$manual" *
-    rm -rf $dst/epub
+    mkdir -p $out/nix-support/
+    echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
   '';
 }
diff --git a/doc/shell.section.md b/doc/shell.section.md
index 079574d4ae8..cb8832a814f 100644
--- a/doc/shell.section.md
+++ b/doc/shell.section.md
@@ -4,6 +4,8 @@ author: zimbatm
 date: 2017-10-30
 ---
 
+# mkShell
+
 pkgs.mkShell is a special kind of derivation that is only useful when using
 it combined with nix-shell. It will in fact fail to instantiate when invoked
 with nix-build.

From f67ea4a6d0b14a61af3ccd98ef1a37ce870162e1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 22:10:55 -0400
Subject: [PATCH 057/170] Document shell.nix / xmloscopy / make for the nixpkgs
 docs

---
 doc/contributing.xml | 24 ++++++++++++++++++++----
 doc/shell.nix        |  4 ++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 doc/shell.nix

diff --git a/doc/contributing.xml b/doc/contributing.xml
index a83059aa36e..8eed9c5416e 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -6,12 +6,28 @@
 
 <para>The DocBook sources of the Nixpkgs manual are in the <filename
 xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
-subdirectory of the Nixpkgs repository. If you make modifications to
-the manual, it's important to build it before committing. You can do that as follows:
+subdirectory of the Nixpkgs repository.</para>
+
+<para>You can quickly check your edits with <command>make</command>:</para>
 
 <screen>
-$ cd /path/to/nixpkgs
-$ nix-build doc
+  $ cd /path/to/nixpkgs/doc
+  $ nix-shell
+  [nix-shell]$ make
+</screen>
+
+<para>If you experience problems, run <command>xmloscopy --docbook5
+./manual.xml ./manual-full.xml</command> inside the nix-shell to help
+understand the docbook errors.</para>
+
+<para>After making modifications to the manual, it's important to
+build it before committing. You can do that as follows:
+
+<screen>
+  $ cd /path/to/nixpkgs/doc
+  $ nix-shell
+  [nix-shell]$ make clean
+  [nix-shell]$ nix-build .
 </screen>
 
 If the build succeeds, the manual will be in
diff --git a/doc/shell.nix b/doc/shell.nix
new file mode 100644
index 00000000000..22590142ee1
--- /dev/null
+++ b/doc/shell.nix
@@ -0,0 +1,4 @@
+{ pkgs ? import ../. {} }:
+(import ./default.nix).overrideAttrs (x: {
+  buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ];
+})

From 30dd2d3feb6d872372ee6f9ec86e58c3367589c7 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 22:22:38 -0400
Subject: [PATCH 058/170] Validate when building outputs

---
 doc/Makefile    | 4 ++--
 doc/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 366d971d781..1ef668528ad 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,7 +11,7 @@ clean:
 validate: manual-full.xml
 	jing "$$RNG" manual-full.xml
 
-out/html/index.html: manual-full.xml style.css
+out/html/index.html: validate manual-full.xml style.css
 	mkdir -p out/html
 	xsltproc $$xsltFlags \
 		--nonet --xinclude \
@@ -24,7 +24,7 @@ out/html/index.html: manual-full.xml style.css
 	mkdir -p out/html/images/callouts
 	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
 
-out/epub/manual.epub: manual-full.xml
+out/epub/manual.epub: validate manual-full.xml
 	mkdir -p out/epub/scratch
 	xsltproc $$xsltFlags --nonet \
 		--output out/epub/scratch/ \
diff --git a/doc/default.nix b/doc/default.nix
index b04c9c1b556..5869920415c 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -7,7 +7,7 @@ in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
-  buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ];
+  buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ];
 
   src = ./.;
 

From fce1fb7e7573cacfd3edaa282cb4ebdcb58d6681 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 25 Mar 2018 07:37:41 -0400
Subject: [PATCH 059/170] Move validate to top-level  so it doesn't rebuild the
 outputs every time

---
 doc/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 1ef668528ad..f3a4d6b5aaf 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,17 +1,18 @@
 MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
 
 .PHONY: all
-all: out/html/index.html out/epub/manual.epub
+all: validate out/html/index.html out/epub/manual.epub
 
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
 	rm -rf ./out/
 
+.PHONY: validate
 validate: manual-full.xml
 	jing "$$RNG" manual-full.xml
 
-out/html/index.html: validate manual-full.xml style.css
+out/html/index.html: manual-full.xml style.css
 	mkdir -p out/html
 	xsltproc $$xsltFlags \
 		--nonet --xinclude \
@@ -23,8 +24,9 @@ out/html/index.html: validate manual-full.xml style.css
 
 	mkdir -p out/html/images/callouts
 	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
+	chmod u+w -R out/html/images/
 
-out/epub/manual.epub: validate manual-full.xml
+out/epub/manual.epub: manual-full.xml
 	mkdir -p out/epub/scratch
 	xsltproc $$xsltFlags --nonet \
 		--output out/epub/scratch/ \

From 8cbf295b6c1d33fded6a78c7665f980bc2bb72d4 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 25 Mar 2018 03:27:28 +0200
Subject: [PATCH 060/170] chromium: 65.0.3325.162 -> 65.0.3325.181

dev: 66 -> 67

cc @YorikSar @aszlig
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 66d41a9c165..e30ec4228c8 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "13n84ky5fr5by71jd9ivj3q7czd2gxrnvbj8msskb62zamjb8z80";
-    sha256bin64 = "16f2b9sxyljrmj2rcfzamf9ji01pkamnb6qv363lf67fshm37ky0";
-    version = "65.0.3325.124";
+    sha256 = "18dampi62wwvscywvdz8lil0zhxdr4p6bhr4yv08arz029w356lc";
+    sha256bin64 = "129jq8ynj4y81rhzxyyfcfpllq3a6ddhiy766zw28s7d43q4zca2";
+    version = "66.0.3359.45";
   };
   dev = {
-    sha256 = "1qy8gv859qhg5s6gi3mvdgg1s5wi69r6qkhd851nwlmmjhvarfg8";
-    sha256bin64 = "1z1s6i4yx20ayr6a2ycbgd0ipy1ncw4i19k0g8jbn639kynmfxjw";
-    version = "66.0.3359.26";
+    sha256 = "09x7p83p188ms0awxj3kl9kdx796ns6m42smqd3jccnljx54jls2";
+    sha256bin64 = "1aa24gvbf9awm59n05jkb4wy6ssr7fns4rl1hd2c66cq2d4mx3d8";
+    version = "67.0.3377.1";
   };
   stable = {
-    sha256 = "1kkc276jfhw2kp9pfg1drxm1h98d2cwm4c5c7xay2pbrhkypnzk2";
-    sha256bin64 = "1vv34g05x2jyg8hgk1r760g38rb3r17p5iwf1f1wqkjp3z6c952v";
-    version = "65.0.3325.162";
+    sha256 = "11w6wg862ixbgm7dpqag2lmbjknv83zlr9imd8zchvmrqr468rlk";
+    sha256bin64 = "0r14w94aa7zg2i3zjpwvb7d6fg9yg0xkki7jzcpjmzwygy78fs16";
+    version = "65.0.3325.181";
   };
 }

From a62fffd9a5c9441235b90c68dbd7bcba34940b6a Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 22 Mar 2018 17:58:57 -0400
Subject: [PATCH 061/170] ngspice: Move shared library to a new derivation

It turns out that the build system does not support building both the
command-line tool and the shared library at the same time. Consequently
the ngspice derivation has not provided the command-line tools since the
shared library was enabled in #31166.
---
 maintainers/maintainer-list.nix               |  5 ++++
 .../science/electronics/kicad/unstable.nix    |  6 +++--
 .../science/electronics/ngspice/default.nix   |  9 ++++---
 .../libraries/libngspice/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libngspice/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0524b26b831..b38d9b16353 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -572,6 +572,11 @@
     github = "bergey";
     name = "Daniel Bergey";
   };
+  bgamari = {
+    email = "ben@smart-cactus.org";
+    github = "bgamari";
+    name = "Ben Gamari";
+  };
   bhipple = {
     email = "bhipple@protonmail.com";
     github = "bhipple";
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index 21eddde8267..7209ee3edf6 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -3,10 +3,12 @@
 , doxygen, pcre, libpthreadstubs, libXdmcp
 
 , oceSupport ? true, opencascade_oce
-, ngspiceSupport ? true, ngspice
+, ngspiceSupport ? true, libngspice
 , scriptingSupport ? true, swig, python, wxPython
 }:
 
+assert ngspiceSupport -> libngspice != null;
+
 with lib;
 stdenv.mkDerivation rec {
   name = "kicad-unstable-${version}";
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
     libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
     cairo curl openssl boost
   ] ++ optional (oceSupport) opencascade_oce
-    ++ optional (ngspiceSupport) ngspice
+    ++ optional (ngspiceSupport) libngspice
     ++ optionals (scriptingSupport) [ swig python wxPython ];
 
   meta = {
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 114a2eea85f..96025e8faa6 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}:
+{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}:
 
 stdenv.mkDerivation {
   name = "ngspice-27";
@@ -8,15 +8,16 @@ stdenv.mkDerivation {
     sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
   };
 
-  buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
+  nativeBuildInputs = [ flex bison ];
+  buildInputs = [ readline libX11 libICE libXaw libXext fftw ];
 
-  configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ];
+  configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ];
 
   meta = with stdenv.lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = http://ngspice.sourceforge.net;
     license = with licenses; [ "BSD" gpl2 ];
-    maintainers = with maintainers; [ viric rongcuid ];
+    maintainers = with maintainers; [ bgamari viric rongcuid ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
new file mode 100644
index 00000000000..b6d5912581b
--- /dev/null
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, bison, flex, fftw}:
+
+# Note that this does not provide the ngspice command-line utility. For that see
+# the ngspice derivation.
+stdenv.mkDerivation {
+  name = "libngspice-26";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
+    sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+  };
+
+  nativeBuildInputs = [ flex bison ];
+  buildInputs = [ fftw ];
+
+  configureFlags = [ "--with-ngshared" "--enable-xspice" "--enable-cider" ];
+
+  meta = with stdenv.lib; {
+    description = "The Next Generation Spice (Electronic Circuit Simulator)";
+    homepage = http://ngspice.sourceforge.net;
+    license = with licenses; [ "BSD" gpl2 ];
+    maintainers = with maintainers; [ bgamari ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..aa9bc5f5956 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3434,6 +3434,8 @@ with pkgs;
 
   libnabo = callPackage ../development/libraries/libnabo { };
 
+  libngspice = callPackage ../development/libraries/libngspice { };
+
   libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
 
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };

From 67f9d2425dedbea2c2611100a6fb5935de9a6123 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 25 Mar 2018 20:01:31 -0400
Subject: [PATCH 062/170] Add 'make debug' to call xmloscopy

---
 doc/Makefile         | 3 +++
 doc/contributing.xml | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index f3a4d6b5aaf..52d1f4630a8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,6 +3,9 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
 .PHONY: all
 all: validate out/html/index.html out/epub/manual.epub
 
+.PHONY: debug
+debug:
+	nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
diff --git a/doc/contributing.xml b/doc/contributing.xml
index 8eed9c5416e..7aa0df271ff 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -16,9 +16,8 @@ subdirectory of the Nixpkgs repository.</para>
   [nix-shell]$ make
 </screen>
 
-<para>If you experience problems, run <command>xmloscopy --docbook5
-./manual.xml ./manual-full.xml</command> inside the nix-shell to help
-understand the docbook errors.</para>
+<para>If you experience problems, run <command>make debug</command>
+to help understand the docbook errors.</para>
 
 <para>After making modifications to the manual, it's important to
 build it before committing. You can do that as follows:

From 373cc61045cec5cdf62929bd0a04442321f3a459 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 17:10:29 -0700
Subject: [PATCH 063/170] libmtp: 1.1.14 -> 1.1.15

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-connect help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-detect help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-tracks -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-tracks --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-tracks help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-files help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-folders -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-folders --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-folders help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-playlists help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-format help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albumart help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-albums help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-newplaylist help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-emptyfolders help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-thumb --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-reset help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -h` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree --help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree help` got 0 exit code
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -V` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -v` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree --version` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree -h` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-filetree --help` and found version 1.1.15
- ran `/nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin/bin/mtp-hotplug help` got 0 exit code
- found 1.1.15 with grep in /nix/store/l43arqcf2m9269ccgw98yv4gw2khik5x-libmtp-1.1.15-bin
- directory tree listing: https://gist.github.com/9d2ecb7c47b08cae415b4f3d91f3cb82
---
 pkgs/development/libraries/libmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index dca80bbbe88..88ef55715a7 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.14";
+  name = "libmtp-1.1.15";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "1s0jyhypxmj0j8s003ba1n74x63h1rw8am9q4z2ip3xyjvid65rq";
+    sha256 = "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h";
   };
 
   outputs = [ "bin" "dev" "out" ];

From f747740535ab7d7f8cbd196e56d8e853b4d4395e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 17:13:47 -0700
Subject: [PATCH 064/170] librelp: 1.2.14 -> 1.2.15

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.2.15 with grep in /nix/store/cjbd6mqjf4lgxl73dkvs9xc03yvdcwwv-librelp-1.2.15
- directory tree listing: https://gist.github.com/bc4e1fc397536ead26ce0d2df2c25296
---
 pkgs/development/libraries/librelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 5db5d2b5965..55bb22e660b 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "librelp-1.2.14";
+  name = "librelp-1.2.15";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "0marms2np729ck0x0hsj1bdmi0ly57pl7pfspwrqld9n8cd29xhi";
+    sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From aabf45c1637f3de98c5ca89188573985fbff153d Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 25 Mar 2018 20:14:55 -0400
Subject: [PATCH 065/170] openjdk10: minor cleanups

* with only one source bundle (per JEP-296), we can use src instead of
  srcs, and avoid the need to cd in prePatch

* fetch sources from jdk10u instead of jdk10, to make it easier to
  grab updates when they start coming.

* removed commented-out code that became irrelevant in the 8 -> 9
  transition (*.pf files, infinality font rendering)

* create jdk10, jre10, and jre10_headless attributes in
  all-packages.nix
---
 pkgs/development/compilers/openjdk/10.nix | 23 +++++------------------
 pkgs/top-level/all-packages.nix           | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
index d84b0c30242..2a0c7a1ac01 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -4,7 +4,6 @@
 , libjpeg, giflib
 , setJavaClassPath
 , minimal ? false
-#, enableInfinality ? true # font rendering patch
 , enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
 }:
 
@@ -20,18 +19,16 @@ let
 
   update = "10";
   build = "46";
-  baseurl = "http://hg.openjdk.java.net/jdk/jdk10";
   repover = "jdk-${update}+${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
-  jdk10 = fetchurl {
-             url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1n5jccf2rw15hzwppnvy87bysb84g3fcnkxbjhj8gi0iv79dxlc7";
-          };
+
   openjdk10 = stdenv.mkDerivation {
     name = "openjdk-${update}-b${build}";
 
-    srcs = [ jdk10 ];
-    sourceRoot = ".";
+    src = fetchurl {
+      url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
+      sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg";
+    };
 
     outputs = [ "out" "jre" ];
 
@@ -44,10 +41,6 @@ let
       gtk2 gnome_vfs GConf glib
     ];
 
-    prePatch = ''
-      cd jdk10*
-    '';
-
     patches = [
       ./fix-java-home-jdk10.patch
       ./read-truststore-from-env-jdk10.patch
@@ -126,12 +119,6 @@ let
 
       lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
 
-      # Make sure cmm/*.pf are not symlinks:
-      # https://youtrack.jetbrains.com/issue/IDEA-147272
-      # in 9, it seems no *.pf files end up in $out ... ?
-      # rm -rf $out/lib/openjdk/jre/lib/cmm
-      # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
-
       # Set PaX markings
       exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
       echo "to mark: *$exes*"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..969f94b5cde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6423,6 +6423,20 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
+  jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
+  jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
+    (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+      (openjdk10.jre // { outputs = [ "jre" ]; }));
+  jre10_headless =
+    if stdenv.isArm || stdenv.isAarch64 then
+      oraclejre10
+    else if stdenv.isDarwin then
+      jre10
+    else
+      lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
+        (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+          ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+
   jdk = jdk8;
   jre = jre8;
   jre_headless = jre8_headless;

From 25856e37e36400acaa13a4cb2f45baa602c0cec1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 20:39:38 -0400
Subject: [PATCH 066/170] haskellPackages: Fix overriding all-cabal-hashes

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

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index d528230b77c..7b512e46da8 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -15,7 +15,7 @@ let
 
   haskellPackages = pkgs.callPackage makePackageSet {
     package-set = initialPackages;
-    inherit stdenv haskellLib ghc buildHaskellPackages extensible-self;
+    inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes;
   };
 
   commonConfiguration = configurationCommon { inherit pkgs haskellLib; };

From cb9c1c63c978f6813cbe74182ca09c70e8888d7c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 16 Apr 2017 15:18:44 +0200
Subject: [PATCH 067/170] nixos/tor: expose control socket

---
 nixos/modules/services/security/tor.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index fed91756e76..2c727de2102 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -5,6 +5,7 @@ with lib;
 let
   cfg = config.services.tor;
   torDirectory = "/var/lib/tor";
+  torRunDirectory = "/run/tor";
 
   opt    = name: value: optionalString (value != null) "${name} ${value}";
   optint = name: value: optionalString (value != null && value != 0)    "${name} ${toString value}";
@@ -38,6 +39,7 @@ let
     ''}
 
     ${optint "ControlPort" cfg.controlPort}
+    ${optionalString cfg.controlSocket.enable "ControlSocket ${torRunDirectory}/control GroupWritable RelaxDirModeCheck"}
   ''
   # Client connection config
   + optionalString cfg.client.enable ''
@@ -140,6 +142,17 @@ in
         '';
       };
 
+      controlSocket = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Wheter to enable Tor control socket. Control socket is created
+            in <literal>${torRunDirectory}/control</literal>
+          '';
+        };
+      };
+
       client = {
         enable = mkOption {
           type = types.bool;
@@ -692,7 +705,7 @@ in
 
         # Translated from the upstream contrib/dist/tor.service.in
         preStart = ''
-          install -o tor -g tor -d ${torDirectory}/onion
+          install -o tor -g tor -d ${torDirectory}/onion ${torRunDirectory}
           ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config
         '';
 
@@ -716,7 +729,7 @@ in
             DevicePolicy            = "closed";
             InaccessibleDirectories = "/home";
             ReadOnlyDirectories     = "/";
-            ReadWriteDirectories    = torDirectory;
+            ReadWriteDirectories    = [torDirectory torRunDirectory];
             NoNewPrivileges         = "yes";
           };
       };

From 0a8359f18cc275408c6de82027262e6fd9e382a5 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 20:43:23 -0400
Subject: [PATCH 068/170] GHCJS: Fix autogenerated node executables

---
 pkgs/development/haskell-modules/generic-builder.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 2f6f5e51c0e..76c18cc486e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -352,6 +352,7 @@ stdenv.mkDerivation ({
       for exeDir in "$out/bin/"*.jsexe; do
         exe="''${exeDir%.jsexe}"
         printWords '#!${nodejs}/bin/node' > "$exe"
+        echo >> "$exe"
         cat "$exeDir/all.js" >> "$exe"
         chmod +x "$exe"
       done

From 60cbe237641898d6990ff338cbdc99846f137288 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 17:46:46 -0700
Subject: [PATCH 069/170] links: 2.14 -> 2.15

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.15 with grep in /nix/store/sv2bhipkaba7wbgkwinbq1xs430zmvra-links2-2.15
- directory tree listing: https://gist.github.com/c94bde5e3281eca9ed30751401d14020
---
 pkgs/applications/networking/browsers/links2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index f097d748d48..7c007e228f8 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.14";
+  version = "2.15";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp";
+    sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy";
   };
 
   buildInputs = with stdenv.lib;

From 0f5427195ffb4c99aa496af85f560f869a7e5622 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 18:30:36 -0700
Subject: [PATCH 070/170] neo4j: 3.3.2 -> 3.3.4

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j --version` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j version` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j help` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-admin help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-admin --version` and found version 3.3.4
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-import --help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-import help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell -h` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell --help` got 0 exit code
- ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell --version` and found version 3.3.4
- found 3.3.4 with grep in /nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4
- found 3.3.4 in filename of file in /nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4
- directory tree listing: https://gist.github.com/06dd1dc492c20ed7b979e977cbfed538
---
 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 3b875576529..bc67e7eaf43 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.3.2";
+  version = "3.3.4";
 
   src = fetchurl {
     url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
-    sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala";
+    sha256 = "072pk0x1iyg6kasjah8qpki2z462qp0rvgn93y6ngi6zvrpdlbyc";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From 41500cf2d77fdf3e5c27af5634c93843428dbda1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 25 Mar 2018 21:49:19 -0400
Subject: [PATCH 071/170] Request older haddock library for haddock-api in GHC
 8.0

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d4b39c11955..2f4587a6593 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2403,6 +2403,7 @@ extra-packages:
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-api == 2.17.*               # required on GHC 8.0.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
+  - haddock-library == 1.4.3            # required for haddock-api-2.17.x
   - haddock-library == 1.4.4            # required for haddock-api-2.18.x
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support

From 7151ce7f0a955930f50809c596ff881d11645582 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 26 Mar 2018 10:11:02 +0800
Subject: [PATCH 072/170] firefox-devedition-bin: 60.0b3 -> 60.0b6

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 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 0ad35ee1c1f..eeb130ed89b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b3";
+  version = "60.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "59a2c232a7551d3f75843bd71f5d1cf804098dc7bf3048bdac03c51d7e7da32b52e10aae2499d28d0dbe6cbfc5b2fde87c0624142ffc4026aeb4e790f927e889";
+      sha512 = "69913589af0b21f301a14efa66a625a5425f917282e9a28fb3cd21d51a62785fceeb810bc6f2b3ee7102a559f51379b5d78b3bf4540d016039c183d3bb069997";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "869b80d3f535c5e63ecc3c91150b5739d5f4d27137e11f279b534645660c761ec95155702c852b5bd915d41381e8f8c11f8631902bd0cc13f310b30d31aefda3";
+      sha512 = "16a078dcc10ce88562cdac50fc8925da21e282fa309718adf0bdfa3153d8659e24603b1254af64770ecb0d9112dc6024ab6d1810ef0696b895ef837dcf3c196f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b5f850afa0491da07705ef4e3f48a1aa0a4678744a2a19e6c4f52041f91faa9249362f983b6b0dba030644ff67b065e25315b50d1429b9967211b4873d355a80";
+      sha512 = "9f3f3606f80bf01ce66988f687cd1d849eb4e220e002a5652e5771cdf89269917a206ce1f1bee2191c61cab4c57f0b422a40c75f46e0cf6d9f278f4af4a4e028";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "843898c216e1c531151d2e123e1c7b822259915130ac198a7f115dcb11af079f27514fbb2796c00f6059d18d0d7b412ef7758c0a6b9b0e985b5272ef9662cf18";
+      sha512 = "7ead7009ab01a8e4601bc5b9a40041619dd1df0f421ad4e8629360318589cb9acfc95900925487f4cd1619d6b663b2d675c0115803131310358335a9813a17cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "f02f956b244ad48b94d0c45307d61b92a70d6cf2acd58789fb453287d0f53c47322dd538a0e1b17627a7e568728abb905a835c29c35add401bade4754d987dc0";
+      sha512 = "ef5f3db024f39a1b8d5ff0333d22effb4b82ecbe9a0f85b616c93a33ea1cce5b5a48ea3f483512044d16766f720164f773afb3a19a62be1b5458415b36694fbf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "ab7fd7a674a7292cbd9f79a72129a212c95c8960c2673de52a3b566efebbaaff316820a5f2613394592c4bbe249876197bf4dafd9e84c6cee35858521358a49b";
+      sha512 = "e45c0cf476f8d1d5211df5268fcc49cf0ef88a3c6546003d5e4ade08cf0620cf712a5e37da643284c2e114a36b650f76bf28fa047edda73fd31200e5cc5a2a05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c9b7e536ea19b74ad5774e95a2195718692a99c7e59a0fd482cba9d7c62250983d0cd7689771db24b86c909df5e52a009e7d97be76807ad21dc5ab838dcf923b";
+      sha512 = "5c0574a0e7170d7cf1c5d04ed06439161d8dd2f7cf49d7da88ab01dddad22eae72764b518bddd04ea0c8fb4820dee5223fb6c062175358c9531bf6c13df50900";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "33d5175f1df479f85d582c8e95255dd42f004c5e53e5a11e31344db85eb1e49c7c83c2b348db840cfee44aedb17d52bdfeef63cb8f3e9a4530a33d34d05c0e5f";
+      sha512 = "3650054a3d97852e7cc450087d8a9ed41c122737c57c588e66646a846c41a2a7553fea263bda1828a89532ccb734a0aee7fc2803ae148ee6942462045813a0b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8d1f3c82a6543b8ae7ed19e5c6a34525899ca1219e2206ae2a6bf391fefa37447d611ef6896ea5210c1aa54e65edc23548dd76eb13f42b6939624409540729a7";
+      sha512 = "35cdc212c1ce673305dbbc05690b0b80323050b85f3793b4f0f1cc0b7416ff01cc1a7783066643cafb20206d5c8b51de4668c81849debc03cd71b8cc0aeb9375";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f1b2f7dc2ca26c0637a3cbf9d649750e2c8c885a40b0767310ca7624d8947c6ba09e6be9529814524c876fb9fb60390f47ed88c131227a14e5af9369456aa363";
+      sha512 = "bff9c7b7b3da3f0345fbcffa4f7be3496b6d127fff0014841b500eee261e84975f19e44983c6177e7c2e4f93c30d8b94e93f3210b5ffa28480e639ca51d96151";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "5c6c8aade30d76f496cfafaf8c0882e72bc10c733486bcbc315ee5ad41565957f67c9b821b5b77424a67619211d5eb959c731beb28117c8b31ea18f9e4516342";
+      sha512 = "2ae654744dcda3627cf2ce9faee2b04d98b18aafbde71bb0c79c8751941df2df3a615b62c5e9f60a4c6c9ad3700e5765a7fdd0cd0f7af1c12e724d6343d077ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "bc7f71477781a9e9cc50e41fd1507293f48892cb2001bd79360ec4ff65e96fca6f69d6d063c9c6e44c0e982717ecbe6a6af05f14485c13816e415b3104d93456";
+      sha512 = "5b8dee9188e94ff32485a4dc94fe0afe9c0dbe5b6e8aceffdef098a3851e3c90e2e6562b7503c3ed4174bedab94e7cc8f065f591e8e1c1ccb9afcf803cc7804f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "645a7bb1a4b5adbd3d7d9e190fe8ac24cb81d311457f426f8592a8427a263a0b8ded1817b8026241b1f3bed8e2e526158c7f1339d4584c1302822bdf21ebe870";
+      sha512 = "56cfd8c2e8119ea515ad0051152da29f44cedb60e04707433546f44da1b67498221d39d38cc4c18c1fe7ff683361831795ab5e26405d3ca565313b5e47a1d32e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "12c3d21eb2c7a121080a645a75966caf757e886222c292b4ead3a23278bf35d4242e1440ed5f7eaedf1cc4a7436b6ca2130fd2accb075714c71a1ec31b1dfd06";
+      sha512 = "89e745399ec681fd121da56de264b92895bfb614a14e4d1c2802509bb0857aea75082c02166ad9d678452fcddb88dec4eb6f540a51a8257167a585538757bf43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "8cb1dbe49d8bf0696b6291452a7e389da21dabfd1bca59667038b2fc9647b588ab1632c5d1a8101c1352807c57f42ee1f909c1e1c926321a8583300f99a0934c";
+      sha512 = "49c02148c13c7bc9994d029b108adb8d6622c336f4a5262fbc6840527adc53af366138f447fe91ed436fd3b8f625eb57cb227097fac78cd92df50af00bf2b687";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "06bc6712e27514529dc17379d8fba4537440f7cfa7e84d2b4201386a886030f3b4a098b6230577a36cfa9c9968ac8c1432100a0047f86c0aa32d8fc1971d0122";
+      sha512 = "b5c9fae4d9ed3653511b6a7d2701f539203e39f319268332f726ae6f2345e356715ab26b92157cc5f39a285983f8d29b3e1bc1a6852a3ff6deab13b1cc169948";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "123a40d291431478f8fbaa13eb2197f3dc885755a1478519ed599b84fbe086c377b6208226e0409f156fb4d90ca1beb25fd255583018ae605d2aa4c5bf84d258";
+      sha512 = "cc4f76b0f3e8cb1879db79b324056f94a72458ec0d578698e9f59a61096684f940174cffcb90a9ebe5062ac53dba62237582989c86bdf4eef6b0c54104e289c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4b556676ad9fa3bedb4ae49685344cad23da8c47c68efe986d14166308b6de53cb2f0b696d89e55e9ec1a3e7d523016ee7b87f539d4d6b02facae2014e815858";
+      sha512 = "b7fd250110db719aed55f3508274ecd6b9eab72606947309e8d96d2fe76552607724ff74aeae12f9fcbaeeb15569a05d0449a051d18304e59df8f872965234bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "eb53b6c9a000c4b7277d164c39f0d53928fc29527cf35a79c1ad1418f620efc00a16663ca0a59db3ee7a1d51ca9b6652777154827e916fc0346685080ea0bc8b";
+      sha512 = "2a8c8a4c26fa9262db29aebbb5e9df647340669c3d0f549efcdb3f2ba4fa196abb22942df8b3358ec26321f0e264328fd138e8603157da4945567170f59eddea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "152b9ed4b6674f1f9f83caf6b344d83c8651beec699fdac4a9cca4ee82012bd8c8096b3bd6319a87b8ba3295088d56a2aa8be965940114b2fbbf85e102c63620";
+      sha512 = "bd197a1091b9401d3759f8df407d6bdaee36184e0479dd6c75ff216f73e3782739eba8bba99a6733bd6fdb25a0812ce0274e233390762d622ca3aef5bfe9dfeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8c498c56a8266389fc43c80971bc379a1c79d6769d8560e2620320f9ca502c420bc5b671be09dd50f67afda11a45b6fc56c17373e562691527190bf8334224d1";
+      sha512 = "93addd3420986aa0f44f642173b2a24b47bc488cb795b85eed0e01f99208b7c8757c6b1049ba519969047c18fdfb1fc1f43c397da75bbd7c763a4209ac6a5681";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "68a54a00c74b113f2f4c33c92d872c454da2c97e34c81c91e5807d2725415d81a6713b68459dd75a1602f908012d60883f9d483d23fd638dc0d43a75414319d6";
+      sha512 = "55cb7e0789b67d00a5b13e8c4ec2541ebd7fc9edb9cf5af38c23c937cee6b1f1900a73ee0d9c70a088d9cb093c806f309b97ee487532bb0cde1ddb0153150f62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "1be7176d5a5708fca376f9146a8ca49debf0e4702365535685d2a3db68628892881b3be3ae3caee972f3839fd48528513131114c5044a31d6468c1e8606a9eeb";
+      sha512 = "62545eb38388650a91b3565237dfccddf9962e174d51b2cb5e38471e365ad155af08b4a04229e472669a5ad652b57d47428b90960ca09c4c8ece09549f23a01a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "b9239303030197b776debb5726a25864e54795627f59bfe4c0f24913d56a04b5d4f4f69ae1fd8c56d105e8edb185e64bde96226e043078703c3b5805b507ac4e";
+      sha512 = "e5da78332abbad7c913dc917905b5f5e1d3e5a558353778fb02952675da465dd619c544441a42ab94ac5c14077f380a240a5592d84a6e84d4bd77194e1b3eca5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "4b603bdd4f1b484a87894f3252418753e2f52d6cf298cda6d18bcfaddfae5269ef69ebd0a7e9d85da8ab42ccc4065809ab34a0ee36632c4ee4cc65fe4169cb99";
+      sha512 = "a9ed1e33b92a061e6578a4edd0db18216bdaf350fd5a65f75fdf7e3f130bf007abee353facff8bba2a22dd91643dce0c3e22055474005aec4aceed7ad8752973";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "e27a814f7408198c200165da2fe6cb40fe0b11626e15d92e8224c12acf1dd133e419bf8f98b09dde3bc505b77750950f568bff295919fd1b38112e879a6694a5";
+      sha512 = "ad70fb5093d24c2d05b770074c3ed3605a0d131869bb07e185fdbb3f6f51de6c959f0c46af108718d17381fcc8e20d4ec9dee2d56ee02c4b056574844880b2d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "ef6d2814d1ff70e2799a8a0d5c6aae1f711819db6e816f2e153e84701e93a0a7debe19dd0975a4092d8c179f0ef5fa8f2c53b1d0d046110914634fd3bd2ef301";
+      sha512 = "f15fe7fdcfc4409fb14fd4176539520be9fc4af45b4e62b0d3b8c7dddb946485d208879003551c780efc0633031bb08f46f5694340b9340f35532ca1ac6077f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "d41bb50097c60e239b539de8b9b08d21552d556e36606078ebe36a48de8e07dbb60b3e2940c0c531f7632efd2206cde2fcc6294a1f3a74a5bed7100c75658c0b";
+      sha512 = "1024fb8811a0f97fbd391c406277061cf524414ed63a48805357fd486476cf744da28bbc166ac419f448d01748eda2e3243768db81965a4c7b88f129e0893b89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "d3a2a4aa920c864bbd28dd8cdc091b25d6b8d386f73144d6236ffbe63a99e74af6f6420a82bde6b2f8e35ddeeed0cfc33a1e9aadd425d778878aff3b447aecce";
+      sha512 = "27645528b9e8daeeb8ddf417820b27c48967437752a8a4939183e8c646840686d64ca3b21e6f26270965c0e54e44995da4ba1d325be85e740d6200ecd18972bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "f66cc73bfe130295e35c44cc2902c3f1ec7b271d673974e13e0d8be630f671ca548943f13c04a01f45cf5523b3e67147ed28a53794e714409cbe2078bdb0dd55";
+      sha512 = "863e4e532c22bc2c055fa354674b4dd38aea016ecc69383b746bfc0b70b634e0ff881dfa3de33d2a21811a9ac312ae2d7423fe8813c31d3af4d4403d07e5a729";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "f377f98e9d3b1774372add885bd45900e9d5a792d3b2c9c96f1ba4db0f7f03a7f693e400888c2d98a5fb67d4199f13f2262e0546f5e53491803872cca5e94ba4";
+      sha512 = "a72c6a0d80453e82d6081fdcb702fe2f91f17a7cdc4f1ffdfae8c340bdea87064b4ba7f52d114fcfd87cd30242220bd44b36f01d0b09a7cfd7808de4d48a7117";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ef1b293fc8569a23c2b60a47f65d672334a5ee8d20470460ea6a2972ae7e6be91ecfed3c3f2acdba614e7895060253444fdd805df00cb08a6a2abd4c0d98127d";
+      sha512 = "0df9a0cb44c7775e4631a66daabd7c02f1d6bb38b87e9487d13e52ce02a6b7a93d2bf87c1ff6a7d8275d2f4d0357cac0a87ff9a9e9edd2b25703b8d9340d3e1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "774ca258ad68a2a6a5c9943e7b9ffac96a54448217125fe61ff11a0ede25c96498f7153f3406c1322a1f83515147402a8b506aa81732f2617e73e388fdd0950f";
+      sha512 = "2ff27ca36d90608a4762453ae89a93eb130acb8bae864e31d30cd135820867730deeae4a65bb942d64346fb9318da791d51318a398bd2c44d8addf6c40296e52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "e29c6aadb5dbb9d456a11ff66d4b17296d6cb4417e4eda85a2666a79d6d2fca65b93cd7ceb385456e950730fa165462df164ffe17ac7696e359d96d08400257f";
+      sha512 = "cf1513ca85ba34bd863ed0f1a1f279d86778733a83114b0a055bdee7f1dc5742ac9b138a564699a28acdf695b5786c8d6c92999e588e9597fbf79ded3db903a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "487f9e0a439c2738f1eb2c55fa89e56b7829b8c66dc893ecb23f3705d86e1f8bd5948c2ba0ccf3a7eabeda68385371a49dd74b92e3daa2cc7fe07b958134ee60";
+      sha512 = "8236fdaf20caedb944464eb00cbe078bd64c904f2064ce9b884e4f84c72237e6848afb4247d6e62f7452afe0c13f233e23e4cba86933eb268386c78a9b6e5d8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "0e526712e2f203e1ec806216144abfcb9ef96c769f8f736298053a8ad33d6f9e3bc6e6f6b36c4aa93cd45ee8a6370a15e0da6aa312175e142b574db8f5e628ec";
+      sha512 = "7eb670c2c408976701391ae65889e49db09cc8c155069da4ec67e6f3a8d76406297b13fc60d4253c0a664f41bd67f7482999f2c2c9d56c56aab02d1a351f7997";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c21112fda5525ff7ded643407fe2be5c6b660449879a80dfd57b1f713c98679062cccc577a42573bc2bea9adecd660551c7f31c6962905cd51e6cb8eb14a22cd";
+      sha512 = "cfc48df47e33c7ec1e2a07b5ea915958a4762db558226cf78e014ebf2578660f93215272137dfa52f5a65ab1e99cd24f293d145e7dd1015a2cc3e644bd4dba70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ed6d0fc2a82ee3c0e14031d58bc2074dde5160492de7920220ac8e72ca995b553ca8c9899d9d8f256287a302bdfbffd65981d64d8c778fbe7e4f55365b6c317a";
+      sha512 = "a97ce4a5773caa3359828ec9216661ac480d9577bd511c44963309e46216e74e89ca876de035162654a07f5002359918f6eb4b7f1c305184e51461ce3e48ec51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "345bac14c394a432fa4ace22a439eaf2d16e6e0dfb6dd97e356c2b623000d14675154e34e4537b0f5bcd1e90c1111a263e7ba52a1ef6e81f6c8d0109a6263690";
+      sha512 = "6a02e273b1998654d9a31f9589a44c9f30975976cfcf3e9d74f0e66508b991e7eda148756951cf5bbf781ee37f8bef380c12d3c25637d7557d2480a6925ab629";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "702f85952d51286576c729c84e2709b32ffa0a1dd03c2911c1b20de7510e1a006531389c2bdbcbc1fd99fd3568db5a4157daed9c65a4be04648872a8200a808a";
+      sha512 = "ed5bb626dc1a0c29f4f7e222b6090c24f6803df53baaa632727fc087dff5cc4a97a85b9105e9d5b228cb27df95f50efbaa7298a4e8c3e39eaa424a7d08dfe042";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8286e8fb299022028cf17466c199badcebb23a9aa743d4c64b2737d3112a5d964fd0b534bec6892aea9d67877dece66c25b1ddf15e08a745924e815064768891";
+      sha512 = "5cf25bf3820051eab9e72637a66d6f1c082253953302363c2e95bc026422e84856dbee180c86b4c9bcf186db5dadfcd20efd6ec12e743be90d2a1b3ac229127e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "598d84026a03835044c8bb57e5f27ddd131a045c49c779a5813d06b789bb062ea2d4ed92f8d5fafeb1b2ed5dafcaa75e9c06f5c8354cbab80fba1d1db6ce61ca";
+      sha512 = "c0e418e15b74101c09ce61296da0cea9b94300e4265dde4837157330082678aa7b92286db2c883b7ae5577d86232eb3e3337d9acecbc2de14dfca5032ac798fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a410f8d101396f727920c4fbb91d1ec6885ea98317a1cbe7557d6ae7b40a9e428c6a6482cbfcf4857dd0b652cea8a6b3953fb76455234b2a6938cd55d9f9ccac";
+      sha512 = "f9859b355359ca2ae8833b52afb8f4830844f9c264cf0ba72a7bf72bb0070475b0fe4f4d5774bc3243c834dbc671b80c6d428a8b6828ea43b600be0c90f9dc9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "40fe8d2dd6f232ecfb0f48cb93f837cbb9f731c07c11d6c51c44bd596b050be89aadc610dea9782d42fde6ac8779cf72eb6b459df11d6ee1dde8b9960ec13926";
+      sha512 = "18d7e9659a284bb0f60d3f59e1d711844c75e6213b26445590fbee2878952aec0a42f3336f2ec20cfef284e41f1d8f2d3677ddf767c94a00112d021b95d2749f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "319fe8680ff501e100ae9b3e5a818d6fc69c1dbfff8e11e6ed55d9e25628b7435da4632e5a6b92758a0f2215d79f49f2aa1c1f98029f146af30e1be36dbd47ea";
+      sha512 = "b16bceeaeaeff3feebe8d895d92c32d23a6c6cd799d2dc7aca95bab84deff4288e7625eb680125695f144a21deac25d57d5c670424209c9e50e48052eaf10460";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "a1826847c504931ab1554cfd4af989ab7046eefd9d1a28692a0b39bca390652d6e30d193076fbd59977460f5570b973bce1d0fec8c1ef6195ec70a836cbc5520";
+      sha512 = "5f176695bd41afc204360693f6587b54c3daf579dd0dee798228c5e9be09e816c9633d1ac0d92fa1c5ec3281354fc83e07c9406625f04c7331e0fce56414b7e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "3e7b49261d343eca5fb0828d7a5b6d298222e31066a7395d948f34d597642f1580e93852c2824d40262d142e679dd2169a05626721ed7185b5d0ae31759d2b37";
+      sha512 = "724622a046e95409f1dce53ec389d86c6bd178f67cc4cf3037a5cd924f7d47a14e98e75f09dc0a7cbbc3332469d2c0a11003a3b99f10996d64cfa5c0f607916e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "e9eb9c11cec68272ab8bb60f0f099c81e4de395736663f47a1221ea089ce651f844c16e3594b1ff39c8f60d3a6cb40a28b08e8df1ccb2d458f138607c3020aba";
+      sha512 = "c563d9670859cdd0dc58242a3c456d5dcfca041135d5a24c2c5cd26e61a41ccba540346f66a48cae0da67ee4d6e2627a7845d9cb794cb801f5a04523af15edb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "e94899aacd5cb5d893482e99997262f021a8c4670f5696999d78f657d7f6edf60c4f9373efef9c20bd552d7b55cf335e797a6d0c7a975f7223d40ff7c27ddd65";
+      sha512 = "d6695401cf7e7120556b93aedcab43e5cfd4988136fd40591f9c878b708ba449daa3a1bafe09a18e4ed51053a7c6f646a29e94438628d81f409063e48ad97a97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "e118054c8a2673cc771d4b2a3f9e4db4195ad487adc51a9e747545271bea4abb241ad264e474b30a03f88056477d0a26a3efd145a67ae2b5f9eb771d04c946e9";
+      sha512 = "7ab5d656e411be7b94d75d61887a9ed231c72b1f58b72f803310b000092c1f7d284c382a93cd998d64912a548c01785284c1d10f37359facf28ddc0f77ab5584";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "fec6a82125d6c6d9c42dc36e18553570717233c5a23535feb8264a1f3c4fe766bb1d21def103aaebd92942d0d957810c3e3cd7dfae9c94432b306783855b182e";
+      sha512 = "f1d7c8abc9b9ab70c4444a5a9d04ae42fdaf04cf3d865fe23e8f29a5713967385122520149e6e0c07ba54d7d376c654d730c671b027de047b77c584664222867";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "376fd767808b561233b14d65fcb39668d66078e2ec7f77005167f505a7393cbfbfecb7a2b643353b4dcf0c06b736d86100ede42d235cdc1983b31648cb683530";
+      sha512 = "7ff45b4c97399f451924ed1eced10e02fff31d8f0718eef449eb52a7bc7ef62e90b70cfd1796cf288e227b1fbd1a3e109c4bc085b7a3e1d2df5a90291569722a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "335007dbee3221ec42fa2dec5d7bfe4a9b4b614eb02d83ba6cc4c37abc6df1f9b5500ec65b326f06fb4225c65127bec8e3ab5d6824285c2e76e6ba5248d0a8ff";
+      sha512 = "b73283342298038102f74c6d2fa3cd947b9f03fcc2b8a7eff77b56e9cd6b0ec6d8476f8146fea510ec0ea2de811a61d8b86db0f412f4625325ae78ae9579d3f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "dc587b11b62269e6fc1b02abc4eaf99ed1121f1089f5c42854fbe55abdba7ae44fad1893df6558313ce0c11377b47937bb3acd496106411291a9b91a51947ab8";
+      sha512 = "182be98cf92c1ee0d13fd7bc8840e54e4a2facd450f2dc9437af8363e202628ef8d5172af7e38ae674f0dfa7e1d216a9d6750c62e574f73f6f61bcbd370f786f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "290d192cc9a46b95494e68e1f36c57d6c790554f3d1f05a66e8737a0ee59e26dbf53381a17c17f85c81a674292a4b7708ab5e0cd9f9f4ed8d21eec3bcdab0039";
+      sha512 = "bee217e50d42495730a9b861b07eda1d68f761b87dc2f3cb3f4e174d8179f65eb8e00d8564e8795ee10b736db338caf0e19174bde043efa8c5fbdbb12db55394";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "9ff963c28b5a1452c9e08ae7cb5de82991c282c7e5a6621958ac4d797bd74647b9048dac9e34cfe9558cf16fb1bd84f55373cac7b1b336e2f65b4d9635aad3f1";
+      sha512 = "e2366510cb2a0929689e255c59f029ca91faccc12ee92b42f6e9efb96c3c5c0af941be2b366ad6bb17c1c64fd3be18a9ec02ce2fb0d4a5e37bf94f3c49ea449f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "4378e5c31835efc3a7215ca74d85408e583e00c8979d4a3e5026e506765b49448d009e8feb5f2a2ba27d7db734d0ce3c0a1679ef1fc330e1637cb764ae7c8578";
+      sha512 = "159186c8e0456900a60b1b896d60b5d476f33ad330ebf926c8b36690eecd7b7bb365ef4b9ad2a5ccc0e3ddf635a7d6017a7ffa7919d1daf7d15f0bc4f7897678";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "da43aa7ba706d780420cda16d409425be026950a7c71c43327c8271fe6ff13cbcefb179cfdf3c1fe79cceae2d6cee6f9171697fb3bddec3b5589b8b1881d7a61";
+      sha512 = "7a8a08f3a587e859daf4f385b8abb5d83ea23cdad7797661394bb39bce04581d3c6aac417154ff9eb0f842a8b9b6280dae43edb8ad559586b6215d1e9a1421d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e31a35622a83383f00fc9defbd9d8e39e7819273d0698f802960adc094072427799254ac89f2a4de42070abb1efbc93b9298b4c076161a9478064aba44ca6b05";
+      sha512 = "471d8a445bc80a0c091c1dc07314e4256262299e7080656b4084225d7843dedc045cc30623f2d163937dfb5d2938564660a161c4f9fc0ec217e1238354e991b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "df75c385915e6316d8a4f9d04b4092889636e0de116fc2c33439047ab8340c3e17f87ef23dab3206197a2d807123f62efc61421770583e3f48268d67296cc39f";
+      sha512 = "968498b4db1b3b07532a8900b4f4018339ff988a13492bf2407bd80859abd927d571e86dd7c5363556c510f3a1559479f4022060f77bf62322fa8d3f41ab2901";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2ae471d5cd45b4c2c5af47df903eb550d2d68910c4086767238d8df05027e9221a3619f810c816d1079dc1e0012bbb7176b9a690d229c8dea6f7a088b5fe19d1";
+      sha512 = "7e1e1a8189e76a7bd1324e680488dfc5d5e2c6616b0b8c30d9511a74c04189e4e20367e66ea75dbd3365c339ead9f58a4c95553590bc5e09f977582014298dd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "01c936ecd336a2b29efd4a63c9f168da42a920a140502c3d5f160fa34f14e62b58a934dc5f102091999768bc2c37077acca8094219462dee72a91ce113f44bec";
+      sha512 = "b713c0fbdeff13b0ef0c1cd45ca5a5b8239afdc4e9644399d69993a01c5a6f8e7fe935c8cc45d98567b94d7ff3d4fa0e17cdf16fbf29cb1618d8618a5967daaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "af11baccc3925a2c877e5833aa0ee24673dcad71faa4e25020da1a62ec7fc3106036c46780fb48012358f8198ba6b56b7143e772427327c110a14c78eebc5b83";
+      sha512 = "85e9aaefe76edcb25f9ac86a90cd44aeddd480842382e95c0d95fcb3d05ef3ea7dd3861ff4796d4a3b2213d7fd94cd02136cc409cf9cc73748a30b97b882406f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "b84b2ce4420d4ad9e9e2417dd8435645c67a133a9594cb39df81c63e60e64c9cf33faa2b04b63e508696596185dbaf276b7e08dc27581f46afe10564ef31ff49";
+      sha512 = "a462bc19b39678309fa2efaeb08eec5f10b31eb2d552ce6c5c906643d13bffe152035269b26edec6674b0dd56f91c82b7ba56734fb99f4f65561bce4c76f0582";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3019e9b26b56a82b08046d3430556eda6ef22bfc576f704aba6a4ac9decc2f317c7a3fc0b1681346a7b9df7be335e899e123c50ab2b6ff6f743ef804a34c988f";
+      sha512 = "538c0985685681a22fc6ca3bc980bbe0401079b3aa313eddc709d7a98c8cd17bd3ca984734ef24266099549a75ba71bfab0459734634e6843c63b13dd91996fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "40af56ea7072beec4893bf9134e16bd5693081396e7cd135e2e51c6cdbf0a7e0dbe6a8a02119a822c71258920bd42ffed1d7f32c0a4cb5cb2c4f7b749e645184";
+      sha512 = "e0e0cb40842658c370ec275726f7ab1dec51d0efcd39f9ba3b3a95daed2e8e2b409e3952ed0c4a9ef2a40756464113bab55bc10f9f3801d8407151e8e649000c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7934f158163a28de2c4922f690c479d95764c36999d5df45afc56589d62c93aa3d0587535489acd0a2ded2c5ef9c084cac6938c20d08fda91e8fcc0b03c057cf";
+      sha512 = "3bcbf9f2b943081a957cce922ae56d636e23c5fe6b582ccba468da0a337cd1f1b4d14e84f8f971cc6bb65d61269004f2ac53efd30a9e784bc432c37628a86262";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d7c383bd900e3a2910d3ae599a582b5e6ad26cb6c93618a1c4c34cdcaded45873f995c65805b417da425525b912d6e883455641a844aac21a2471b457c7a608d";
+      sha512 = "9bbfcad0557739cec12539a36e7dcfddc62294ec2250e4d8087d44bb461db45d0511a4d4a31e968e22912c84d4b5e5fc1e6f68418c935b9d31b02de18c0f37e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "48c076fbda7a15e7a36bde08a8036b6987f7450872129506adbd90ae554db50c4d543289dae5260f2358b63192f06e06bfd964a3796caf41a2cac393dbdcb9ea";
+      sha512 = "d76abe1a6a98901488b80b60dfd1b1b4118024ce3f860d4d6fbf371684e335b0138157b26e02a95c7eef0bc677ed3a6e32eabe198248a2c50febaf30ccd3b60f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cbd6c317d82a2f19d266381bbaa9ec7d7db0cf9c665d9407c36188f95d4e45a1c97df15b62590be8dbf60347093bef95021c55f584897ade06c3c3cbd111e18e";
+      sha512 = "a0c0dc00686a3774d74311a04860d409a4e82ce79df57adf3de6da25cc13ff054674ba0c86eb36b0d3a29d7d4a3978202f4e86b18b8800e6af06e68d7524edfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "96a88afcf2d3b20b88c3f1550b623dd844d6f6e9d86c4b55af5d857c11dc57b2000de3fa685743e465ce3b89288eb940a3ab8984847566eea27717c8d94385f3";
+      sha512 = "c4f9b3e8fb475403a3b64278e4f2bb6e216f32d05077e837fdbfe11fdb4aedc8e7f3034f112295487a50d30b5c109445994ae284abf96100ab2c756f33c9a61c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "f6b77caefeef02b017ee434b256349a0ad954eef10f506ed95d82dc56835c1fda70431617bde9601057928d6c03fd98642cb84a4be81a6c4cd0a0de418f893f9";
+      sha512 = "4817e979a82b22116dd329ea096007978e52513aa6b6ef66fd4d38fae352873f8a204f1aa545549fbcc6df1a91bd07b74a27735ccac49712793ce1fa88f14054";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "746d3576912f8820fac11335efa1289011aed4681d2725d9f0d1c48001e06d01bdf704503bc5632061786e9360a00c85deabf905dd1a9e48c2fc8ecfbe32d6bd";
+      sha512 = "b262aef80e28385c8caad05a381b3e086abf509e402c639215253f006ba773b70ed4592be1f8a0c2f43a82f453a67910f5fc5305f702efa132e4cd2103df3407";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "1fd8b03e844fa4bd010fab41a36769bd3ebe2d09d0b4272d626964e175afb6564b8cc05f7c7c2daf4451edc468276f0d9b69e45d37106895efed75a8284ac288";
+      sha512 = "1dfabf1664ceff2000945e86d4c7cf867f86586e440462275e693194ee25489ef9ae50de95df7b0a2eb76cc1370f1c345c9ea2d7f68155faa2d08fd1694fc729";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d48b30585b56ffa8174008dcd8f6c5f82269ca60990bbf5fb327392b4cb56df086f1a87e8027f6e523c36905bb99d9f136450abac6354b13580ebe6d9d13bef1";
+      sha512 = "e84e9eeda4c98a7729e5a2efda377f4010d7d403400dd5d21b65078ddf15fa9f86c2b64512a195d8072ca9dccbea49e9d3e7b96d8ca391cb3886a204e3e5ea07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "2ce189f455c839ad1bd701b6faed3dc408a74b463b7282ee09ed01f002b1aa105f158aa25e8b6dd8f26c90801af300961ad025ba4bdd9d1d588ba15cb7fff897";
+      sha512 = "3c3088d249a72c565fed6f6998ea558c65fdefa654bdad5bce04e46aafa65381f2972cc4a12b2cad1bacabe9f257e16f91b08f851c8a3387dc4e0ae842528375";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "be2bda3d0b6017b777b078a0c85c51a77b8400132d65276c65721092f9c3602be0b9c136d630665e063cffcc081246118235181e89e41dff4edeb218fc03954c";
+      sha512 = "329ef21051652bc5d0fcdf55f2316f2cee19c16ceb33819e03c8b50622f86487d5bc86d5cc63fe588b2b8fdd333bd11e05a1cc36c555049faaa02dc369fab71f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0895b75497a40fdcc28663d3dae23913873d01ddc5b0c34192634b0704c7d81512a43306ef8ca25190f7b590cba8d753c59afed151a5761ff18ffca45b6623b8";
+      sha512 = "ba4063f13a0f1645303b15dcf25d7592983f42d8568f873d49cca6be7a28d115f483e6fd09e4629510b6960a84fd5c0d999b93138d1a39dfb7783a65eff0f068";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "dad44023860cd62bb141467ba6eee2624a5184c2a26cd42e3564055548bc074db34ca4aa4f6ed27df02ebd560deecf814e640174101043b1a65f2390b73ff0eb";
+      sha512 = "e41ea2b85f7c5fb1e46a7df01e90c7a570b3d026be785fa9cb1550770ae0cb44c80286885d6bd72b20c373ce201692fdea6548a6402cb09ab7ccfcb824702c21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "7e4a048f64646202b34b19731dd0923f41981b2f1384a7fd2fadda603159d724ba02e1a07d9718a8264a3975c9d778b7ea0c9ad89a8a57032b685489c2bb2b56";
+      sha512 = "2dc99f7e36fb4a01ab79b72a7f55e6c98bfa8e1fa8fb0d682dafa33fb9941a0beda6f79faaa3dc0f8e38766982e39a04b96c9fb91075d08d1a1fdf5caf848e51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f52bb0f7241450beb5b4321554d8d974978ee86913af213246275a44fd2470fe8aa02b1e20cae770298da7381285bf263e3cecce7a59b3b5c4fdec59a03b752e";
+      sha512 = "2dd5dccc3fc05dfd48690424e7d88cb85ddd48c17d159d21cad67b17ecf132c487ddcf129ffd77de14c61f8dce9c297827e9fb77316d310db7fa65cbe23752b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "47b8df4d387f1155944b575cd99a5e3dffdfa241f230c9e76cdfffe0c37390713fa0c64b87f42740c87efbe52fde49f36680f549d953a2977f9db2fef0769980";
+      sha512 = "84d2d507bfb684ec308c35a8fa865cde2b36e8098f85c04008e07c7f6709cd30171dc1519048cf2f7dc9e8306135af485175b192921df0fe4b3fba45cb00f7c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "bec6e7592df7cdf1d44b4440a54ce3e7b968dfeccb055952efad14fbc0c40c098cd99b41448fe4d6257cb2f292be0bcc2e3345b851686ce15b5fd1e4be3e1396";
+      sha512 = "7615b6451a0982250661a3ba499659c5fd17231889df67b885b2168060f83699f96473ce44b2e3ab3b6464986038585a899acfd7afa6c3261a4c7c9361b7ebb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "a26868c2dc5b489a6b6c4085d61d4ac194450f0a987751da1d43fcac4f0a77f4f2feb158730f129d630fc2d3ad09ac2dc7c21a98cfcd7ebfde4f7c1006cbc9cf";
+      sha512 = "622a1e87593f63a4908144b784caef9995e6b5d5351748724aef02b1c14ba25ad5541365bbcbc3f6f230655156f9fda86ae81510c4d5c352555bc7be82788695";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "003c7056023bf71f3bdff0da37f8ae66cb8735598ad6ffe71758cab1dc51f9fbd6abbb82f94b2d783d5298354778690e118977b324f96b7ef4b77870226f6e6e";
+      sha512 = "b3983b779a2336c19f3a8ef78228b78ea623c8bc7dac7062ba9fbed73b49eb62a1dbf5283e22be967930dc17f11abf7fed8ad4a9025d158a783349eeba2746d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1ed62850e036d808e121164a5ccdab32f2c8a25b14b06e6a57a869cb35912a9c64ab61a56820db913612317a3bc0ddc93e2d6a8b1e0b43278aca361742f16406";
+      sha512 = "595684c03e6664d9afba2ebea6b621baad182791f5d365e4865450559798ebb620cecadc5d9f93c99bd635431879c21dcd942611589ec1ab7b6ef1a46b92bc19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2cd3d32932c1243bdf58f1ed138b23f9e954a393f43539e9c01fe4348eb67efc1879d803d1e566dda3317b87c1ed9647c542c45b6c31c9c795fe696cbbc22292";
+      sha512 = "c605eb65b20826609b3d3eaa3fd41a4b4d0aa5e9c76a316ce31932e5d627d7e50df7d0284381d108790a82385dddb65a2e4b27d04f2d3ea7e168bb96b1dad5ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "b3e81e97920ca93902e7478ca749f9138b2d8974cb7e7d2496ad29ee82c40cd1d7c2230861d02689ab4ade9525823e52c7c736457cf1c3279dd1ee6ff3876f14";
+      sha512 = "3d57a416e7dcc74ee89d8fb5371b1fb0bc2246999a134ef027c66c70d6a131aa5972c00a7e6a4f215c05712fc616e998b88ee4ac5e7bef1837aef31b4430477a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "39779c6af211b751095ffc93c8ddf6402d545ae139ee6f5a492ed8c3b765cdf9ee626045cf189dc908f4599bb3054cbc26e70e24fd66fdc7d44b3e8631f93e7a";
+      sha512 = "f4eb7e97109f1f4a9b2670cd60e00a6cb02cb6b7717d5051738a1f197f083c480385642a3134ab382df86a216613586ed2268cd9a1e6554d7986c638486f2f1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "049c3602b06b9fc825e91ab51a7a8e1e8119e88cad178fbe137cbdbc0ca6bace8a3192970172e757bd10e608a030b5f5dda78564fb2269f2468661d95dc8daa1";
+      sha512 = "824345025c9980fd43d750c890ba16c2fcff2a6ce0ba124c35debb69183b92040ef4fc862f6b7bfe282fc20087e0de960093eaf6a95d5e56b8a4ae9ec4710948";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "7c4bbdc7edf0d7ab81f3ba959e7ccf9d9df5e6f2f5068e23bd4dd9326aef3124bc95c2f70374853a2ea3816a6d94d6c30db44d81e2647ae5bab8a84bd24e9474";
+      sha512 = "87a55eed53878401f0a11c73fe8afb3d45ec4a2ad1779e230b6b43908ad8c0915e3ef0f923bab911c530e0b110fcfe18893480b8e85457d037ca2f9b7e838e50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "67aff8c6cd90d9da7a3ccc84e17f064e57167c7fb253f919a1a64403e6f8e67c6ca1a578a9266f9ecb5b70c6cee22f413df935dd34d2ec349f364a69d843d9b2";
+      sha512 = "7ffc03f7ce3c44b185bb0b443c3c7b8610fc7f155e71b829553dd4cb0ed52c59bffc0bc0e7bfaf03ed7f4387e9a4dca5c0560d993958fb52e91d1cfa62775386";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "7c2248656469859d2dbf880c94b4bafc62e62a8c84cee589b5837300074ac6cdf95798f4b9d810178abcdb1005d47df6681ed3a414b0b3ba0a3ce90c9ddc53fe";
+      sha512 = "a46338a641a8b31a8d12fee7afb67161b467f3572059d5d44ccc2b8fcef44f66e7bffd5c3c113bca100e9f72a101f50611cf5eaccb6637eb90d56ef005671de7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "f2e22d21d78cc09fe834b2e3ecfe33a648340ccf26c76bda307a1842e87d9fbee91fa86a6dab763a477602559fd777078e507445542099885b9aa9859fe56d8d";
+      sha512 = "b7b9560ebf460368d76fba33b0685ced7ee3cc2b9ce7035eef413a2a22c71e401bd64ad5dad3fce92d3141305244583bcc4c64a397491ec4b2b18c69ded60d2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "e8d45d60913daba14bfd527a6e59fe3b2c028c47425f89928a4933443e3ec608ae744db50326814cbe716a35e632cbaef8573ec523d41fa63cc1133d12227b96";
+      sha512 = "7ad200ce8927dea44d2dc998d3f80147d4b580cfea2f1492ed6176cbc6c7ef8b1704bf3ad631298c119dc1207d92b44d2cc9213db7c03e8c01486e0fc506c0c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c2a32a8dda48dd2e4e01ee23231788188050550c44812460084eb7dd09d042e3af0ae11aa6bacb671046be1effab018fa0a4d601e583910c4d8c5e269963e763";
+      sha512 = "3f6c83edbce8551907ed669c21d0d72e8279da81c28609e18f2be5b0bd44fed7b08315da8cabb5056238e921143b2a4980098ce82ae877f4bd50168c56bbb80b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "45e996b79bbc96515b8d2e767a92f25d5814fd035185e34ab1b32d1f319b908663f6334a1d95a0f34550b9416d283d152feecb47f4ee50b40560cde226dbeb3f";
+      sha512 = "bc99e02df22497b3623e47dd1f05f2c08b9517fe9c171cfec899f9b682c4bdb8ff900a8cbf31891c8db74ac7acc7204fdf54f8e8b5cc6acd17440b168b08cf00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "ced9591c578ea8b335b01bf3aee458ae9254e1c744f699789fa54eeea2d8918dba4431ac65369f86e114f2be597395bb34e466fdf5fd291b688a00d99745a41c";
+      sha512 = "92a7f2aa34065a7a5daa82f8663f9eca5878723ce8f6a169cc34373af8c1a04e50902d55cbe8bd23da07176118f869938986f1547b429318aeec96acaa2dfe36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "b560c780dbd0776f4833b037f81028ec349681682b6e575229e7149331026356411bc13ee743c0037fd38c15bf86da39756528c432cbdb036487e91ba9eb714a";
+      sha512 = "cd1f367793a67fc8dd5b9df8a73de85553e3d02007cd1aa5a90d156d82cd6612d7e6dac2cba3567e1892dfce7b2e507b77fe8a0d191167671068f6786624675c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "f967733b7fc05009d65387e7bb185f64ad33e8adb659475f4f995f4df686ca47145ee841390834c162c604b27185ecaa225c9ccbb011dfd007355f495403d892";
+      sha512 = "a5ecab1f3c46264c76e0b631118c02705adaf3a1bccb92c6c863c971b602b80922015f0c1fd5c0448cc44f73152719fd94098b3c964d6aaf7da5e0d30cebc2ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "06f27ac999ade5ccbe214052590aead3c7fb07e93348b10632c044c0efa4bffc1524e72c2e96c4d2ab1adcc112900f15f36f1cfd943b52718be6c78ee718c1a3";
+      sha512 = "e94b95807610ab67e47e544f76fb6d411d864c33ce07fce4ee29bee101dc68f402855ac983094472b039e2c711745138991ee97f2ea00ae0f9e3fd59d19b0260";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "13a99f40d7062438671c1f1700be98b88b2a612aa88ff546e9c20031e5e3c8d2ed78b801468c63312d82cf91bcafefe48995c57bb2a90c113282b843e0c5c93c";
+      sha512 = "c3203b20feffca9181b7b0b5b22e1fcd31f8fefc4d4fb1a5029ec609fd2545f702cb91bc002d5cd4df46dd353bed75afab40cef3cedd37c79e002b161a3c767e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "15427ab80ea609ef48113ae08ffc3e7f43fa375c84d6028b361a38a128a14ace80a974058d1b748f31c308ecdbf08ca9bc3e509db7a1e10ba60421247af26932";
+      sha512 = "b1e833c8612a23757d094e92d17c36b8db2418cfc903a8a3b1542d4ec77f606394adb55a6ad10da9422ab69e784570544bd2135dfca52a519935d391b3928f6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "91a31afcf25deb27bb9ea29c1a859c2b6057f3421ba5cbb971e35b79e76856b5ff76486dc449485fccac13258f004d967886caba10c8531ceaa9b9f867cd0c1d";
+      sha512 = "108f4f6b6cf5beeb6939c8d22c75ae53f68d227c6341475547bf95f3423f26f40aa7c089be2b6d789806b2a9e35eba10046410b45ce032787e12aafb2ef7fdd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "527f8f14114648dee8079a066bf5baf07d977ace0f6e7d514f0a494aacc7cb91fa0456f45e43ae167537af5f038ed72e44b5b985fc3ddc01a7f61871074033cc";
+      sha512 = "9f352b4714ff40e65d70ef8e4488a1679f3c5cbd4a18d14d25e055a955a154eef2092cb0d378d5de9da3e16851f57697e3d30608fcd95072156f225e9e6e8632";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "791e69665bbe33ce84be02caf6f3b304a2012affe6508426cc4daf944c6616e613062265341a3e78b75a88c4a9d70ea5cdfd829d082189564a8905eb6007e86d";
+      sha512 = "401ba2a23fc180cb789abd5af3322bdafd65c4bab4f170d7d8f6fd34efc828809491698f8e1a5c217b93bec2827b7222c126479c1a4a96e3c0a22beaf363f90f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8121500520000276549b13b1179e817a7adccedfefce8727ad3cd45f3257dc404d5a72208b8393fca56ba2d00d3bd19e569ace9b14abc09faf971211c4ce586a";
+      sha512 = "235bdb35de6584a144dc7c6b58f9ea4c526c843f1cf973d68f042e99327a578f07e5470377c0307474eba5c972a9f50b940c4008d8de98689482bb76cbd41203";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "f72b870b007c5b25344f384bebb58a4034895d5d7a3f662a8262660f6d8bd4238bf6bbb9620264895fac6991c7d004375c83d37f5595104eda48c4f2df32924a";
+      sha512 = "50562a3253bbeacd68f6d4474fe448b53d7b1a7f3b2791d955dd7a064dfdf1b1bb53c9736fc90c593e5da4a33939f51748c760d6f1739ee5930ae459ac4e4e83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "912cce6d5407107b0c99f44229746207ac901c4a533f887e41214ff46aa41f3618c7acbfb38368c67846bf6be80b9714ffb4dd27d1251e19e538abeb21861956";
+      sha512 = "496f2629de38138c17eec6c9db1d2bf3aae0adbd7802e1a209f8e5b1b3cb9cb9538bdf6fad74189905882e1c4ab5aa3cc1482860864e3de9a4aafbd2ce66d080";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "fd344d214b13dcf70f32438ddf2d4ccc9edd58112ff4cea199300f2d59ebcd6ca3a556f88c5dde4bba9af27cb570c985136fd2aba47ef6d9b8b2455a09a44c08";
+      sha512 = "e34aaf8fdfdf0708ba1fa5f6205a9cc316b6074d3a439b92909229a94d7d55c5dae14554fc0cff27ea1768716133bc9675a1b34ee08fb2a892dc9dc85bce436a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "efb5d9f802448e7d16534a586225f1882d429822a595789ffb01ce92d047777ff541535fa094547a1b8724c61acd5a49ea31f9bd976c1f1d5f637ed08aee0665";
+      sha512 = "f3e26c456cefc519d222c837a2ea5515cecf803c4b215dd82ba1e9b5aaa97c7115ae22e7d7c29520c3faaea7d996f67028872ed8e7d6aba8e5bd1fb6f8ca493f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "c2c42d915ce9087bfa3748c4aa1e2a5481174a8a69b3c7fb675c6e5c528c3ed13b7d85a3aace049c75a434f47f35105cad724a94f0642291372e0dd82fdd4abc";
+      sha512 = "bdcdc0d42453a290a13bf0d420dc5f324d50e2b3ced7bc480c3faa35a27ed94d1fc455e6d32adad31960baef599cd779feb66fa76db25d7a9b0c49a1bca2af37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "8155b335afc8b377e9a4cc12507e0108e02624850211c46e1d9af13488325c06d14c67c12012d46bcb95d0d5f3642a1ddf93161fb6ab0e87ed8a56a82bcb1aa0";
+      sha512 = "8820e66d82bdaffd1c16d4f3aa9defeac9decb85f89bc03a2a0e9ef7c941ed7f499b1681930ed307220477b94c449a9f18c8688e535c91db3769d01ca90e1d96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "cddf96afa80f6935f018b69bde2368f8d4aab03c2669df1df136419e6f9dd7de7c0662530a696f1ff164837225c41a92ea5224c2aadc21e45db8341544c9d78e";
+      sha512 = "6f845a09bcde455d9a39943e44d4aaf0befa5aec65e1e0e40c170ecf9eab8d52e7b9cfb7b176d31b6cb7e96c7f2ce9675cebcff8cc8915622f8e5adbee23696f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b8ccb59dd3723b71cecbb1a3b47083f718f39f3f2aa69d5819f99d58b8a9d42902df04712e7aeef34401721f693e2a30b68353df2cb7f07c0e462708beca176a";
+      sha512 = "bc4bf3a3410c5625649126fbb008743ef20065cf9a36fa3e00f73418b3ca1728e03cfd25c1c97e381eb644bc213313f06903edf3d5dfd91230f9970850c4c6c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "7b2b6da809040f1d0a7b89134a8a9923ff0e43872e5c49a22866db5344e0021722ad38488f11df51ac19910509f854ed7e316f88cb6b03714668e7c580438271";
+      sha512 = "52b54fec39905d9be5ca88997d0e4872a88ee2a787a5bfb77f7f78010b8b2363f5bfeaf8c2015b2a2dbd388d8e27d968bc7f6a67ab5bcfa245ccb9e894f2e432";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "c4c90865c7703935675619831db10a1935cdd995a0dde10db022890fd31b02c20387157d080c7724bd1e67d639c434db9a5a53291fe0a3c97b07083b909b8714";
+      sha512 = "02631cb9137a681a45fc7b74c8c19237ad52ac9c5e392923027842a877d1700decc7e5f17a74958958c114036a2add93ffb610a3c9ac8ce3ab08af1b07cde11e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "30d3720e3ed73c312e3d0cabe41bc95df6769a1b61bb9eefe8da358bff5fb2906ad7199f989242a2a8ad84cbc30b3ea8b4dcc8cea125142f1588f50ceb9551ca";
+      sha512 = "5308c46510ac95ccc3faa0c631f6976b747089392974572390870806b6688cdbaf13e5ad010ffaa680cb7055e4c2d482a288afa7d991d9c52821859b21b70e19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "4fc63a75904ddad55379c7f6c7d6fef3f882e706c4a6d0cf27e990de5ff0fcb5b852fef3777f524e633040137736cfb1548f87f517e52419089c380801183126";
+      sha512 = "6bb52b82a721369ec69172f3529210b46f211bfca71a0cfc7c4db2ab9c15d6ac69f475e420d66ed15691e2c54b1766a1e7d8a277d0cd1b9318d796bd67228def";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "52f0251533b86b39f8ac166de96995e94ed1797effbd74cc487cf8fd42191fb98d04ec099ff850f053b9cd4e4c5188cb64673fb116db1bf18f43dcdfc102f102";
+      sha512 = "c820a0e1792dbb0bd52e9a5514ea0564fec70b685ba23618670f6b6e99de92f50c42b91b772649a67e84ca5f099db92b1434a400e347ce56b1954733ce976770";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "6356befb14fb2a1d244df872912fe339ea0b2dc5148236a71a30b3f4120910fef56abae24e35eb871264db93abf1ea045342881f29e8098902935f7751351754";
+      sha512 = "3d8a71e12f995aebb8b74d99ed7b9704143b6320de3d44c19e94a6e56431b62648ea80a295214d0ba268c7249edb826bbf07c2a0f260c47a0f45a65a97fcdfc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "5522edbd771cf7233e8c805d45610acdc9832a4d76a4c5951f8dc5565810ab8805810e2543a66ca36f454e068411e573f73de3fe21e34e6b32a3349de869c9cf";
+      sha512 = "c5086f8606f0e94385d0edd5aef16ce559e8616cca629df3d67c45400bffd5e3ddbf7546b08dc5924f4e44afc5d16ce6b289bcc4a67007d9ad6356253ff49add";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "34a18384fafcd017594b94e8970da2d3521c8d90f3afaab0431a9a0d275630dd64adb892a8609a518217f097a3749ad65db646428cf28bcff5c9d6a03bdbd2a4";
+      sha512 = "744960232bf5d07ef8677f82fcae4454a69712010d6a6c62be3073c8e5826f8e43cea3c2e0d544db8e1e40bad83c42db7914412e37f516d8ac35fe46220a182d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b518c72b63ebea3d30575548e8ce6f15961d0891918d8e83996bee2fb9dcfd01fff9be4340b67733b356f2b77c0308727b2911317832099561b3e2ad050296dd";
+      sha512 = "975d0b008d16d46d48c97810b6fb9afc5a2ef42ed7f324ca285adb8d5535d8d9d73a32f1c2919a5435a14bbf95d89abb5ef1b3eba88a2af05f9aaee538488cdb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b1beef1b4049c8b1c828ab1e201161edec47e3e83da40173be576a17d8f269edbc538882f7d5049401cbfeba409c5e668c1781e2a519b88038480993222f01c0";
+      sha512 = "2890ac9b3271fc10943d96b15bf7fc880217e2317d6e915e41a687688f2afa7821649b6b4cc8ecaf7945d5058e576d127d10663278fa23a78f002ccb3fc75044";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e2c4f71b6a8bf6d33dc76217de9215d21f5f1d1712fa981ec8ca8c203895c7ba94190b7be51f89c9fba03148052727cf76449c6130e33ca2d4965ecb5e4194e1";
+      sha512 = "0295ecb400fa4f60795e731b26174d6d42ec86cadf3b8e546f5180968d6e2f383946de3189070b14de5f51f93560bacd76eeac35cd0c29d6a4a349fc508fbeae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "136d8600eb4635213d58f7ceb0550d821e937275e849e3f1b7dcc7e7aa4b4d8ad497947187f6ff5979ac5bdd2b677c20a2a3eac7029081436f1c6707010055da";
+      sha512 = "b08aa29142418dcf7159a9ae97d1095ce368f244c972022e23369db201c3e68a1b823b29f4e5ebe65aedc28990962d0fbcd2838a9d6c85e46128addb12e6cf54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "8d130eee3db7e528bb6d82870f29fafedf28ef474ddb4a263c41f914997a5e607e048ebe438fd16f687e824ea6917b495563034d4459e1e53c08e613948906c4";
+      sha512 = "f3778bc9dc46c1b4d02e148d64b450f26c388ed3ef6b3d757353ff8f9a97d99611ac6162267053fcbe0eb83df32435229f7b25110f079ab193d6f3faa5d35924";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "bb484ab3c756bf1c5e591405fa22232f5e0b32cbaf0c0192edd3ff75e80a9f7773edc506c601f8b11593811c14636abff7a50a1cbc0944b664158543b8171052";
+      sha512 = "f87a23b6ff9ddbc7a45c60ac5d04e1bcefa39f743cb74cf9c701c320ecdfffe67c99a377d2419a97386167e19164bdd0bf6c2d2b5a057e4108cf9570390e4e98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "618668015e76163856467b2603000fed75505bd9e76d1557dd290b7a92da467280ab9ad30fde78f004ab60f883f783faac6293196ed9fd409f9b854e0ddee577";
+      sha512 = "81d792ec070194f4d51702711957a71bc01d69e7737e7e07132ee3047907f7abcfab300d0ab95ad4d50821e95a45d6b3762b51c16e8268132be742caaaeb5a8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "1445d4f5750b9100c5340c354c9b6c67dd2be5b73500c70def5c1522d0825ff808da868b39a60ec509684e77bcabbdf0816666f14b2dab7d5f48c4b6282ec1c9";
+      sha512 = "318998c6585db455b82fd278efe24f707abfccc69ff1ae12ab5ca6bfaf915db8ebb16f845eae7832d88aab6af8ca1c2b35bff504019ea265b938d5e7d09088c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "388da3ca86d5c9ba4adbd3ec90834941e2148c57138e6973628caaaa32d44ac8d18f8f2fc584dc43f0302c4c3568d2b6cadb94db40ab0ff24020e4fc3cb4cc7e";
+      sha512 = "ac63840ba086bec205d7c730d9d9503a0f72976c875544d09457e4fe37f802e56aa7075ac0ebec72ec9dcdc5ce67c99b83bb2779eb6c2bfa981f2e17895f801a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "62423703ead40cc91179eccd15f9b4ffef8072ce4f236d3a1685ce666426f8a0bc670da82f360dc8c2dfef4b927ccd408a4466b7382999604abaea11626f9149";
+      sha512 = "01807e206f1dfa499b2e578dbcc6987bef6d0dcf02e362e13ed845ad7d513e42f54e3f5113164ecf75376735ba4d45496624a283cbb0fb0a69e2bf80943b4dd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "162d7d4ac4baed3c16b119ddc5f3b0d71dcbe7e26a3977ea375776a033a9995be45a2069bd50e8bc378168731c983f36bb8b6b7f5551a1e10bcc1b9b3d471b2e";
+      sha512 = "85cf988e4038f28cee3fb95d62112de2883240bd493e7c03e4a8998baacf428ce529bd236a6fa9f90d764cab1c7e4d975c5d88a876e08474497151a4a71987f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "3fa114a52582387ba51b04729c1c4895b29c33dc743cb9e4593750389cd9d943f96cd127fd2b49448fed527bb1bb36ddf4579ef78502f66925627277f02e46df";
+      sha512 = "16094487fe1b1a49e500fd56f5b175510a07b7a44cb916d3840c3ac42580242e1b121738eb23f94c1dd8c7875ddf1821e8ce8bb2bd2d9ed799391707c168c82b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "62d16ba8dbb06fa54e1f4d6a383959740a466bfcceddeddb19dec45ace022ed272913d4096b43050bfef3a53c43329499794d5abfa9a6e911fd35a0f8df31cf7";
+      sha512 = "570f96ef84b4b12ee4c2d3eeab0bf57720954943696559850cd6e3c1eba0fbaf42085e3c6c60e74430208131c0f6e86735262c4c69c3f0490b191a75b8f91fd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "02fbb3eb9f13a8f340f5fc5c340de563041bfbcd77bc1f7f701b5b5eab6463bce6f3110e962e4c1a0667f3dbadc234511c3ad35718e3d84ea30952a178f56e7f";
+      sha512 = "cc883efbbea7e187881974dbbf27243d5fbb1810f8c605baf3628b32a308c15ba66598617fea40cf22a89990f5690fc7c8ee4f4256019794301ddf49982a45f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "10f64025be270572da5d3e35672b2656f902e896bb3cc7fe24e99b514c4647727308609c9e572f89f836fda677ef00b6a3be4ea4844d966437d53124605144b3";
+      sha512 = "1bfd3ad527b5d668a9296163890f2d7074b236eaea3661e17b39e086fa0a2fff96e8d6aca4b29ef9fbbb2c1d8ce8f7d38438dbd6c7689c1012ce86b9daca58eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "8f3db73e145bb4ddc0606bc8adbd228dec27b20c6bb5227897ece926df2759209966c61a2b67d4e6618fc205616c187dfd9e26e63e09ca761b2c9da3d53c113a";
+      sha512 = "b540ee3505c4b031ed348ff99135eb61214e99ae543de821d84b9f59078efb87b34536308ebd5aa00b1bd12dc311ff769580373b13f7814dd3661f821973e264";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f497c48ed108134f02d977eb7f0f9577eddaebacf3f1d177f95b1e481872b94ce9f6f7c5914d6fc1c0464fe999670dbd3a2935ff76d139b49d529b87adbce5eb";
+      sha512 = "bb8cfdbc08a20a719a14cadaebc50e8702dbab3007e43e6e2d3a951e9a6ad5af00f14f79be133411002852980b2efa37c8dd48af0e827f0c7cee98556f6f6f59";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "5a827468b04dcc308384e95017980d87249082e894998c77662b4d455bad5e8f91134e9c88ef159f89af974029302249a898ec932e01b4bd4d62c0b79b31718f";
+      sha512 = "6fa1f94847bf81ed7b3f676475ba4e6e7205d03980e4a7f031a16310e2525f15e09da85c63902ff2a5c249152dfef0f6502bb10e9ecd934359d9490f39564a0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f1bae26c1699036a832a021f0336ecfb8b61a378cf62ed6c8cf10c3a65e6546703474924b5f7145f30c2e9a458545ab6bcb999320a04bbbb65022731a23881b6";
+      sha512 = "3b3f751ec9893220e0cd264d9cb7f555d446d12f5e4efbd31501c38e39d3f3dd2ba14cb55ff5b99171588ea6474e7b6f0dbff1d927e3f19bd5a31bcf828b09bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "3df882e3542af5a1a82e344cde5f55f852f863ec652eb66f49e6f6145cf2eab3ea3b7f5a2170e4ad87a5dea0264f5002eb8d74e4e6e1662e3aece695ec6e405a";
+      sha512 = "a3668d643f18332b87aac8f718fcf783d3df063d0eda0a94c523157c7cfcd7da7af676d5e7d6253dec2dd657e4865f60cf441e4bc31684cfbb66f9ef497d12f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "235ad09d75274a5299226a99911596b16b6b3facc19a896865dfda2467d2352446187a1ae6b64259ad41089203313b76d8486c869aced85bf8aeab692b860879";
+      sha512 = "9d9b9327f687b596b368e3ac311d5e2cf17f6e171f2dded66cd09c19661c82a8475843675279359e1af73603dddbcc42c270512fb1b37fb54538b76e54df99b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "b038b36b0cc8d0be3bb02b6851e9246bb849ba835cdc160c48c53df9ea5e937e0ed57c1d5e6200b11cf7c751b2f0e5cb69543d2e781852a9ae7e612a88a78b5e";
+      sha512 = "dc3ac85569698ea73e2f146d6945f1e1a863a55150d46e9064b87951ed3eeb8caaa40c7b89fe11644acdb06f610e6200dff3a3a6cd48838962f8908d08d56e34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "12184beb0c93718200e11f17ec53f71062c443881482a2406d558f4c76652e81b2c3c3b9b5750a03a06fc1460a31f0146062e94e6a13736d7654649726c2914a";
+      sha512 = "cd51c26629502707f277b111388794ade3c12af64fdfeb009daa01d676b64940c6155e9f8002b037106da3913125697ef7305cbbbfffdc9ba6701e6f476df058";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "0237960a4cfe37ac6c88b9df34396c19287c9d8fab62ab6668fd5aac1e2277d9c1a8e468379cd8929a5ccdb5e86828ccc0fc4a33e306203989764745256564eb";
+      sha512 = "10d6ce4f1f16d3a1373883911b29da8b01cf746b661f4d99a1601b3ea1e1ab77eb6429393e244c61af52f63e9d4b890f6a8df7deaaa1f2560795c16ca877b952";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "01acb4ca4726ae3ac8daa21aa0acf33fee71777f5dfdf496608afd8bd33dabb3c84bda1fd9c13230bb7b8c956db2409821f89d4122d9fbb29d8678cd8f9607d5";
+      sha512 = "b89d94cf18fc50a6ec3798b95ce4afa46d15ea42871955cc1b46f3e330c06552f9ed8e53d02d55c17c25f62186e6a3c1a6c45de1bc21f9bd7050bfdd4f965c78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "b2384c56a236420ba479a8a3e24ffed3b4596e8af8e46b868e718412a05317faa6bc7e0c39410931b31cf464f24300aed3e23c66a7cc3871ed88dbdc31c07aa6";
+      sha512 = "7a34523c801b5332c26aea08263248e5f471130300320c2768f06df9ae5e3bd90a7c547e73dffb789c763b2ab7b94c2763534c9ee408a67680d63052db280b4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "d6b9e43c73bc9c38e93211abaab22e4f04bb68f31eb8351fdaab6c45bd7b70fa56bdcf3bb87901a569ea9917b59d7054bfeff1776373099268689238136dbadf";
+      sha512 = "a556466c16091dd2107e97bc52b1fea9875e15e5136762a57b71078d6189bf9dd57fcf1965c921df73dddd2edbd435e678f519a424ace1d0daebd665c4364f90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "d5e303c5182e218e3e9173483e32160e78c9a1ec812142fcaca35f970a043a08d6ecd8e0a4de1ce06fe58569be456d2e44ec5a3ef234d5ebe4fb9c8521d4748c";
+      sha512 = "558c865772fb9eff258eadce29d2f03d97c3bf98b28d6c9210567b08c99f3532c1d2be534c5a6def292c060219e3d777d052d4e9db9927a1f85e41ed59f843d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "2b32e8f2257a4fa7576bafa69ac00b149d30e1114a0a174848deaf4cadbbd6b7073029515ae1b1e5a905bbd2dc53346507e8fb8dbceb625901bb9dc44da3ea85";
+      sha512 = "cea6b3546c6e94cc3667845a2c93de22068c4abd9fd79f73889acfa8b7d3f5e0af3783c252a07cd5c7e6c0a064c2e7932c4e2736b5f040266140e19ad6697ca3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "53a081d779acd8d10e9591c929c5bcdf6122d5a9f53a9b496556d4a4a7efcfad783ace2a99af5cc11ac295b16e1a055658b1b2cabb8385da2a99494f41280b91";
+      sha512 = "f3a72c805cef49afc1a9e59652698d295abfd70ee2e91ece11c2d68d58329c1bfc490f03470d277d4398b4b907588399d3733e3e907b751d636873b0465d6ca4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "473130d04c3e559159c9801d55961fe261b8f45c593e7b869c31eea4c96f4cfc517a35c2f505c8a45bbc62405bc04d9b1d941614f6d9b3dff6eb8a05d50ed934";
+      sha512 = "10b03735d8f98180bbe9741cb26bf7f349b7a4afe65fc8bc0cee0bf61966ddf7be48b233092f90dc829a6cfa753c3e35cc07ed35fdd09965ade816b5f3e9aa20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "4f0661375fd0bdf67356c9b742095878e2288324b23da18c0f9c105c6c0f7d0bd8d4920423f4415ba9b164417936ed8def36fa945538599ca6544abafdade820";
+      sha512 = "4cfb064e57a3e90a4719cfc38520de2365bde3d9c0df17a34affa7bec1c19e7fbec0e3f7fd233331024706ab474110ebe9059d4ed6b6f1575491579f47c4b2f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "cd861dcc4e17ea389a42deb66feada2e614e91eaa8f2911de2c7e7fd66257759f937fcd96b2eb976ca7c605d7ad37cc3648bf67ec944fd93407ab9918553a6bc";
+      sha512 = "b6211e70b039f56f4b65339487fdde03c132211c0b362c6df2d7440c15856a946944e0a583b624b7e928c39a63706dd495a06a1ae088d2ca484ce79e5fe9c795";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "f1c0a5ecd076df26dc635bf0e6f6f43e4c00135f914b9393462efc6d969dd6ccb662df1c8745478952896950dbd216cb4dc88e0a1fdf4608a926702eefb4d835";
+      sha512 = "5973e89146d547f8cb02b613d54f88d77e7f00979f8f6c64db276313e101867f6c27a0e7d5bb7e894a6dfa8e185c467dec530d4e7baf9aab839ff34a811ea84a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2856270b337da7de6be743e3ec3bd2badafc14920a46d11e2b260daede010588c9634c2badb7b402b0247fb770f8b0c869119a1be8719487689ff48783c35753";
+      sha512 = "d9a3fd7752a0a1431a46ae385cbdd331cd86e758e28b994604135e67bd562baf5b9edc1735fe1d0681853e18a235cb29c1be52b4b951954c5d6045457b909b31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "95d8a14c884976c31be1230cc1f08706b8f1032d6727b0a88eddc8d9a2b1941da783d9113dba9963f5a3615d515a7906906779f8dd0d445220ee6aa633c2f6c7";
+      sha512 = "b6d6d4f6c950ea05680d6f9c5c247ae11c35cd3b1cb2a0429410f2e8ee05a7c2782ec7f220215f8dd7a5a2566c4bad05e6bb6c913a01788f707d8e37f9b9c408";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "c8f5706cb28419c2ed311b37dd4391898e5ea55cc70c3da9018eeb104be696d80e9eb6e22467601e44b3b11d48695479a9448b97b06a37b63d042f22056255f1";
+      sha512 = "472f6f670643baf59807eea9fcb171c61a305caa917c25626277d1e7a723e667f1ca5c1cb07b3b0b9cc3f8b50ad4d67456ec1c3214cbe813f43be5be74d90eca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "db68dedeed06365f5378c91241ba21474fa490234ee2f0e8ce8d5439879bc7e79a6b8a81ba4883c5b6f9eeaa86c8fafb4079681eda5c7c1de13bdb7a6587967e";
+      sha512 = "44743e46e04f5f175af5a6404c6f2702818167948dd841ffd2f9eac88622336af6943a03cd1e615c58c6090bd8dff8a08b967d7f6dbf781f91d551bd8b687c88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "d450c55f00b33546a37cc96b2daad0ff9d9bd74a4c8219fe2e584e683a813e328059851bad48f597c60c0e5afbd15ff5f2547249e9318ed1a4198f8db43ef653";
+      sha512 = "5da4efca4c9c8c45328afc78b24e6616ccad539127f94b8fc3525aba832c29d6bf3a54c9a964562d804a9095314ffa7e2daf67d55a0128304607e98a75088adc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "3da1c044fd4abad499d44fb4e30942f6e92f0bf5b0bc98badf4cd7a4b63a62bf7a6752483964112bbc9fad91ec87ed40cc64fa5cf9c14edebcce22d78600e352";
+      sha512 = "d78e51e71b8f309171f1b78fa5c2ff9058b92051c0651953d875d38611d7180bbcde18a71d54a257ebfa24df43f86b526c92f73517dbe43de8ec173c33730353";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "69090fa168e4acfd16bbf9c0569b2d537570cb798b8d2bc5da26911c1030063ba0f1366b6453810c31038edac5fd6fbd988efec27e923d08ac61a2e2f654be4b";
+      sha512 = "0bbd82629f59d71407477608475d0773851615346ca7da6e338563eb70c18e7e54795c22ebf4d9cd965ed956ccead2950082a0e9780b13edc6478df985abcad7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "86bdce82f04c68e32e581d32ea1dda301e68f39a93d762d4e40a85def20490d54cb62ac4baaa4770236b098bcada9d9767f5a6bde263968919eeb2063e5a6fa5";
+      sha512 = "1799cda7b7f040a0471681891769c16c8b17e6ebcc6e037da0a45757f1863ed5a5def8d07d6fd4d172e32ca2de6cb45481bb1ccb8f8c2caa8d3b712ad4374466";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e3089af377c2f5faf97934e40e6abd782b4b518abf1bd6dbc9655dac192523051f11b1e7a016465c76005d42cf5382c21ee02ee65b80cffb00384e0b9f0889e6";
+      sha512 = "7da281d3e710897d7af9fe2b384e73b27e76af5ce5224a12cbed81400380e506e5fb17a0d91094295c6435acae942aa423cceb58ed97bb52835ac375af80410c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "fa001a1a31036a26dfb3914a24cb882ca3d5065f0687e0bbb4e33814dfa16f5f8f5d9cc44d24e664be7e87a7ef9fe21d2111859150bedc6f30d59e3badf9ad43";
+      sha512 = "4eda3e69ca5ab51d332aac0639de33994ba0b42fc244d191a7b1c6990edfeb453151de7c1e746feba1ac6d7edbd8c653cb29db76353175d687c0ef46c177013a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "629a28f9a05c758e1d748206cbd81db22fea7f847b16e42674717ec8ea33c035649d82a9418a691aa31507368fa2ab91590cae207439031703c1a8c8382d6a7d";
+      sha512 = "eb7615f59583a95ba013e517d42d80c5cf33362b2bbc6ec6250d17a0eaab574d72bda6970f38177791a93088eb5f8d1cd088e46faf373e323d9dd4772b12e8e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "5f5065f0bc2a515daf388f70d503743fdd2d55006b4bce58c9c85fdb06644c729eeff3a2ecea9b2a29be1a0f94147838287d9c7624e44df60014a1a99990a050";
+      sha512 = "be72ad38323c545fa7ddba6d105dc39eec6d3fa82fbbe1c4026c0087a555b77aff2802fd4f6c51a01efee78be7652527b759373d920f2c403e9f9db784a66369";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "0fcdcd5a965a8cbfdb1d0fab0419588b63b26216f65ca206052c0e36257d6b6d29a4c2639a0f8fe456ff8458e60766670a022c84f18426a60c3f230282206d55";
+      sha512 = "200631e7d275728c98f02da92c82de33f4e6d13e3b0fd2537c6395d3f8fe84aaa568ea3b8f2e63fefdd64e830e0df9ed10ac3631581c05cbb790f745ff9c4fd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "a86b3ed1e28aab56223b1a8ed7d184fb526b75fa27178eedf676909aae0931cbca7948870d50966b08ff7ff3c79efd037ffed31a74f89f25d302c2fbcf8d4952";
+      sha512 = "0a85c88096d4b470b76c9162a5e6ee9e4f8f6d75cac8515b7b76c3ba4f8cf571713d451aa54f5608ae38bbb910c4bc13c7dd870060f82834b0fd1bbb64dfdbe1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "8e844efc0fbaec678092e97594aa4afc57b40ed6f8b38685a680aebfa4344ea6813a2bf2a93452e9b24683713493c5dcfb8414ecd51f9e2c334b1a5aab7b447a";
+      sha512 = "6eef06306bf53d92f33de53f65bd2c06eba4e2bf86b112bc7d9e90555721cee051d071047317d0e1b9b661aca22c71ebd553386bdce70c8a1a8ea35c14710095";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a74566955c633d173c9da3c0300e8e8e327fc6fbc063bca00b934a2ef8dc4fb75e993e9ef263f2aa4709ba90c33593e990cf2fdb0d6a9fb944145c31e7cbc667";
+      sha512 = "3f3d4605a043dd32d416d55c2a6572a82f311af38feac305392cc0fb5ebb99c1c8a8513baa3927b008f178e2655c3431df284549fd6674186fb28f4eabe417e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e7cb5bc617eeba0977a749d5cd16f0787d588e73e20effc0a755bbc85ad9d3d422fbf0114a290a959202b0238848f7f525de8f58fda0035755acaf405fe5fca2";
+      sha512 = "aebe22d22150ae7e539f9761b1b9470b840e8b475510aa71b2256edb0a8de6e041622d0920b64ec4ebad0f71ed16e11cfaa8496b22bfc212e93a4f7727fe0bb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "f97c705c1973122181052599a81f44710d0a1a9a7369384993b2636653fbeba2fa77a30e2f13e6dd359c6aab28d55a3a0551180b4934bee35ca79201b90d4f23";
+      sha512 = "a31ba99c189d2cc6dc432f5cf707390976e0f8b901bf0adc039eed276011d825bca22d2c9799b87b729baddb086f55bc2a9579929e1f97c6a5aea7917f07e01e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "c4a743e2ef548d26e0aca8392323c63d3a55861e5e9dd35f1b1c7fc4ff8b44aa54c5fb9261ea98b0a7ff4ca21edd3ff46e3b8791fda9927cacb9e75440092047";
+      sha512 = "e8b349efc6a322dcaa9c896d865df76f940eabb7c9157a9ef198159f7c92cee593a46e77c36a6a85d33ad44aa36a0f6fe094e2722883a84bb17d61201b6f67c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9ee0dfddf90dd63dc1069f83ae2d70fa4ceede0ef535369aeebd2629f35b3c54bcdc05ad337910d5e860c39ddbdbd82d3d6c3ac979ee835b16cbb99705594328";
+      sha512 = "e388c59cc421f2cc409642db6776a6cb05177f16c0878c7c07399fa311939fb2b09b5c9a50b57f7425c18f375b25c93ecbf6be0b44c4a534482574019c6e3d0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "6ecf4202844494e297bc6232d05e9da34dd11ac2a3a19d7014ea54ad27a2accedda42c31fad1144b22f9cc839109deb90bda9592b4081a5ca731f2a5aa5c0237";
+      sha512 = "b9bcdca2b82d285c1c51054666744b9710fa492d460fe0e56707c5a92fdda013efced781ffe8774df588c8c4d1898a58915171d4317f37586dfa341bc27919dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "e772139fc6618a7fad213c710582fc9bbc3d63ef364e83f92ff72e66d361e25ab2af750df7b8f53052ee9be8d5ce10cf9883c64f331a219dc3c4f4a633c53ca9";
+      sha512 = "9848b1a71e45d9b741a239cc12c52d22df1d663f784a3491174df75a479bc7eb610e913e49684658256464dd9e5cbf1a54be07fb821d4de1727614ce30f934ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "169abcdcb9e67b1a1cdb97398a688f0f432c525480e1cb47f7bb85f0bd9cb5fd2c58d8511e1e5fb44e93ffda3917abb34b5babd9ba4cb3fba76cd962eb6da9c3";
+      sha512 = "4e28013a4966da67d01cffdeb80da6cf530ebb093dec6de519914a42d3d1fe46a3543ae6e491ec0ac1e67f1d705756983693b07333436983e446a347f17a39cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "94ceddceb154f0fa0f70b7febf3a8741d7fbf85c2345220f9f3afc26622118ea23d4085aaaad6c1be92a01ef5e8c507d4035b70dda0363ea1e362666d3aaccbc";
+      sha512 = "3e54a685ab48b14b7e98a140027786973dc855bdf70466fdfdc9fff646c3c7331a7d3f569dc94ff268e8a4c42429c0991d227734b0c6497f8778d908eaa8b1f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "4c59ab3169489e9411ad97b23116232ea9dc63337bb0ab31b36d5051f39c96fcce3c5e5e23e7ad65cceb93f21d2a194f46a2884e639104fba6bd0e2b89e74592";
+      sha512 = "0d6f4df0197b5a03353b33c1d2201e43092f667340b0103fd9e312440425dd0c482a1ab1efa0be194b93d9c5002b6b2e96fbd4ab5a13fc7d967c90cf7c8fa976";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "31c31241d1b93fc5b4e8a543b248b92e457e4c454c0a9f2c4a36080560600c331ac68baf2c56b0284547bd32082af6a7bcb5e217f2b0e82a696411a8a340b308";
+      sha512 = "3e50a9e33836069e4ab5e368ebedaf7663ff26efc7a34e3602c3a099402cf5172a984669f579c2e24f65ca61a766cc0eaafc2d78713777cd8796bc77187d7ff0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3358555e67ee43160065b0b0a74ac76b0108eef9e5545a00d891c376e1f75520a982534944fe4e0991da4af076aae3f389527b272309e3bc507692b2b01eb1a4";
+      sha512 = "d37ab2e22d959def3a320b400cc31359a62b285c21d634fc52737109b158ae197a008dfa63336f9c94362279a7f3c8ed7440ccd457fc3eb30ec39cef5065c6fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5a84e72b7e84774e56f13a7edfc32ee7718171616ebdb2d1f031965631b79e08e5a5a392bbcb7a13fea22b8aa87a51a3d21d0ba8c471e507d5cc4171de9508cb";
+      sha512 = "3a789af772dfef54904c429e885c941427493e23fbe563acaeff3314113b0ed0d7d01b72e56db42eecb3a759690ea1b99e5a2830ea8a119432fb5cb80fed3796";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ff1221835cbdd6da1697a9f915ead88e8b1f0afe2dc33e001079143424ae8d12dc048985a918133b26c17ba7422dcaa9db873af1bbcf1f4add68a3e07d86497e";
+      sha512 = "4722689021e31ce9901c7cfe9f6af45ecd7d0d2b3456d152e3ca1b4cc473e6bcb093732f8e365203080db3e45f99f34b58eaf4f3b07157d1a7ef3233b937c7e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "34be87c79fd43f8d1e3da76a7f037f7dca411cbfacd3b7a72420abee9dd2863a85ea38c53d58bdd124d2d3510fcab0328ef1195cc332990b22400b90a6061c05";
+      sha512 = "aabb3ece3bff1c7c8d3341244468ca0f79b8656bc2ac156eb5aea935b2993497ed4f87c5095ddb710eff04a4d08eb8995cfbf8081ae1db86a026842142252d21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "78a0814b6bca4267d11be6a180836ef275c41c9b7e29e821ca3559835a5451b689c0a4a7c771d51726641d04e1fbc83a415eecf0b72b8b7ef1c41e0c92ea6dc3";
+      sha512 = "0bf938ec04eb1595a230a715f863fbbdfd59617b6b652aab52c756b47e12f06380351acbf111e560e0c299522777c8df881c6f73147ea697e9aae6d68371cac8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "1549118be4af02a05465267fe48720dea903e1199c33980dffea6a59bc90d31009c61b4414ea57f03a59e27182b8fa6e8e6c95eeb97a88426d3b6ff67bdea590";
+      sha512 = "ba9e855a51afa3c92c1ee0309c4cc5b489d60be06b033b3b6a31de9328ac31e3566f99e5edbbe13ad125e730141890ac937126a73490f1bd6ea412fcf99e2ef4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "f8c1c8b9e97d4c09b70d047c2dc81b9f2b9342014b5e928f11d0705f83915597812d6ea71daf8e315e026f127b18f67161f116bb6139ff135181d25b0bd4ca66";
+      sha512 = "a27588eb0ed61068604c5cf7a816be660718cb59d200718456f3208218c624d9ba83d1b8c53f8cbab9a65ead095dfd4f76e5baa3ea1f5b6d13fa826b27de12ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "afb767b85b674d3c592fb7f6175cceb14f917edd68d2f272b3560450f91dcae5a30c84d9869a08418a727ba6e010364752b52a22f3fe2f0a881ca01cb137306d";
+      sha512 = "4bccf3f6d5a3b7dfa2bca47f31f7d22d7eea537c07cba8ea83088f3c71a6bfeb9c91fa945181b2765ecf4aae2ae8e0d61a7455bfcf9c1fc9c69cd3b0a9b5e8fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "b33fc09c365ea57136dd53cca5a5bc54a8a5675e37716519a419e0e24286863741660af72cbb73809ae2efa0cad9828d523fced2ffe7c25f7b99781bbf74c382";
+      sha512 = "0f9b6b7df59b724706d93745080488c755ee34ce1466edaa18efd09e6b99da9582ae70d271efe4fb46d566d66256877b60b0da593071cfb7778ceb95a797319c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "6a03c39d8736dde23d1d9558b7ba371840a95fd5f74948e63ed4f9b404ed478815950c196bb18788d2b883a68cc4760ce329e8b110e12c355655ca8f52c1ad22";
+      sha512 = "58bea0b6a303e89a22f1f513ca15a3ee372a62871dd4e4def2249f72de9fd9f7724bf559b40b5f8e29f4439666e07b9611180296b51bfaa7558fa89f9c87ad5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "1b9b9907386e7efc27c28f602a4915e8b9863f5ef64748f44ea7418f7b48eec512e19e906353abbb92e4a360d8216ec93675aa890fcb9de469dc4d800b0e5a37";
+      sha512 = "00190deb133a575d93bd362032c6272a8c39d59c3d44663421a3a225e1abfdcad1b1cbf20e7b4ab766b8974c016984bcbdb945abe32841611b274f81d76c5217";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7d97a23fccd265da8403fa842458f4fd36c7316dd8720fb2d2a9a3a6ef1ca47eaa007a72348b8582d891ed2c27200ff40f62cd877dbd72ce213dbb10f64e533f";
+      sha512 = "11d38a85c29a0ef8457481109048539bccc859aa352dfe32608a695c69b5311b5218875519b6ccc341fb06d856294ef6d0c6db79fd96e057377dffe08fc4b2de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f027e228551efdbe2aebdc1244a4495b31fbe3c713adf4c8078d6cd65997e0701a1813f55208b13a9e51e6e80637c9e6d08571f38f1fa8111b42f6d463e819e6";
+      sha512 = "3c0789c98c65857b4cfb2620d2c6bd0400a89d790dbc94e688c11a84166686bf3cb716bbf71d1786a2c38543c0dafc68f8907492d3e843a07285678c31db7bc4";
     }
     ];
 }

From fab46dc9de6114e3dc813bb54029998f887246a4 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 26 Mar 2018 10:11:14 +0800
Subject: [PATCH 073/170] firefox-beta-bin: 60.0b3 -> 60.0b6

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 463b476f8c3..11867ce8703 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b3";
+  version = "60.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "803c819fa3085bc868ab3295ee1a6c7a6f7dba69fd5aaeb54244a561c252ae7fa7b710aaa13b7f8b7810145a737dc6d20e76fa35e85f3dad2535614681980245";
+      sha512 = "818e692ff3c7a142e343a09f8f6594ad933199125b1c9e9b6d0b6fdce5a495b1322bc18eebdcd748c9aa8e46e7c56266728e0c3f40de1613e583c36672db4712";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7cb3ce289e989ab70a472c6cedf97f925034d5762e2256d6a01c992c3913836c8f8f7e202a013ff128b8a1db97d8e683bdefab19e618c0c819e7a31643eb75bf";
+      sha512 = "dd4f43e2040ee5f0d5ffb0fd51a62d8f8175e867607068a3754ab214f05cfb1a167e5aa372ce193deec8571ae76ff0acabcc668ebdbf98c2e3de498065a3152f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "f454d77c05721082b759cb550ab2c0f32d7e788ed5eeae2e3706ffea040d5f181245a2c7e9018a2050139606b460dcdcfca92dc73af99e92deb9021ee6be2839";
+      sha512 = "d5f22c0ccd447595a52ac3472e0c2442f9a399287b115f57b10ef0812fa42a6d2b86eeb415bb1745a3b641218783a477fa7dd3146160e91475e6e8dee57dedc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "d876e0a98aa1a702850b9ab7a3c3b3954e6f376fe7ffa32e6b4e22f5a8d8cc3568b3c70aa636c2af8ef7abf0d05c5d7895b8320ff41fed2c251e0eea06492480";
+      sha512 = "2c73b86bedd50979943ca746105e2a217040cde9161be3e00c94fb34515b8ee28dabcb24bca83fe8a78f8c368e99d813be3d19e9679080d75e1b55eb6c74abde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "e2cc66552357ccae9136b42f93db1c6b521e514ccfebaf65d5b635b6f3a1a62e66113c3b56c50806d77aa8c8cae53240b83f5437b3a28b2bdf735713ead45e1a";
+      sha512 = "d622b8bcdc67fec6e8eda35f650f9ca3a6ea947d4ce17f582440ec5f9ed9bb4da6e32607a5f9883990e6efa8751ebf7cfd577d57e748cd44e06c528f692fb839";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "9334167e1b9f236feb5784bf0be7dda40bf7be9162e57691e605cfd9a9e3e499ce6e5ddd1268574a0e637b5e62a5a74078a8bddd27951ac340c8e38ffbc43f81";
+      sha512 = "b95e2b2337ec40714091b4524e1155b6b5f33da8221f70425f20af9703386c9e7c65cb698f604b9fba2b032a8e38b32f7fd97264986806505f83b8fa569a1c68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "e46010f4d7f76f88569728563000a35ec35fbcf48dd26663f93c774b1c321b5e7f8e0c4bb7c9a75919b01ebe70ca4eb211536714fecadbecc8fa2241c2e6f2ba";
+      sha512 = "ee5a7eac77c46dba07679e35bd5f3de7ec0d7f2a342fe900b7a09476ca164194874205054fc6f5fb114e5831e6412c674b79c5ea8402cf9a16a7400499fa03dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "fea813a468c20b99d1b817d57161e699f4860ab1e114204398483b609872972dff379d7abdf20d383ac8432e2f0cd703de71bf44607f3baec6ce206f070f6527";
+      sha512 = "f051c711fb5e0bec5d7a819aa8a023641888048bbf3189cd9f3c381f0e695df1036743746ba8f9558435413662ea8c0e0d59be26fd6f56f451725b59855f3b6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "38658a9c361b2ebd57bb6da00a30bf7ff1a071e75b481007ae1b9b30b51d78b60b9d459a4b935c964f2625dd83d90e2e392a2fe1b6ed03e3e7139f669b2d07e6";
+      sha512 = "65af640674c8487e947869a7eb361b0b75d7e86bf2047f6d7280e7ce724efa4f842697651ec8b3597246cd199ada40dd237204f9e3357ec658056b9a18a4c1b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "b17cb97ef70a7667a114c2eb8fa4ab88aa2fdaf09055c1e30e6afc245a4d50eb6f2c3f817d176eabb06d297257f468f1326cc4e17c6a1652f501070780c19e2c";
+      sha512 = "9ce702615808d1515106c0efe657aa30ea9675b75450d31972733c5a02c058070fe4bb7110b3ecf87829d93e4e6c7eade8bb1cf49d11e0d36235ca3221dd38eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "924bc64e77ff15665cada5f9431d5a34fa71ea0fc57e9d7a57879f52b549bcfdf336af0f11b00861d8b4e8d60aa4c8f7cf0b01d05a5c1bbb0ca4a89a6dfc6caa";
+      sha512 = "8fa1eddf2875ae3a48574c92df88d9a0cb7f1dcfeea81047b61b1646914343a426f027359ead2b82afd52fb9dcba3d3f5212f47198ee7307912b060ad314e085";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "5c85992f95f5b975e63eff88b3595effc4ff74d04610a86c5b27184c24435cc2f3f22df06d1a7e84893ea2a823bfaf7da9f534fbd61d2e54e193764e0c24a19f";
+      sha512 = "8764ea6734d8eebb8229308d8d75b11e603e8e04fe26790bfaa58847f71e8bef9691544931c8019a5cd603dfa04997b20767be81897a18bd1fc1288c73174045";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "66cb534a5d5a770b58da042a92b6536fed714cfde257816e0a4dc611b6ac450ec364df8265e907b7b5482faffc8d5e200a86f40013a7e74f22762170d4c95d35";
+      sha512 = "65a6a13fc099785a6be9ae5b546bb9a370e7a0a8cec679d27e9c87c4e4d01cc9b07cb4486fe243d1cf82c0e774f543663f7f68e62ee31b16fb505179d81b6c30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "8486b3d9202fbc4d800cfa33510b645af94b6fb1c6715ec8e18f0cc4d414f87e4902d615b6b46ff0eba5bfb2c2228c05bbf53a927fd9c52ec7f0b1ac4889026f";
+      sha512 = "c61f865c1da38d137bb64e6cdd86e63a793a42c916e241db6ebcafd2b061d56c659690c98ccc65b1bb2224ab6b98ac7d6cacd85947f3f8b0b6a4ad6422db2f98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2c46b7aa34ad5eadc9fbb291fb4ca320676e37991863f72bf4cfe2266a6298ba3157d1a0d2fa6a056661ff8474d988e103e8f5b215cdfc4c457c6b7d279461c7";
+      sha512 = "d0fada9251271f3aff3222ae3cad1b429aadcf9801231388a79c63a2b14ce21a41fa93cd6353a0bac4ed3cb58bbb3375437e07c11ad939c1cf281554319a497d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f9be3db1e0436c3dd4fe30fc3e93e05fbb129fb5f666d912115cea17c208ecdaa0427f4446f38f190165b10c3288573574a6abaf20288ff9d68d6fae200af7dd";
+      sha512 = "ba962cd22bf2b0b3bb5a4c40d5e3628152af490586824dee3e890c02a86828945c4dfed7a9ff595d8cd60fc30f2cbc799cfca2b41ced1f56af303c4edef364d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "4091caa77bcb1d4602eb0f191949a88cef0e0fac5ab5b601fb987c1e8dd47442e9b2ca30077308fbf57f71fa6cbdb85f67df3187b71b4680ec2a51d558211e17";
+      sha512 = "fe5e94a6a0caf594df4b96c0803a71139249c993769d72d607baefc9bcfaa1a9b33d26267919bccaf1e707d6894ccbf0e85867783a104cce6211c891418ee46a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "7880561a54333992252b26124a857eebe745bb683ad9a9f2d34e7dca8c480f0fbebcb27562dd62ee0ab525b27e31013a7dbf0cde389cf8834353b6c3c2e96914";
+      sha512 = "06a5ac528b7f78bc215cbbb3db89450a215f277972c8cf3a1f80da686a48de9e4c603dee40432c29d62b2a566f2f0eba0eeeb5ace16fd4801820cd6100f8f2cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "440ec2334dc616da063af952c6a0a4e8966fcaed669d22b75be708800c033287bdfd66759d479bd2085bd601aea7a1bda27067341703da3d6a1c1b305d767384";
+      sha512 = "d88656e118cd66c3f7ef923b2b40e6674952259980df6ba15489ee1e283a5a4999105b178c3ca2e55ebd67572fbd679ff178b75a4f4f2acbadc6cf7f6a5beb01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "7b9242da1d9b16c66073bf4cc85d438f2f849b3a0641eebc485b55f4ea3ab750c0bc74952ffbaf80b23840ac375e45984e6cecf7fbd6de5f2405f81b22e23f68";
+      sha512 = "758d2d67280e08fe1b352ebae495d518143274eb38096908f22235340a3e67fdaeb073e79af30d36cf5c8251552562167931b5aa8ca7d3a54334fa684074b540";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "9b88838076dfaf6b1f243940e97d02885b17d5ff82466ebc8fbc9664c95a62e59e305cdff3bacb99739d6077fb6d3742ef2a4106dbf423003c0d75bacc296a14";
+      sha512 = "6e9442b5cc8a9689490903a4b12e48b23f16a08258386a842f20714e598f31fb1ef70f9f9f73910af888ce41a17a5acb0f2afd5ee776d10f1547e904eef780d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "f685409b69b27efaf703d248ecec25dd89e52f462bda69d509240a9d1f1480abf2a8849efb9e73bc8056378a0c1e4646f2341f7e84112582e3169eaf7300e3c3";
+      sha512 = "ace71b137db10e7fe9093e95213cae7e8a1f05ac1900905a1c1af68ec59e075ac450dfc537de62f0a7857ee49364fe1658028726d51c2e34120f1764020c1ec7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e44ecaded4ada349beac0205e659cce7ac962d7d6cd97040af43c7f904909177bdb4ec38ba7ff57f9aadcefa55b3dd09296af49ae97357d96382f45a3872a963";
+      sha512 = "ad923bdf87283beea05bd91f64a4582790b676b91816698dadd22c575db020b1470e06761872caf346d01a9cbee148189e98ab1930cd10b7ac88b69b76b4a5e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "99d79640df9b80f380438d18ddf668b22df7ce85f99bbb94234ee3f2d7944c590b22b73430d2c73f3c09c05655356c6549ad1cd33bf5bd6dd619ee427c183715";
+      sha512 = "af63f7cdb9a7a1b96925e55aaa86a592ae8a8303e49e9825197638aa79fc3a884d95a1bf0ce829f243fa767381ae40f26d040b2e5475058d84c95ad4648368a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "5597c5d5f1959f7a473094b415b3971d4343b9317fb27e6646be99e6ee8e07e9d97e1cc8e51a77fc63c03760713e9644c6d292e33324d6e599270f424262f6a9";
+      sha512 = "64b2a7d7686352082da9cafc08489c8394a780f452edb5b76eee16750ccf9b853ba69045bc6c4a4541531c6c76dbd5407fc0b6f1a8f5eeb66511f3e38ddc085e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "331097eeeb0356e3c281ad1bf870252f6a3312a0aea9a52158ee45993b7348fb15896f73b174bcaeac4c1b71631952291683ee6bc8a35b7156cfda280cc951be";
+      sha512 = "047abd61e221f6b7335cb826d72de19f30f3b83a5beb9249f8ea127abe7d497371628f360c8369bda4ff6237e2438bd37804ccec8cbc7970a4e795dcaca80196";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "5e78bca3a931bf8bcb94d33340dccef6289d32c5ccedc75cd347944e56f5c39f0780b1647924bac8faee94be51de39d93f477a959de4304bcac9f41ae51e52a6";
+      sha512 = "f0b6d6a21c213ba0886d8e830b5d8b91dca7e927a998f51ad7e885bf2d2768ceeb68626fb96d6641912127685c733984f8fd90879739782ec36103f08a8446da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "5d8aa24b3c859136b833cd0686cffb73541126d4de14e5be5bc5a70eb6e109fc36e6415af0d2a5c680350d34d0ba13afc21b49e65f9e8a210efe82ff0b8e20b5";
+      sha512 = "7cb2579de2774ecb0d810e943c5c821987bb0454a45e1c4b07d4b1988da634bebbb082d961db59e5ae9802cb58bf83500efad5cce7d8a06b1c47293b9eec6033";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "8bd6b551833aceb552c52efc4898546b639349c398abe1c62b6476f18e64de7efa63edd844c3902300014415d78466f461d5f37c5d8335d81c86000127f6901c";
+      sha512 = "cd8cdc7990681f755c163e866fa24fbaa741549b4fa7ac2c541a59180eb7e732052e536e5b231a088cfef2986ea0c53f10ce519c823c04238548c9e31945e383";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "bfb399e2e9086550498f0f954cab9bb061694a190375c4f26bb6d414ad6047bdccf21c83e509da10e2f4b18d20a169cf2d3e2d33d76f20ec0278c4f70c5ded19";
+      sha512 = "1736a87b10d6b8a9da5bfad680f0e6492581b21dc4dcba4424ef04b4fbf8070168d14b19cdca0f2dbb9e467b692fe31b885cb5a0d6d58d70de59ff4e522b6c79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e6611dfd935f95604f694aed4d17844d11a8713045ad529e64a62fd77a06b516994fe4eaf487eb629bacb597cdfb13bf9387ff023dac6cd78c1edc9a8e008975";
+      sha512 = "0836aba5563dd942e581c6c2855978ed1adc2f204ddd254c6588b06f7c47f0c11b40a4f935ad509cf9358d43b226b46fadbeb150c55b69889f3485145ae2710b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "a2d1206cf6ebfe5bf07e4525ca21079024eb3f4aed9c7a7b1a3f9eff416b821def976533698bd2f59c53179ec0c2613be7e80701a1c4216eeceadb8c13b30f47";
+      sha512 = "aca25ebbbe9ce3cce5ce6a03a4fce799735fab30c37f97ef27ca21ff5949919a660e2708c25da5e3e9d679c4d4dfa388636e8ddee60479bd35a46f9af3bb1b6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "bd3ca95d7e7b66a70f961eff93fcae884edb8a463fd2f98cdfb11e3925eebf7bb6da66cde6ae4a26d23d31c10396d47331895b8200cc5e854a89704cffbed437";
+      sha512 = "f2d010e76281e24055d17f6d3c8b8fc925420d8fbc837c14926b1f8f8adcfdd59a90f5048eae763e3f63ea3c722aae6bb0bf4ecc13d5d12194f9bee1c7385c64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "d47b65f5a863d790b5d6249d2b0201ae625303b48cd6327789ed36ba4f36ad12cc7146ebb03e68185928eda63dac3fc4b29131bc224009d571b0efbf9ca145e6";
+      sha512 = "1321cf7ac911fdb5ef58dabc151a75f916f154f5e30db58e0915f429a7c9cfb4afa39cd5b52a5d960f5e88a27727c8068fc9523db3363977683b20fd85e1438a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "28a574d023f84bb5b5224d9c9d9e62292fc86e6a12fe34045397f16917d19d8f4319d1a08742880367b6fc85a62ae7a09ef29b111709ab4a256740adea2f3bff";
+      sha512 = "e0c600dae1cac652c81d31119b289d20aaa71f3eb499d801c98ccedf9300832bd276994d899bd68dc4162a627729ee49b486b14c0314673fa0c02ef0ff01a19b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b01b97325b0265d060fad86f7cc77bcc14975c51da51639991190cba2f6c6935c48cbde0fd78850d579ea320dd2e9c87edaa0750663e5f0ac234932968fb8847";
+      sha512 = "5288a62e184f561920718aabf1a705c424f192505d20e24584feb8b776713e1e94669679ebd4795c656224e7890bfb532a1a26ebceede30ebda980867f25e5dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c0791c6f41097142035cc0a32f8d7c3a14c1975c4f4984db778240169aa48c3e4e89ea46d21c5a206278b34477499806346a47151472ee9b47d596da5eeb4664";
+      sha512 = "b47340fa3e4dafed945f1e85433b0266e1a8d40d1ccf707d7be8343c0b457b14d2aca836bf45d15e29695056784e6ff5a89f1ea8701933d2d12e885d042eb556";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "091e89df6c761fb0d3629a430d91fe9dde17cb74aead6395d39377ef7b1038ab75a46e2ecc2517605dde3e512d6cc1fd4fea706ca177b03b6fcc1854ebb99c2a";
+      sha512 = "36e56dc8d3e42b8e689db2725c100f74983c6f8b96d94714738e2b7dab237797df369368928437f7031bcddd78ac1e7d6c6d20d2d76502826ec93d561b596e53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "e84f09eaaca7f3eb2c4c8ab10f5fa48853b32a9b7eaec022a4f7cad7ed816d795886954aacca935ac4f44410c63c90e0c9c98f162a7afb517fa8063a1a26bf9c";
+      sha512 = "abcd115639fac3da0f271b95ea20eca18d3e42fb544f2de7c53e626c6619753cec658b89a5cb2b99f9192735843be9f1ba461e37a7c7df2dfc5c695455f4d13b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "82ee016a8ec7c91708bca2ac498378d240ad45e273d6ac5c4bdecdc2a2f3c042ec5f2f77935ffcb9e391f35c8ffe3876b16ad2200db855818fc889568f0929bc";
+      sha512 = "02af1e0c56fe69f7e6f5aed233601d25811effead3a80dae623787528953dd34f057aad958ae792875d3775c74b8b6051a9424dc8c11057bde3f38e18fe36b38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ecbe89381834657d3fb8d395cb58cb5bd28d9e30e160b50c6052ae49a60f1a58d8d79218f0f76814106575e01b063d9560dfd2a4278bac7db60427310414c6aa";
+      sha512 = "3950b6a88b260e9662395f4a049acb86ff9fecae19dfe16fe315785b7dd6816d88006e9916838ee21d9b085a34ea580cbc1d8f2cd67fd03b18ab57238b7ff624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "9cbe123386fe1c15ddb0613f2c2cfc6b0990fa824ffba0bc0c25069c02de1915e82531f5d22253297e97c8362e0fe1e66eaab84387f741b10528838ee2446c29";
+      sha512 = "770147e023008f566640b1485846bd3ed24a08065e0d1064d8e39449101c30e0414e92012fe49e75a0608d3b467f6c2b113daa12eae5623276a892c23a05a9c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "c53e2b950b427a6d2c3ec7ca2c657581f1d4f4bd44b90771475e48f269fc2376ea4cef357e8c4d7d27869766e863b1302a860d4ef104bb664b119971823625aa";
+      sha512 = "37091abc6c7cebe2e6686598dc3d1dabc0019d2ebbbe85d929845d3772e08378a487911193ff5cea8f216cb9c20a4e16c349c6e4e85e979483c56919f918c4e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "4d43bbd65a4c76445a6dd5c35e6cf0013c24dee64289f4074a482d6ede232a86e04f751781dbbd65b18a08a96b4d6f45b5aa72dcf8062a23054755c4c58ce779";
+      sha512 = "118417f29c55e2309feb4569813433f05979a9145155cc5971dd7e1332899832ed3bbf63e377db0b6c80da62946d157e9b53e0ab3e664c188544deb2ace752bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d35456acb515a56fb411e3df647fba2d1e2f312a0fccb53dcda3ddf68e839fa8f38f78bd73afd63c1cfb8954f65986fb3a7623217ec8d631e36466b531358866";
+      sha512 = "791bb212dc0a55410656b70bfee150f609f46ca127093a5dea7abc9e73f959237e5f816db6ead316926e881aa4d2476624493e2e13d653fcaaf7356ca778147c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1197948644964f77108c95b9eb1b4c8132ac1b7503a9423f2d2cac8b52e7f6c2b30c451fa62573437ef74deb47017797e47f1441d60d40a17898717b95eddfe7";
+      sha512 = "ae1d37160a7a31b739259fb4b08598dee895a7af4c9d9edc1ebdaef13ea196da29cfd0c6bd3cc1ed9215c109671cd209d9bf1a13e735363bbf73230d80496859";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "309b0d6d3f2da1b6539e6243ef9b44dc27f4205a273f7ad82659c9691d0e86cd99ec388b9469f9d97e11f45f534b06a702656f735cce0fd1c95e09a9c7cb38e8";
+      sha512 = "7762806dc14ac8f2356a7fc1f7a7060f277c2271688aaca0d4d7cada0172eff4322497886d961812b0a400c1fcf41e20e15a80b101109ca5d300a21cece2799d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "ee705fe4393f1f07317dfff0732a671007971eb3f0e5d2348532c3b681455ef7d680c5dd20fc8fa41601cb0164b66371ce685b39812684fa89523a97a6361614";
+      sha512 = "eb40766df654371a35444ae888265a7838c98f463f9f7d2752bcd67031b8e5921076716b23b94da37ec907efeec30fcb7bb1cb0c43466c58c054ff3b6dcf3825";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ecf7977f395056f0e346bfbfb81a2d74c5ed544c9bd3989e16b2f0dd6d5e3fc3b6fb48977d0b468f2a869efd6929279982a9eec33318c65a61c282996366735a";
+      sha512 = "0d3a7d94e5d148dfc4836b78d3f7ed408bdc1cc1fecf81d4364c0ccd79b34e04768dc2be147cd0af2a502c5942aa349d704bed5a8eaed72e32b363fe360e37ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "e51e235f2733c54f0af0ac912250b8eeb4277d29151da7a39c342c33cdbe381ee485aff5c2431cfbb088de8fb94c91b510efa8db614607819832ee8b13d86584";
+      sha512 = "3f66a086542472353c137902e635b5119325b11d74f4575bed4a90b6cbc3fb3cb9fe3bc5c01becf64b62063ce38fa7caad25cb80cc2b3b28ce69919b9a529a84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "45cb25937c1c791e3e55e9e70c469e28417048842e2993f917a7e7b340a0aa1afb985a8f1e6719ac26c1329299e2d55fa2cfde49c007b8444a97d16423c3920c";
+      sha512 = "a81ca3eedc13a54541a9d20980225f8f4ad599e4407f2813eef39bc081d914dff519f0f65ba4865739542cc7f1374c795d49acf5c388cf81f0ddbc91278553af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f3dd9601b114a0ec45951d187b1fa1e559e778c3033a5b9bc75b02cf49f6856fe77046f4f1a75149a58920414dd5ee0c98801d9dee7992aaa7ea6204deaf7c4a";
+      sha512 = "a89943d49a19a9baa199c79d138db7378392780ec31e2c3e64fb2a7d07cba688cd88119b22cf43a598470df4a3d647961b728e0c0f28aa54990ba8d747096112";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "b937202e944242c4a35da64add8e4dcd9fb4354d1ecee9144d1cd1dea5f5ac1989ad8e3376099fe60705cf1486b2ef350aebe5d55e440ffaf6d9aa619ccc4def";
+      sha512 = "f8bcc977b7f88ab33ee6027ff58bd73edade0a9fd9352a5ae8614fdc6563718654d1b0764b03e0527a7f1e6e77abf39e5bfafce90e877f9c94acfdfe3484e35b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "881062e5e027824b5768db1df6aedef73f93721d5f4e4d1de5a31d02b3ac8a6a87ea5ae7889a6ade614180e15189304d529ba03440fc0b030061e1306ca1a02c";
+      sha512 = "e7074d790e75d8ffdbb88b8f21dabc7c9dbdc43af2c57db7d34a34785f317b5a6755f94ef05cf22f8d8a4fb5d06e6300538809a0cc14a6ea23927c79b0580c39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "b3939136fb7efd9712acedc71a0d45cc0129367f5a11a2798c788b693e85cecfdfce2b83a1fad2f8bebdaf7e973d963975bbd67c0ce342ba0a4d0d46ff2d01d8";
+      sha512 = "ddb0e7edcf47cc0337c7cd8cb1b6f63922514bf8ceaa964ca8c2bbe415f23a2cd147dca604bbf102a56ece7ea8634476a55a36c7915f54709fd1d68b1b4dc95d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "fdb3026d28c507c947f236ec9b44ee2c74f2e4b2df38d0bd23143d9c56c855a19cb99deb087f2253c1692436c1ac25590b78cc3ea713e890ee5d6b3ce70d2cf0";
+      sha512 = "6346c457b6e14d8deaec311012bb6bf62baf4f9c556ff244ee9f2048f8a8e6d0bf4172549ace00794ca3f8cc0be4f81e74cc1649a57e07a604b00bceecd91111";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "9ee305e8b77eb8caed2e0ec5251f651d16eb7ddd748a23b4c3f17853dfc6018efb8262958f9843fca62799b8ae952b208dc97a4d51977b0e4a81ceefb2575179";
+      sha512 = "f1eda0b6d33065d8690160de1171806c8610a04c278cb812eb1f01dc204d1975b210544fc8263b474dd27ec44a4d35ffe5c59575a8cf2ba353ea9002220c78c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "17533028af974f7b785ee57fbd04e9ff0cb4f952269ebb9fba89a68a8e4af7790628afc74d87c1a338670bf05781cae5ba7cb8422d64055c54b39030a87a6741";
+      sha512 = "8c2f83daf3af4db3c9c2fe7edf67f8146f028353d5bccd83be338afda9c24cc7b79831fce80b9c67996b76bc483da8ecd3c49a212d5241eb2543d28fa64ff4db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e7691565e57153059b7b635bca91e83ce777083920e18d3ad26af960919a7505fad2e6da3bed3c179df0835225a331ad0e855256e87078cd2d023fbf837969e5";
+      sha512 = "da8d122b5888c8d20ca55fce7987375e6e4cce13944363f86cffc1a68584e413548ac8da8c946f6a169ce1a0f991e749ec258a4fab2b0958a6cdcc1069c0768d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "001ffeb0a229e1deb751f7a7ae1b70e42b28cb47e321fbd4f89f948302ee31a5cf0ca513d51f978f6482f175dd2099dca46987ff22f72bbf60dc094146aac1aa";
+      sha512 = "1347817c9b98c5f6110bccf16e2adcf4fb7d04b9edf59a0b0401a1cc8c4614cf345d3ee07d465c52f421692befc4cd6561357e8b5950b1200100f3555721023b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "a96853819e1bd1fa9eae60e18ab1dc6ed304aefe6d13f8cc21ff500cf2415c7f60a623347d3b3632868446e1769aa0b8b0acfaf036281b3d8e838f849535579e";
+      sha512 = "1d06e60582c51808c9dbad7869258952cae1b5f10abc39fcf18a3ca57c0ec6065936a79976a851bbf1a98ce8e1654de0dd51bfd2fc8178297eeb40b6dc16a2b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "abf878e46f44d1516e3d1a0ad873065ceb6025a93b968b71e532ad98d7c977252b703362778b34743dae0b50d3a88238f09876dffe46ce09ca5f2785d48f7cfb";
+      sha512 = "87e5984e5263a406392e704571207f02050093839e58c833b3dc10a78f88b93e99479e317e17983a51a3615f03e84861d4bef8142493447d24ce42e57bb49e7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "4f201854676008b06b4e790fb7f0ff39648bb14f7813e733038ca9a8acfd5dc2bcf527eb3bb45fdb58def786b0896adf9660c5adeecc1697bf459bb13b63eaa3";
+      sha512 = "c979e7ba1b36635197a3ed5ec581da57594fb014c2d71a0dba3c135db1c8e632b671203b3f9b4b5765c74d149a492c94ee327393903a683755b91b4677ef4b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6d5ecffeab534b86728a023c6507929e8dcf124e4f02431bcd40dcb5322ecb5ba38e39a1fbbba096fefbb9b0860c571408d8c7f0f90452baf3df9c4ced4e9efc";
+      sha512 = "886a2a0d6d88101365c2b497eb4f5dc56325818b5dc58495cd2dbed1fc0a8c91339e3bbf9f5c0b246c51cf44f2a61ea07421e06394460d2d0ec2b60c728eabf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "64ecd4446edf856c8249b18246ec2520b999118d4c0c815da472f50c4dc2434cf504059a2d11c8a72fb1ffeb76e7ff6fa62a55e52d478884f516773511465a06";
+      sha512 = "39739a0836f61a98dcd9b6633f4baf73fef07fa2dcd1c51b2309dbbdf62c4256e9b8b8fc94270e2608d4042d1c92e19f03337471a38539a8e9b803b109c2fb97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "0834f04f6c76ec8780d862e550c5e2bcd65acd7dc9b8629d194bb3407178fa3ae6c47d7f1421136f2966c9826b942c74335452a647e86c7b58b6708cc26c445c";
+      sha512 = "fe6d7fe4bacb0789b6b8ce7ec8fa0caf188b9258f21a0d30f9dcaf555822ced17240bc07f56e28c12342d42b5514f60d845a89755a92e3bdd68d7a33dac6ee0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c238708effad87e764a8ad86e08a41574d06a5f7985f8370a7067deb0e6d10c97c395186387f18167a70d28521a811617adfb7aa411084a3a1397465f2de8a3e";
+      sha512 = "59384b138f1279aa6c40ea95e6e4574eec4aff91ef2fddd14bce212f27a1be2acf91d751afd984eb7bce52a2dfa49ff977943ffaafa4915402d9cc31a5a0c95d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "7a1fb23ac7ca6c25e385cb27026064d5d17a613da19cd1b21c0710002a5d5473323d05eef05fb21e3fb1aa89630e38c4838cd211297569885c3aee251f7dd0a7";
+      sha512 = "863bbc400416d114e2ac4842e33d53065f872ff36df31305c800520c7e180b749676a11fec62ac1abc155a53d079374be4ed3ec19202d83a22e144f541fb4d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "306bade19239b1120e1fd8a879dcd98b695d966b94c061c10684e3ce3b9a2a6122d63b86f16cce9611306ef297dfd39003b5ba47ef29fbab33b1dbabc2097e7d";
+      sha512 = "cd3bd76bb005f0ecc66b7f4113fb7ce67f650c0f39c03dddd2ee2aa7e854e70d199cf70004d9b7b75fbf1b9083459e81ed0a9e4222985556042e4c542261b9b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "30fc79a7bbba6cd5c75d55c3169e91ac41d2259d77ccfeb4569cd5bfa3c0e7164b0e03e5722949e339197a0b82d9eea1f3de622b958ad75e6dc94ce0d10b7c00";
+      sha512 = "1ea3bafa52ff02080b21865d68c111ff5182a9d93607a260d51f59ee5bae560ed86ca1a3fcde3dc4d1b45431c1b1cce616f79775628a17a6bd3fb436c59d11a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "b31169a87228bfd44f144c2c36de4c24165bbbea48d5ab93039108d00a34a68dd31bb61371c472e866639b7e6b448b6c95ea2d9fb40b0c333057390269b9af2e";
+      sha512 = "219655c7a1c3b985e05ed162458c3988e3f7a60776e3c76fa7492bcc77b7fd7a37a3c3f622cda194e4ba82c863c63c1644df1e5f324271b7590775e59112d21d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "115c549157e802ed556dd8eeeff282dc045888a7da767136ab3568ebbe611924a500dec85cb7c5e5ed3b712f1478e9ea825c658cd8565718db7af04f4eea1e17";
+      sha512 = "0cfb2324ab02c302db9a19da5e4872eb9d5389c81ec2e66f434939f5fbc4cd9f97b8d72e7c745f29d62a12799eb8362ce928f16df967b4d6d557dd99a859b443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "61bf3b3e09f21d9f8cbebe0cd0ea428a04dd8877be004f32c610b8938f17ddc24d49279f98d9701069855d15ce0c0f8359e6448eeb1681d89ed1e1b69f9196d1";
+      sha512 = "a3c30300291d68ad7798ae29fc5c475e527cb8d555476820a75ef6a9ba90c8a0fdf71a69f8e69d6ac93e8fc8044106c2195b6964b23e9528071fd1bf925ba744";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "31f481aaa9db45b26b6d7236eb501e041cbaabbf47b922563f828f2415451ca5dab896027c4963bb22fa3c6dcdb26f0821e78f337c50cf6e8bb94246de86cb68";
+      sha512 = "f8e2eb014640112896fe94961537b058a71ca3929fb4cb2229c4de071416ab8ae466c6b53ff33f7bd5356e126b676c1cc15414c1d3dcd79ae0906091f86f17b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d877f2b0f4f082651092cddde4d1eb27ef261774b8e72de6e87a937a13f55676c8a7c1b978d75412235d89af7bb7773ef1f2f6260f3a7e8f63e3a2f8f769c12e";
+      sha512 = "20a38bea0bfca6ff08d7b4ac3a779f5d4edc17e90d213ba62011aefba7fcca1b6dd7d602fd36ea714d129f4ed6edef6d1c1d815be25975c0f3e699fc3b312487";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f63bae9f41368903b9f87f0afcea69e74df57c355803cdabea540d22c001a42c4147a9d9823b8f0e2f9fd89cda4da831f2777a917a031c94203abbd4b2d6b117";
+      sha512 = "f62cf2814b271de78b21bfb696889fd47665d12cc8d729216870e48af2f0ed2b87460f90f1685dc78d34e41af4643eaa73bf51009f683520910bf90fe1ecccba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a2692f38c092805471d7892657917be266d1b6e319809e1d506deb136bf14f0c3685a9237c07dd5896a1102c809340370cf95741fb8235e0d9a6a791d167a74b";
+      sha512 = "b05e5ecfc31926cd3c4624ec7d70789a6d729adf40bb73c2c756a97e7e24a36de0fadf180bfac4a10c39a11c62485fbb9741e0badbd95fe95736c067f47b8c47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "4b9099f2159cdbf4868d427ed1baeace54666d9459c6c68e362fd83f1f68fdfe053f5eef387bbb5a721019a13cd66d9fb9ca08899eced3c8b48f1b368b407d93";
+      sha512 = "789a3c04d1cbb109e33682d3377c56a631b77a550829c296e439e6bca75bf3d3a240aab8936b0f5131ba7a6046a0cdd7f662839bb165ef83ac62c1982cdf5efe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "cd38d40e209c18b545a8b9cdf66ae09f87e09f319a7ec5586d45fd20dbae004a031168c10c3ef851f19976b240491cd230e54a1ab16e6c0d7061eb8762c5758e";
+      sha512 = "0153f20d08d73f796d57a1e1cbee63179a943f00c2afb3c9aec666943a9b46d94d602a6b74b815350f637c516701cf849703675f8f8d128750b057f3b40cb579";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9e108970f376dce2f32ac4d337200b0ea0dd784a4543f54cb864682f988f72e1b8e0c99dff170a3684be65ac5736a2606fa9281e622d1c6068054989dd9e3b94";
+      sha512 = "4bc96007e1bef433a2309a4e52dcec9f24a858940ad4400758d42981b3184211a0b6f23c2a1a3255f05676f69fe4339ce3a7b5a2a48f60aa62a1d3b5728d7f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f3ed96c5c411b5cc1a1cf3ac94d5518e741f3ddfbb7ca3c437aa7746b03b7bcac28c7a4252b74ee3205bc0ace7606b1dc50652e216ccac2ae6c398ef397658a1";
+      sha512 = "c8fd687dcc02f0937b7ce71cb422562a7bc286cb9ef44f3d8bee8a27ba1d21a5a9771ee4b362356ac7bcd9035e9c61f45bd9106873abca1dc96d00c016d228d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "36003ba95a33c7296e21f2e254c71f328c0f994d6f384a174789624fc527e9a5c94ee80f8784602fecbd6c8d50531032442c080fd657a6493418714daffdda11";
+      sha512 = "2bb9ab324b096663b6f7fbed363c424336d1772a87b9bd602654e29cf021ff486501be3c1846a8fcfdd8e9401589351eb2443ce927697eb5238db19f26e35989";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "eeae7d7bea78aae2530322060524087886bfed6e0eb90ed9c7be77996e17c658aeb758c7af9577f863016b3dee8d83b7dd5e61f3d283d932aa300ae8de2e3c53";
+      sha512 = "72a0341a9ca3ff0a5cb0e5a020d518571efbc6888d16fd6481b14a170f36436879d73f1c1df88699067e180733bf72a9d4c8e7f594d4f5b0f6416c8309a1d121";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "9405a8746752fa132cb137f7c6d59a9649f31130ad3ae888cdde419c2f016bf45dbb97ebf13392678453d1506f98d451e9fc7ae92eda4d5d64c0ba443a528568";
+      sha512 = "a59e7c9ed6eeed8d2f7bda902425a25926b81b4e5fd8b58cc692ed78ac37e2305aa02339ce20fa9d538d4afb226dd8f6c456571ee269722d798ed4d79e4a25da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "3e9491a63956451dc0cc7e2fc1e833f8ab2d49b8c5095300db545391a86aa73ea4ee8b9d7419906a19fcfa7927e27ee89b934aa79f90631b0c5dd1a9ebb0a764";
+      sha512 = "673783d9cfb09df51f30ff00fa5ece151a6faf730d91fc4926664346dd272feb741bb6846c8ffce99757640fadbab918efbe93f199fdfec3bb2a1e6ccf762dd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "a660a0ccf2a47c08834a183c54cd53f134b2421a4a9cef17e59b635c9a8364c007cd5a814c040ff9dbecd2373a31ce551c0df48ef7d8b194b53d5083535161d2";
+      sha512 = "cd44afecf36098de1032e76ac8b5ab46983e26a8caa8c8e842ec9c1d85528fdadb1507c80e5662a1c8ee1b744a6104418faa1d0792c4ec3177ff7a133bae4cdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "cdae561346298b4bb8f85d0dbc6bec471cf755c6c5f89c5a58ef5e15bfd2143729f903b488366f9d9b35c5e3df6f201680e8941db5c0b8d4632efaeb34e93711";
+      sha512 = "f722f3926aad0be53db7f6d6f48ffa739cfd34995b8fbf6a91f1634214bfbe7e9babebd285a720e41eea63c696a80d4b2ad905f7529e48000b3d6e5b6434660b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6ba067baed3af7a543188f491864c052fc1434d888245f8ad5378eff52afa9313a7a5add5416c14794b5a27a5bac353a3e798a8176eba62f6289d89bee2f3133";
+      sha512 = "53d92f7beae4a1d4d1443729e042d392908d184826aae925174c72ee059358282bf1d003155863ffee0daa527584dd33107a3486f849ee903823d123c5c10dad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "829f8e22039e732fba4d480212d3f7bf3dd39cbb0996475c17e29e442d2a5263f33f4c36a4775ad21f984393f8738dbdeb7e33fdebe97eae0dff01a5be7ff22f";
+      sha512 = "9f6646a6d62bd7dffe925080bb471ee995b1ad6ad496b1ef58f7689d7349f93ddde3f8f6008dab983cc5826f0bf66d5e6512a9c7b0f121efc41b985e23761065";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "62b6b7d49511b28e67b41a192de49b7dd9d4f806f1df488c850a5da14f8ae0c87bfded01852962f9affb112536a9fdce5ab338b8875ca49798f7c78331dadee9";
+      sha512 = "d068521185090da46a9bb44ea1b9c285584d9a7028c0c20731046092bb1d924b4562409b524aebf293d4445cb0ab342fa9f3b33b2ed5b2e95f959b6f0dccb27e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "b00eb5696fbc132cffb2053c67ab1456ca394dd2540ed08e4aadb718152ea727f156647e0977ed30ac17701202c184f99e03fab58d7bce03c5030429a733a7fb";
+      sha512 = "2b695601c381c91058d8b7cbd63f46a63efa004b2b14430aae79838a890cbab818b34fc8401d5620dda5c17f22509befc3e6f737dd040eabd86444353a40fc30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "e81bac0aeb2a5087e252d92fad3aa15d17aed5b818c14c4d32114cb1e2002ef52108aca1e72618ce8b52fd6fcc75bb6a590c78b36a9571caa64956c7d33f7313";
+      sha512 = "a890a5be030075461ed2936af7e0ff0d147c822e29fdf381f57e8c6e53dd8f9ba39d51dec6f2c28aacaf26847ddb9f1b8cc009a7b7ad22defe469b28c28ad7ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "a3b8dbd4e3fb0813d719416a297ba6416fb6a58ded329ab1ae8ed32c29bd7f0721ce35d550db2e02674449da62dfeddfdddc51b822475cef5d4f1c215b7adfef";
+      sha512 = "9e34dee7fb72b3f268935e32f95cef9bb1ce045c2488cb1db087eeb9b1db79b9e2f859f707aadc125b57604576a1a1b3d6856ff509e341603bcb64afc7edb63c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "e5a243e9a32b8dbf48178e20e6f6df2fa779d2fe7c761c3e8b85641a655e41868b86c794d12fe987be4dbafae4577dbb3e45038bfcd6e22ab0a477e8718170c2";
+      sha512 = "25a62ded79e4b559f9e857b7d451aefa3e54bb6f8e94ec25fc596de16563dbba44be1d196334a66861f8a835fda39f1742d5f5226e50ae9013b72c95a01d979c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3ad5d0adcae8346b771056d92255b57f46badb0023597fc16cfbecf6cb8e9a7246ba3b2c7729bba9e43869f3a882b0daa214d2ba5d0c4f913350ff5c5994ce7c";
+      sha512 = "eccafe2e8931aa5d4081cfafd6f39ce8094b85da4129ff86746670eded5e4946a63953b4f7431b11f0742c97bd7abcfec17ca8ba27f1ca3727019274832fee06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "e380c47484bd56a7edc648b36008f8fdd95729c341e26543239aa3acb7cb56b41108f1685f4b2840b181c612c0235b3c38d815bd5426b6dffbfbec6eb3b94776";
+      sha512 = "189e76b67d21370148216b5bbc8cac7aba30d32c0eeeb9e972f2d8dd3a9064f8c859fc0c59a531573b6d3d7ec6cdca3f9347197cb2b680f9bf335a236fa3633c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "ce9f7c0e9fd901be27572448ebefbab19749f11c49721dba53adccfc390240e4e1420b75c0cabd2e2e73edc34e6104898ec3372fd7f7072623769bf72db53c33";
+      sha512 = "3225e1708f34532b50c5cc35eff1cc4d6718328fe427fd98eb0a8f34fc44fddf25cf28296793f5473dae429e1cb82b4b7e5b99269178e11b2caaf5c8650d0d55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-x86_64/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "4cb533495ab0fbff75a53b56411ce1c59cc2420dd9c463547f46067577f8b953cc59c3d2f203850f75708f38388591a086335416edbd8787070345bba4af28d0";
+      sha512 = "e1f8f7bd1ae5904349e58ebac109d169fffad677ac9ddb1ed39aef6c898eb112f419d743b79b278df62b41cc661471a5a4fb6fbe8994a10d6d247fda4154986f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ach/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "aaa9b8dc909d7e50a65d904d9fd7384a94aa365df8d6c8e3852926533c9407f6a08604205ae94914daa74d251b212a9f3707404f945072198141267540314edf";
+      sha512 = "1de3d7ba3c34c458842da33207c0036d7217bc3deeccd2715c7a22e57502ff41950a73972dc270acc02c63e16a39baa33eae125f77ab68a36ecd603a7e237a51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/af/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "2db35215ea1bdc70fdc2c2e8eb576945bb0951b001784ef29fdaf7864c2d00d43122e58b45878e107afa7f0a85bbf332094a8c3cd08c04a5b9ea713fe6e25935";
+      sha512 = "a694fb77b1f8871875320fd9cc91a8def83cb32cf759e1513f8780685defa8f4b73741c5ad8f7da38f3e12b48d4032f2a04841e5f9be459714254aa46bfdc19c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/an/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "7020efe3d039e4861355cf56feec7dabf183432f49ec8f10792575a8cf33af0d7cbabad627ecaaee3d47988c2a1261ee62d509d664b4a8ba69d1e6d2b68f292e";
+      sha512 = "15a2e985f68eb528b88ad17fd06ec894c2b6b84b18b755befb0c01153a7a351650489adf2ae1f7a8a8848e260a0f112ce629ee6524e0967f2da5c60711c6ce74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ar/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "99939f05878be5a5758f9c45410682761b77fdde6559c31e511139955cfa18811fc0d9e19c2d7da254267b4c3bb6c34378bb26c8ed25f8b957a7e73af10f65fb";
+      sha512 = "29b840f1253b857ec28add64c576c4fe078428de191dc7b3d937e9321b9d47e39a1da555c09663e5fed86e6cb9b8f85094e416fc6f49076fa03850b381553d1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/as/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "74c2f0e8a9e5f9a1052e011a4af950ebc2bc5298661e7094d3776dfbe9b8ce4efdc6c7e0f6371277e530501a6bdc7fc4b5c36983679567d73db1d0434daaaf87";
+      sha512 = "4f586b5994be003c931cd4e1a1154dc02fcd1344f90a6a0e58cf2e86a601036b773c2fe38a55a6ceafcc489777a2a4ba9d9addce6057920843bdca4655b2407f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ast/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "ddedd7552c4d85a7f3c3eedc80cb4213a67024351a34df41b0a8a6735cccf3c79f350f2a5621f8324dcbdd9fcc93d979829663d7fadca2367414013efc5d5cd4";
+      sha512 = "1f3d66fc796d501764a80f681efa8c85513005f6f9a510b4d3e61c251cc98f9140ca6cd56a199a46b9cc1cf4569b75e103826feadf29d6bbe517dd952b234886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/az/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "935c0697a13e020589cfb542ff61e5c67a0ca56f5a040d553b0d92f45efc79d7e5a1686e8981a88a01a307ccfe53284e4362850d95a8ad50aa5eae39e351e808";
+      sha512 = "fc812728d7bb259bd541847ad51f0614b051f13eae4c794140dfa8a651eada2ee82c36cd7f76c42252ae1bfad44f63d01f77d43f91e55f08f047f29f5b8dad5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/be/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "d8d43189178768267a5d4d66a8ae06918d4ab77cb400e1a40863a42f81ca9e75f9cef82a68f99c8e29edf8e9b3fca5af917ddce2c0f5a9ac257d9be02b3a143a";
+      sha512 = "cd12fde14e1f157ddb938b38e99ca05173aa8e5c5b09dd826c7aa2db8159dc1b123a792a772b226939fc44f5b9b364d630287431b3326394a4f964b9c83ba337";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bg/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "31835edca2286977c76544c6885f8b716c67c871276fc9856077d00292eb6130a4d4345ca56e7ae75c392863a598711f69882039145668a95194a65fc33d934c";
+      sha512 = "ee5f3d9ea385450b0bb3da154480b0b0d88c345fdab8a6ef43380d512c10300f5b00ecec28514bd74abac3b2c7ce492097b0189c4d7680fecc512a171edfb55b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-BD/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "0ba71a5ce4a1966845e1ffbc9e7253980d18ff429e7be9a600c9d3ce1f28eac8350b1401f6a43413e86c8d4a552a2ec3f490dddeca9e34569ffb5cd56cb3c5a2";
+      sha512 = "abbca7a1410c717a8922d8dd0bdc2fe14a4a699f4ba1887bfd443466be523f5a0aefecb5d8163d1b77ab0a6448fe2fc3559933a5a8fbe7f119c45ed1bb4c48ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bn-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "1e42024d4f5dab9a8cf37c6c9070617a5f4c631bff3c5cbf66a4a1d5d9e893fc320888bbefa6747a665b6941ecdc266537b539bdb6e165b30da4f832e38bb09d";
+      sha512 = "02bb6fc55ed10d05061071640bcaa8219ea719c3645f368c4fba44ba5accf71f8de9b7f4b9306dbc5da7716f4bfc3cb414706a31f336a8d24343f9de5c4c0a23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/br/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "0189234479d4b7da251571860f71c88d7358609208bce5bc698a969f054226a07442864557ae51c4a25955cca4bcef409f6a8aa347b00a1fe438d53325925ce9";
+      sha512 = "da929fcf02a4b08ac03f5ddd076e5b1433e69daeab0b246b0f475da0e56bd6b7f122ac14e34a14960e1d5f881ce2b9b9764c71d3b0245258bcbd3e57ad9c7a20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/bs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "03d15323c53d30c52b71a9046370011f39a8a8f2386be45d1bdc014fff1d4ea6efe979a199d3ee63f1fa18b0c7f5ee552e9048863b6454418d89075a70ff9dde";
+      sha512 = "bffbfc0f14495524555f3acaa0ff7bfebd605dedbbbbbbcb29abd3f2bdbd5b5d924fa562502af8f62714f11a00d060c33e8d9b3fc80c6410796175a04f8c9e70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ca/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ecb246da96e682d5bd0706adbfb2b6448c16c1bef9643db453d3ca17484b1a929c0eeb8f0a1416cf18fd7eba489d897f29a148a41050cb0603121b2c819e0a70";
+      sha512 = "e8bb642b9498b300c6f594cd1865776b633a2ab7e92b0171860ab9aee14c8d4d1845bbd3ed2417b8c3fc035a297bdd36d668f5b45eaed58adee0e6f5517ac5a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cak/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "1ffe32f481faf8c94450bf873b3391db3546f0692b5697ccfd76ac0fdc493a8fd9278c8c196df1b36468b62ea517fa120acee9bb610a66eb27c69641b4f22167";
+      sha512 = "c9dc7edbe2b7720459afa58e1ed2949b48e87edd29bebf4b9911e4d78e6e8b00cf0f81a5c36fe5e9c01d3c9071604acf9977adfb6034d25f88d48f7b171dc336";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cs/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "9f5754d2cb8ee16cbc901202bb59696bba08848c2ad739fd689b295fc2603ed72803acf344a7756b19fcb046490ad2acb878ad065cfb177e1c5c0df1ddb9d0c3";
+      sha512 = "e0c6aed3db6b4076d75d3eac57be9dff1198a83ca70043355c0ba5b2d9c3327e76f159fe3ba957379b8e59a4014d1231a9092876d3226c4da1643fa19bab13a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/cy/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "d813571e696ce1d4b404c6167016d591148de7d6e02b8fa1df2da5dcefb55ae71649f3a53485024ad90fd33be94c020433efd7911b6c1f6c25c8380f5819e6e9";
+      sha512 = "223f90ad302b6c66afc9de7c1cf0b9cbcbfadefae2ec210d53399f6657fcabba0dcc0068e8e17e3afa68aa94e9ee654544ea5307a957ca26606a2e8777509cbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/da/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "1ccc37564d296c42f4b35a2214cc21d1a750e09e0c99555284f769ee7e3da9674377230e9c2467795bcaeccc2745d4ff969c4f5d4dab1bbcb216f7817bd7f100";
+      sha512 = "ed8199b9ba53cc4fbec41ffb68296abe628853029fc2f0f2d5cf13e1262b99a212070cc1ccbef67598d33bbfe94b5254fe4eb14d980ca0d13b4f6282bbd96b71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/de/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "be419aedecd14cd7458eb984ffc040f2f9d0316ca1b078adcf4ab0a1ae6f2acb7c04fbf0b43520aa5492ab3c9551aacc59e9c986434d466eb30b48cbcd4e70d1";
+      sha512 = "69daa139c5e88da0dff1690140876a19f3fae674f5a9b5c77bf74ff93179cf14a5ff17fcd2288f2d1bebe0e6bb8ee78f379e6afa564f7984c0ec5b05dba46318";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/dsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "41bb68dcc0cee8bbb4050b463648f8f59ed0f1bf4caf701f9c3ab9ba7830caf6655b368798cda6fde6949b4b04ecb1c73637d1db1aff5cfef3bbca7108d9a8c7";
+      sha512 = "dc8d69e8b01a2e6166acd15620d3c4a794160ba079fe0c618be31fb1df1bad320a692fa61f2f924a3e377ae36359ea732e02fa2090eba61ca6385f72759e02d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/el/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "42126ac31e47ff7045f43277b80bfb49cd241fc1a00f652eef3f0c2bc2a5de05c4bea6906287bb72dde52f5ecf58726cb3ce8a42081916d3af06b3b621c88647";
+      sha512 = "1b265db34eaac4c303805f585e147aaae408854c83bcf41c8e2c6934084f971fecdc32c1c33cd113f5e19a821db54e7c91fa2fb8ab9521987d2ab3ed8141a8a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-GB/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "3f475233602a09976644ba68472538f85885c54979914dac838be7df912de4818a9afe170e82c8f980555f5da6889db6fc2efacd932eb850bbc4ed6b28a41e2f";
+      sha512 = "3306b84daa72d3d70918f40310121c0baaa87ae967441083f5fae628435b75e85dccf941f6c30562bb45afb15ae4b5db5d4f28cfcfeaf8919bc153227f26b804";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-US/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "e500aee682c57ebe120a312a127801511adcc54c7e19de33e8f80bea457175f6139a7e306cb1bc43d63f6d150fc4c98ed0709a62ffef885b3ff87a768e09cfdb";
+      sha512 = "49c9f5883495e6cf68754c71b4b14d6ae5d7c508805c0ee610d9fe2603d15accaec8e4083fb4c7a76b5b26fe76d3d23c1071ef7dd267a318898a67df5fc96870";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/en-ZA/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "850d44141894ca1a5d98fe9e3391a4ce4f8fc3c0db3dff5c1b7eb7b75085add18c03da6984f433597102c77374133b2b4b48262d4ffa3abac8de6424feb6c3dd";
+      sha512 = "bfe04cd934fc5af29d6d823c77ca1f0a7171ce143d4797c203fa5cff5e33652d8c71783dfb933afdf6980bab97b7c889167a2614ce7b3199dbe265441cd078da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eo/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "ee8bd8595897d43db06e8c3e3247c33910c4665111f1e2a0101af5eaebda726a44167fae82bae309d391de1901057b97901d1ee6162163bcb565c630b1d72974";
+      sha512 = "b4a193e681322e104980710dae82fefca4c6f2b007ac035439dc95aab28046e2193de94656682af0f18a63c91f7bd724ec69fc2b239c7e633a93440f4ef5a0e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-AR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "be5d83bf8f06e55bd0a23a9e3338368cd4cb7f2126d88782d4916da3b866a72a6c0da213f3151ea09df4902000db55883aa12aee5e3f5e512507217cc01c5678";
+      sha512 = "ef041d3cff46f7ed02192db781193bca9a9f903f68c880f7546f49fbc30d9a01ae77d31f3717ea27f4617ad70ca838a89af1a10722e0c20976590eaa596c44de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-CL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "0291d7a79dd44ef0491043da2af90c8caf576ba8cae370d3c69f6c7fe866748ebcb68888da9cb5e144745a97e0b519d46fd2f57cbbcf19d3157ef5c3e2d4b3e7";
+      sha512 = "b621992d02150a1aced53e0298277944aae6463d06eedc6a18c8cef3995fd9d8c68f149d81b0d1261bbb1e0199697e8f169a73ea2db0be5bf25233649a175442";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-ES/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "490ce118948632d6b64d8c4157da8ac3665239ae7db5ed4cf6e176b35812d8a73ae535b93bbc6f4243c4f8ad8f0108162b8bfc0ed89d8f74c85b51aab977897c";
+      sha512 = "7236f8075a63316244b8c398996c486cc8a592e3be85029e6050cb1d01d037882e892a31b3e61f8554007d6c653497df244e95e57d59bee13610a36bad2eeb26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/es-MX/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "ee6b365694b32964e17c15d37a621732185af437750bf6b78297c298931f1fa7e3477fe944dc52da6a8d8f6c2a4ee13340a37a5efd43d6c7d1a7ac4ff7be9502";
+      sha512 = "9288f03925476f2baadde3ad176763883b365dddca71290a51396f8bc5367d19cdceedccf7b9a3264dbc36fb9f49b443b6d1761a87b0f2c7d5c74dfd469d6a86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/et/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f82a8e742f0605326cf4edacf5f3875d9de5aa8b77c67567b42898fd5b86575ca4e34fe11ad3274b53ee951a4fee4ba3a1050b075e105d675175b58169b1a02e";
+      sha512 = "a75c0f644828cb6a2feb33774af2ff3374070693267983f7d9f92b94a1e4e40dbc75eb818c86e8c8682e76f90903b094efd4a0146da2f2594fe34df7e3d0fcb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/eu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "16e9db59eb9ac08f14c5cf36496ed6425c210e5ab71bc290e72239b7ef6b38070e000d889e5747763e78bc6bcaeed4bce0c45bc0a3f60d5b27a87038ba311035";
+      sha512 = "1f640beaed898e8c62170699ce997ef6b186a776cc2b54121c796521f7da3bfa89e40213b21d15fcd96bb0c7f526bec00e87e519a262c205b7696970382b7467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fa/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a6ddad3597feae0418e0bae57ecc507372da5a97b71048c2381272dc30e85109880cd56639f2089996cc5f652ca3b97f51c0d3022c1e16ecb3b143865db1d326";
+      sha512 = "6a70dc133122dcda74a2d78c350ed405c3ae7362cf8ded43493d8d5062e310d1501539407c9ba4ce871f99022ccd5336f4c0e1a2537ac27aa947fdad2dccc71d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ff/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "9701cc05e02c4cd1f28f056c5b19ba19bf4ff459df7a8fd185864a4b0d5686280669d4eeba38b20570d01459e5e0080b2faa7118a18bc2da36f99a452f7f12f9";
+      sha512 = "a5e03e293d293e219d6ed3216091544f3dea363c7d745fbe603829fa10390ae285ffeac9103c046f81a89acd53403b0c0a372050c1b8a5fc591303c7d27462d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9d00704ac0b02ea27a06c0339b4937aaeb40cf50e3ec6390c3c56270cee589e480a7b7f014fd03d86db970cb70e67b762ad4b728ecfbdaebea1ea2fcb6a25bb9";
+      sha512 = "7f88b803609ddc1bf173ac6c7b4ba7f2f748a44451a1bee857ab2f6000d3cdb5d0ba7518d00faaec64c5f162ad7ceb771272569efba5e20a66b581be9e1fabc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "33b0201e80bcca259edf60618e582b1c0ae0be1527ec105a81d972201a6439c9b8eb39fbcf9498adccfe79193dbcf98b7863c62bb0f230c0fe9912062522cf49";
+      sha512 = "9190155e48bcdd5497dee82307146bf4caa4dd1ff4b1e198daf9a6cd5bc7ee9f53ebb08420fc896af8087904705591d36b578a24ffcafc0d7cd4267bb8e0e795";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/fy-NL/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b8de8b7f0aa9a399e8df81169567df5c3d4d20d40cb913749fe848bdd81e61eb5f0120b9836526c65ef58700120cac28fd43d2d8ea65d6ba28658bfc4b08a954";
+      sha512 = "bb91135bea41bfdea6b2c47a8982ab43f6cbc07b1cfe4f01ddff85f745416f52207783c7253fa231294e1ef3406624b55d01bbc3d08704be303730a6b72271c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ga-IE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "e10cbd32691c5797ecd2894b12d71568108c5ef48792ba8dc620b09b7f4819f6f5ab7ff41928861d7297bf2c72e1269b001afb8bf550ebef3f66a1c9caf7ef0a";
+      sha512 = "beed763be6cdd4eed7a2dd6ba5ccd56c9747905e331d11f2a849b161c7dbb16fb08c32a73574e1e127f07688e75261462e90f78853a9f68bd240ae68c20823d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gd/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "45a04cf4dd3007cf8976d27be5b318a978e04100b4121a63e9d5feb11d3208fef85cfbff27d71e0f46b7f70bdaad26a9a588aa7c89adac61e8ff87e3db46df64";
+      sha512 = "2ea035192a894496887dcf71b01834027be7f4744621f4eddaaf93d374399a03564aebcc747fc79d6a4feb3f28ee4f45c3e3fb2d3b849194856ecd7e8e8b89c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "77406b8edd59e48099675d3f2c9abe6f53259645f718d465aaa6f11ee12afc88a0577baa5f9e3f0efff54c025510d4ec4b4277f35401d8cd8fad212c1aa7c215";
+      sha512 = "364f07c66765a125f7c2d46784d3dc65b46881719131da2966ab59dc208e4e28d5abeb2e5e22ee8b31014e09b60199e2f78ba3b2d8a051ca93affc26cf5bd92e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "0978497ed23eacc9e18bd348e115266d4cc2d16ec51255cce2d93f7faa4d335067961e59ff44a7dc3adbf36dc96aa1b8383127d617a82dfb22b374a92e2cadf7";
+      sha512 = "4452a40b3f15e8ad7515fa8df963d4723b892b2fa2ed06c9a75b24ccf8d7d7dee01fd550ec75dd106f3e839d7639ccabeabe7113a59f920a848e946e07ab40d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/gu-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "6458a6352c72db89496426dfcd9fad79cffa357d129fd3fba80a13ca2c903d9846820f453e0f480758bacc1fe0d3254a2e8f29c94db00a139402c83869974602";
+      sha512 = "a93b16147be352b2cdf4c5ddcdb92bbaa611e43b051e54032803158850a28c8a66970ba56c07d538a68a7ce703cc9fa449e8e0cf89ba4c2dc3aaed3adfa8a4e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/he/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f60cd6e3fa1d51e4f02044bea5af0a48f6c5a37865fa96238712eca362ab3ee9d5900b421ff2c0b1da30ac221455196940f62a3393a28fcf2f756a6830562797";
+      sha512 = "4d47dda173e0c8ffe8dd94b803aa7340de3dc24757dbfde6e18ba652c90a241c0c031d0e1d4002703ed2d5a046db73440eb20c56a8de36c35890b4455cd7a092";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hi-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "4ac19276ff52f8ec8bb939ee87cec2b462e8c9e056bf6b00b2099fba0fdeb23602ba3dba0a4b93e03acfed82e3d6e6e9846d8881efaea61361badd88ad119738";
+      sha512 = "9f6e75b7dacfc1fbf1f713948954101cde55866d9f17e802c295e459abe076cf379848231580a2cd240a12acbceecea2d9d5085d7077d9f5401a8310bab94f2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "a463e9edf4ebeedc1be086d43ce798e0556f852c3e8f10f8b935424fce6e9af3dc7912d4e4a5bf1f3e6d9855588cad9454035cd3b67f303713bdb203379d64ad";
+      sha512 = "b84e51deedbfe48d381eecbc43383e8c9db95b9444d6ab418a9ad03336164bfd9e46f62a2b8dc676f524a148b53d37cfb1dbda8f53fdc20b0ecf4c8d67073e16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hsb/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "7f55648abf6547e236551d7409e598702c00bd17a844c46ac53fca70c433983bdcca8728902f8f040e5a8ee456bd339c15daf99eb06e93fa6145e983205e8b77";
+      sha512 = "ff9cd81e57a54e123f06399168847d7cb41ffb36618002353140eb83d38d3d8bd78304c022f011ad703ec8e54b19310810f3c9e6951e853da4dbf6fc5ef4b990";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hu/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "41c3e4981e582c3c2ed24b3e463fad58d6e57d60d5336dad79c568f821d03f5f1183cd16e6886f136ee19d27cf0a2c3e066385f1f653a4de37c82ec9dabb77e9";
+      sha512 = "ebf41ea935a6cbf3858aa8874518b345574b6d32a8e16159da2b5c219766d38aeb0207f4cbf90dee1ebc758676e65275a885d932dd148eba1757682195683bdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/hy-AM/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "1bbbcfce541ebabebbde96b76b9ad20caf5d88f018b8d81be0eb6887d1ac45f278f71032c8e48901ea527bcbb5b97da2e0c30c4ee644cbce3e4f2b913ad623ab";
+      sha512 = "770c9df8b2b8f317720d06e4b33ec13368f47da4e5d1344f676dfdddfb17a18036d2ab69f8954037d779bc64d4263b49d629d1c4c81652faef50aac90ffbb7f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ia/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "6006e946d16d59e584f5bba96c0016ff0f82205b8581d5d43f8e1789a3b3f14a8104019c85847b4c9b13673b47b48dfe7ac572c12e08f7a7593b2ce404bdf75e";
+      sha512 = "1a1f0706b37cc94980a592efb50b321bdec04594577d5e39f45274f76d68b4af44a84c2976f91e6992cfd2b29f7ef1bc2a8c3eecd06f49a846f36e3b588238e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/id/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "3391a9dcd336b26d069c609f1806d0ea98bd9bd85688c006a5ff271a494d33d3d5f969122c12f845348bbe6065ceef5a67516816f307ab7409ee68a282d4fded";
+      sha512 = "8d300560c54e99420aafcf3752e157d256b215abc6894d7d84ac84056b1537addaecc628dcab1e3bbcc0533abdf6d66d34afeb63cdd680d87cf2f0bbf2d98018";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/is/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "5026484442691f9d5b2c7c22759b8ce43cbcf19b5ce91644341fa18039f851d812fdeae64eb71fa27e016237aab33e3fd0ca6621c723e0c56b9156165d5d88dc";
+      sha512 = "3037344bf8c3c349089ddaab17bb5087cc6ff08d037426dfef379fa446ce9352b05ece1fb38c78c3f91eb130cec4055d448d8c8c95df035d2289872bec3c2019";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/it/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "64726b0dfd6ef6f2823249d794a1f7fa8bb31dbf54e120f13aeaa7aaf9ac56860b388e2cb6c1f51f33d4dade9d703ca323493570a98cde38adb4ff7d5ce76f8a";
+      sha512 = "0f1c97b9424024d06bd2e55e9b19a6aa1a864bbacdf1d3472ca49154d7b0076e672166a50152e9a79081fcb43482195696ce2461a6f2460f089306bcf8010c4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ja/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "08b0c2fa6fcf3caf7174bad1268e1ae8c3ab3273f4d6780c6aafba7ef68b7cf0535010aaa2af2af17b91ab48f979af2d37a57e980c4c6fd0b3bab04b020d8cf1";
+      sha512 = "63e3258ea9d03222922fca33f490539ddcb4665d681fc3cc1c8ee9c7aa19497eccca0e112994d51256b8dd674487aa47a907511fe1b1c0880aac42030fc8cf5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ka/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f7fa6326c1c10de051727d4c83eac04c633f730a08dbdbad3de228d30b0f57a0b158891c910348083279807bc9ae7eeb43ce0a317fce338c1c84553a3498002f";
+      sha512 = "dd3f7edee883324c2794a5753111f051efec6c1b406166e2a7952b57e29436a3cacfa959cf20e22940cceda73a6450be4f41da0c0d40b234f2260ec0aa7a2690";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kab/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1f020762f8b8cdbf35b316ab041f16243d6df19ea84457b68b6a969e5ae504dc58886adb2d28267cbb6b09cf3664db4a8b0d475ab6b0cd382deff5f15e627f96";
+      sha512 = "405580d9f71e674122c034efd130597e4c8be01dcaed041bc12539343ae4a7ca3ed3dc0199c246559fe44bed48a1445e913a39a7bf0a9888df590295a6d0fe1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "3859b99a6ad2a14c176d19db4ccd3ca2ec36e57a92661af12636b111f6cb39c64c871066bf5334df90884ef103ff6be5d982e1603dca8feb98bc0ba53b02f9b2";
+      sha512 = "a2d67dd6cbe543f6baf46441fcdab2b4282a2a3d42d91bdcdf14ef4f6e513ac22c6d8a019f40b4e7080f17ac4ce83e1479b05d8f07d19f7e770c8ef691c3171c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/km/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "c168e337f050b09fb8006b550781a6da6cce79a3fdcb21a51c6d584b45569e872480d6a950e56442e755c9fb5fa7b8a8760525977ad13fe4372f67738e48484f";
+      sha512 = "186bc96ab6d55812c366048ceb1e05ebf4044401d6b67d7e8aa81c306a4bed26ef72a5ca25d3a0dc468645b3fa5b0016c02ed223ca5c2efd05656bb6519767ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/kn/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "b59318bb6ed70da73f6803319bc606ada26a371c22e561f6460d2968da013bcd976602dc5b30e6b44af8225a44cfb62a121d5c215cf693196e7ccc5b23548b84";
+      sha512 = "538a8092f3e8c6d684d0de7f909cab7732b8c5bc3da722ee8c1cba4ef85f814ebac964db9803c245ee6065cd7bc6549cb2cbfb397df81e0d990a427bee9e9d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ko/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "35191d28de35f4e37ae8184ecb3c16f2ecf10cd8dc451f8f79471d480c3cc885c48abfe5723cc367625ab9fce570b79ef5898457c98198b1ca34905cf195c7a3";
+      sha512 = "f16f1fbf447ed9e026c924f68d5d3c04ca68320f0e23cd5ef1eb288ff2d50bd95332ba3759410a48d0a36fbeaf390cf8fe5537a58aea58aac64ca2f04e870c78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lij/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "4db053b433dd7adbcfa5794b276c7c107d0601bccc8c85cebca4796b18d0c8001ad1ba413c4c1f755e281c1ea16eacbf722f04e4d600ec77bb9ee13bc5fa12d8";
+      sha512 = "62ef181fbe71d0b91fec36eb90cfdb0c76a3b0eda2a6a3288528b1414a18a73c8beb0428e5cec0bdf80a3136541e92d9b302b0a880a4f72c568f7ca7c2d069f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lt/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0c32453132f2a220d47337c55ab41211f6b3af64f9c365f7cabb4386399fc877f670193f72157cfb7b9d6cc8410346d33af3546609c00530fafba0c7fc07e480";
+      sha512 = "bde5365d7d77145f0ec0d1256496f303d78f1dd2f7459ec8bd376c4417f71f585239dc85b7c0752cff9121ba6190ee831163fe8db4cd6e5f4c8282a25fc736bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/lv/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "796d5f0459f2cb67e5fd7e763a0b30009097aaf6bc6767c21fd32bb18ec45fbdbe600384dfcf296a6c29bf8347d2e922165a1e3e9853ef59ecfcbf56715d122e";
+      sha512 = "dc7167af19c73d430389aa5ebf7d2a3b52193f195dbdd2a5f82709771fab4c8180fde202ea35268b62400aef869d6ef0cdbbcfe8e1d45ff07052dafd58dfb78c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mai/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "189620d864ffd79b78942ddc177d9749285cfb9f3c289a1b3c8fdf7cceeef9d3695ef586bc07845476304bebfa8af285bdcb0d150e7d1e5661d2fd4bde46db5d";
+      sha512 = "3c853df6b14641f94ffcf20f972c82dfbe883c176fbe4e20a530d811ddafddddd935acebfe68a4857f8d33c58c858ec31c4a0ca6f8d58d717a51f506ae880d87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "d17696909f8d3c3016c270d1dbd2c537acbba8846105ec88c46f337cb97ac05372a1acb4ec0120bf9fee35b5e3f72b65235b6f062120d63e61ff20c37e09dde1";
+      sha512 = "03de4d0db15191e601eb73543f2794053eb0d25ec1161e668d80446d54e664b442e19f121bcb2a09e1626c01ca6a44f62cb85f95fa71474b394647d1e07d63c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ml/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "dd0f67d9b205490f1205a6d33eea76c18bea40372f08ad84bf6e8ab4ab9e1abd71ef2ff729d692bed8204ed374c13f191e04f8140acacdc373eb897122ac93e1";
+      sha512 = "bd11447447f93dc062ebf121578c068e36892a0594470a3bd03b16054012fe5af66f3ac376c694f7f175f52e6066608de78a4724ff79a13b39138bf94b49c963";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/mr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "9da4f47e384a45b976de48967bafdad35b2ba418e2d6e260ba3c6859be2d0b67251099093071f4c0c93b61d877ac1316cbf6a217926c77cc35841ec7a4b9a160";
+      sha512 = "45f5f39edf86ce562026ca86f4749536c1f7a4e22381a67885bf0ccf1e1471048fb16e1601b9292d3d38e6d40412d40b86f53092b24ca51a5c99d4be4bcb4a6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ms/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5698c5c4f0db7d7b9725bada6951519a87a960aec8424e4c725826fdb7316a0b69c891ca32ce7d53d43a2839f7e523a573bed85892428047c41c4e122e168dda";
+      sha512 = "41c2dbcaf152a75ab1b6e5ecfcf1214a1dd7de6bd9d80ec4a88fb70123a24d8f147f75aa02b292cc468ae7f8a86a127756b45a0aadb7ad81dc182b24ae63b9dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/my/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "beb075342de69736b207ac5a7e804575843f700b5bd4166885391cc667616ebc11aac255b1a1d897d607f673d0dd4cc0c7cde0b5c3dfb5a3e492373c63a06d70";
+      sha512 = "ad14e5b1f262373757f0b3d3285a6efefaeb4fc75cf07ee41fd5baee24854b0838b994f57734188cf79a109415bdf738852d703b6704c4fa9d3fd3446204d3b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nb-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "ca5632727eb2f99fe4cb08e151ce270330652ee7ba267c3fddc7ab4213b2b210f3cd4077e528026dde4bcc7e40cfdbcae16bbeb9448942736691c16f37ad302f";
+      sha512 = "25ba4e079a9e74a972a9ad37a2555c5c42d71015ddf461575d12ebd7c2304166df4a1806a073c8a56f07b7d824a6231d3bb5ff00eff58eccc293457d93b3307d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ne-NP/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "548f91230ab8d36e60289b6b22a985f1a9d5af286330734add837a1d75e021713316975cb09afd2157133cf702dd32e9e8b4f1fc07e2d92fb64961ea8583b453";
+      sha512 = "01ab6ae58d1057247759aea87521a607561a55b0e11f8cf01272bbd06070f9aa5c3ca728c2f2041674c90f038d8b5399c8cff25e199d1da4501bd616eaf8970a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "063c0746ba10471a6014413a374768ccad89eddee8d2abf5cf3680fcecaf396676fc9629095d6629fede3e13bf72b7e7a096814771986b2c73ca0084cb767970";
+      sha512 = "1c2df86fcf9efa649bd22c0863898cd91319e05ec2930e7c4cecfc46da3a47449fc7cf86a0fb41e1813ffa05fd7c8d11aef23a0bd2d2cb8a5ed0df93c71e860d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/nn-NO/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "6a8e52f2f318ee0d4518dbddc7ef8c80bb4fd2e0f7b5a962571f5f7bda24bd81c04c712b4a0e121ba3084ded4d5320f0258618e5bae333869b8a1e13f6aa6fdc";
+      sha512 = "523db80c388f657cea7f69ae787637d1349c42874c9a3fb6b726ff6553c789dbd428c2e8b2d207fbc57903e6ff5fbf7493582b91f98b7c497ec96e77b299baed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/oc/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "ffe5948bdad294311b5e57a417fd47e8c719cb1c918ffc3113a90c922610cad6d1c0ab26fb4c369a89f4968e4781a425fa2de895b39395f84cdc91727cb76ae3";
+      sha512 = "52d78064592ebea903b5a05669ab73fa3e86d2c0ba014a6b4199138a8e0cf7271da513c254fb25a23b98e93d16348e47c2bd1f32f4644257744f9a3fcaa47648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/or/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "c57ea4d7168069797601ecc5f809dfb1af98a197f3a277caedcdcaab93f7e245e7020d8317a60ccd3e5696fa72f13b1a62c51f6eb78e608e943f05614f47d9f4";
+      sha512 = "8eaabd96695c083e3d744b72ae5ce318f63887a7e70681b9f6269cbee2db60309ca5e2dbe35e612d48014ec815266b1e3dfac6884a1a38a08d6a04f802a10a8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pa-IN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "858b988345519cd645d8b812ab2dc13ad886aa6cd8cfec594369d890d162664871a4728119f257179aeb1b16eaf317db71863fb59120ca51c31d74dd535aaee4";
+      sha512 = "c03118fc5530133cdb0298bbe6e041b3edbeb7cb9ab74680410d9dca4440d9d4beb44bf792683bf556effbe24a28d7d31be7c23fc160f5dab27c76e8ef4c7154";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "8154d4883a05426d6ea6956d280d73f5bb9f4be10a95ae0909e74bfc0a82af418fd01d847be2afcf91866b2f26e616d40d5a90f7a483510b16ac611926ea1f24";
+      sha512 = "410c12bb9ab8258e3d6c01c68272228a17116e9f3531296bceb1947091eb97d0e077b8749c206a767c7d18782a4cd2b7a5146fae1195c481e6b17265c1b9f4c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-BR/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "10dcda386ec18b02d365ef3c0f6659dc18002d1620e7b1e8426d2f128aef983389fda0779b6bc46b47bbe500069ad7331d0180ad2d0d0e539da317a4581f397c";
+      sha512 = "d998dbfb46c4bce19d926b746d45b7ee4d9b4353a8c2e8472ea29f51cb41df1b7384508d8d2c51e6090a31cf3349b557511efad9fff48fdb680efec3fa82c535";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/pt-PT/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "13ee97b06dac091a7c162353117cb9c4e6761229b015b61c61ea253f6ebf39049cfcabaf297519da4819de478707d79d679578965e4d8c123bfa3d9ac4cac7a2";
+      sha512 = "eb712a2a1065316711582423d3f930154075654a35d552c46a1efd95c56840329b07c03e4d2587594793d8dbe70e77f40b08a26aff33fe4d6a7f81f9144b8037";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/rm/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "ff97a465cd036b16960997e367ef1d6705599888e89988007afb17628ff8efd8c312e3cf10570e5796cfbef0576cdb3984ed0228f3601be40cf40433d7fb344c";
+      sha512 = "e358146e4380d68dcde78c06aabd27edf025a946d8aced77da8ae5f553db485abd44e79d56dcf4a247935dc37e012d20a85ebcaa7653240ac4a137362af1508d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ro/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "d6c4e54b0f65b26651cdf1cffdce5945d2b9ab47e1344f18a57ddeadd472287f8bfe3db150ba17ae342fc6ff2cfe70d6f067b9ce69875f20adc86bfae1c82e39";
+      sha512 = "fc0ba49c238c9eed79c56213f2a3eafe0239db392105c8d9163c8c6bec0e96b2d0eca89cdddf89fcb3e1265e66dd15ab44bd126841a2ffde566a2aad87754992";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ru/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "8f0c4ee9a619114cc244872940a6224c29bf1121369ca448ef828e5295def03d483a0e36264cd4c174148a182e60ea561e73761f07172d5c99952f39392988ac";
+      sha512 = "2f87f1b962bf5c0bbb9d23b56a63cd097c9fd772c42dfb470bc3b8696f59ec42b314ecf93f041ea8e34aea0a82da946086b8aef1c7de68cde1a75266423aefc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/si/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a963c1f43ee578f078ada5d7a4bbdf104f3de01d910171e44be284ba7c2acb88e101a3f154e344800d38feb2571ec8694dc1c19427e167ffa0fa71656579bb72";
+      sha512 = "71eaa7ea7d7efa95de76c9c838e41bd5a925f7c0736fe60b54e3d38480b58957ac6e48bb64e4ec3c661bd78238f72b94c3d823a59d532c372866b4eff0d4c700";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "8621b33463145af2390fc4dd08443576070a008ec3119e9a28761ab46cbcdec537ea773f6d0004c5ec6ebd9a823d4ad3f358bddcabbf153b62a0e2c5046495f2";
+      sha512 = "a84953aa555aa29a8ac55fec57179b773348f4347b944436053bc54a025c40411c08b0ca318df03b759393793870f7de69cc9c63a2f7bfc51695e9e2dab426ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sl/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b1e6b26af9101b3f6b6de836fbb618b75f58dd18137c1899847e0b0e59795c94f24f35515e24ef77be25825a3ed1921fe78d230989c71f59a21eaaffaad7d23b";
+      sha512 = "c99e242d473f004c614797c36cbf86b0781639133101838d6745eba4d83651d41ae7559928ac7db5f34bdc74f2e9ad144255aea7cf267026f51c15b2201a4786";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/son/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "e56acfc28ea49ec19e93aa36cc470baf7188e9ee2817bee6e57fc37d99c953925123981da0455af7375b7d8d4a2273c9f63a91a03a454d29b96d2964fb5d7616";
+      sha512 = "7fd406b95fd4aea4df73a1804260e7be85e7b30d92a4ab5f912b519aa9a26b42f5c0fbb41ec6046b5f4654fb146747cd582be214bfc167a34c151cd1ff5ec421";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sq/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "76c69116f962c4f41df1e4a0bc8015307f424ef86513f88c972c2d61b533bfa5bbb07e7a540c91bafba7313cc53b0c5002d9be0b2bbd483a4801a3874a7b4229";
+      sha512 = "966404ba6670fa614bb63337de97ad5a3ea25b1850f95c8a79ec965c318aa073fd818cf2299e1469a0e25953a60d1b1ab6bd3ff8dd6475f98e0c84de769c2369";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "bb500d84058a6451158f0cd4cc6c057eb3fdc1d65bd438112f5df8396425d7113ddb96e833ee9ccf5345fa2cb6f089a0a19f46ad264ba5e6d579b943329d5561";
+      sha512 = "c36f8ba24429d0eb7e28b10c3e8fe0bb6ce45c2e82eeaf635fac441a9168ce1c7fbce2acac1f4ee631f2cc772aed509669390b673f8acc2aeb7f778a3de160c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/sv-SE/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "0e6e5424e797a1c5870fb64aaf5b7d84d26d9bd31d74894efd5c7e326c0582a4ce30e7610c463c313c6cfbfd36f3d518a60577862e56638fcfd0cfb8accf4629";
+      sha512 = "afd4b06ad27716c389e612e7dcf37b2551dc66bf7bc6c63c7cb06886c082e9e4f4745591a4915ec924aa8bd0820994f3dd2eb88cedc7e053b29066d6b502e08a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ta/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "9d0b3a76660ae382564bc43268341225aa36d3241908fe727550529fea39066ed924ffd59193cac882d8aa0e306b2608a78d6d11d398e6ff81a9059158af3c84";
+      sha512 = "8cf82519981879d5f3fa77e51a39532a60759be78713acae27207928eb88a7494f14dc4ca1bb0c8acd2e5e4c667bb6a1f6738d1ab13b32c45daa707c90095abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/te/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "556436ce9648c7adf9470495ab8a2ccc33864e92c2e41f4a7af7c476b249035e4e55a43a888ae19e03e6b42fb931767dd1683f7c444a29aff79f931388fb7437";
+      sha512 = "953ffc804424233cc81886f2913a4a9a1f49a16e1e5748c2a7696a7e8305e0e0c6fd99b5b1b235ed864cb36ff1ae59a8e30242c226c17609e8e7b5572eed871c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/th/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "cbbdc94b148fecee3b71bcd23af09354fa4dd453af01167adb8ced16b9499afced409dee7c1a23e02aeda9a452c1a3eb36510ba0b5bd8879cb2f7ed4aaa39bf7";
+      sha512 = "f9287905756218ed481cc9154da2b48cfeeef00ffcac349b3f33e83348ddc4d3f43a9bbcb44a178fa63a3a39d9570159ac39244b9e5749999904a6053562ec20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/tr/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "b21e8aa88ebf570aef2752a2b186347794df3677c4e3a1248b20b94a43e5eb2961545309f0b47b2445601256cb18f277caaa330c9ab12106fa5ab963c6c15226";
+      sha512 = "8092158575953a8294cc1072c586615c9355da4601c6ee40db589e23656d61abf6c71e36fdacbc412c24a7b1af1fcfded5d7cc257d633e90b1ca9d6bc077b007";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uk/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "29edf3dcc7194e6fd0d5d27f354705cd25afc1fe53149964d8131844f1b1c3f0a477c0115a291d78a9d5a370e4918d39fd6fb6c5f5b3ef150bae6052b2acc382";
+      sha512 = "8d7c63622d81912d37229373635eabc8c9005b5287be1b49a1c2e6dbcbc104ede51f5c56e98058c403f5b745292816eecee582d8efa80dcbcc968a578f606ac2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/ur/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "3460c285dbc67cac93b6ab4f477b25b56ab0ffbbad20c302d0901578c045e0f65dd65767de468b5f6b594e69837374405a1338bba7d67e0d8447c76f4b99a704";
+      sha512 = "648b7c95ed6ae65e7d5bbf2f18228a8f22725f517599e97c71701d8c2ea0cb2e4bad23ece3730553b45a95b0c9ab3f92674717420a43cc8bb571ec5f960554a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/uz/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "85ef101a19505520b5f0c15c47ab3699b0dbdc65031ed12b000ccead70a0efccd489d8b0a7140d9d3cf93f906136e63cc51b62de160800b2dfd7dd25e035dba0";
+      sha512 = "dfbb2039de2ca8b3338418f29368a98020bb3d810eb1a31ef10ef5e82ce097afe5dd167859a9b3c097ff2f99b8127ce5adb0b354389fade5a0635953897bed15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/vi/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "9de749c7e72264b48609d0485790048052394400ccc91dc0dbcddfecef2a6c81ab2035354aa15d3f0293339a086099e68d414f703a32b00a6c50a4f360c665fb";
+      sha512 = "3d5e0adf9c89aca8e7eee5771aabb095ef1cbdab84a73f7d44c2b4419746095d25d239d728ffd143c5a57683578892627d20943fdad3aa2bf2459082a6c38c0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/xh/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "d33b836d739967701a95776a7b19c1b0d6ca681ff3e471defbfa1a25c8bfad681dffde12f92d04ad2a47433a245326f0cbd0efa0654b45ae5ad6eec7efe5ba36";
+      sha512 = "38220ba22a453adab180f968d9f5227034d39e4cc56ada7d38a333d4d19dfd2b16af52937449c7a013c6b42c9238068aaa16ddc2899b53edad980d7467f7edaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-CN/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "5d8754131064ce271f708b30c658cb16c360b083deb62095a3a6639e547ae672cc3554300105fc6a1a947b71e732a612bd208bdb5a5a8da2d59da63c1e9be9c8";
+      sha512 = "eb793c434240a3b17975ea860b9aca6a695e4c51eb19c15c16fb320475f8a2e91631d1f8e74c8caac9ad5d34d4f2e522fd97608591f5d33f00401c68b0cb6e05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b3/linux-i686/zh-TW/firefox-60.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "e3dfd19dc6fbccaf4b300a44eafd8f9b10ba9838f8650569df5a397204c2374fd797b00b257a6b7e775ee2f9a5ec46ab37e1fdb0008ec35207b17fdb6f407223";
+      sha512 = "e2c16a1faeb1caf05f5d826a6d3e5a0fa5a18884518d70db25a3a92dde9776541e1ce4e2931885b4cbe3d168957e867d446aca1d88c50526ff35349f5545d48f";
     }
     ];
 }

From 46e7e5c898fd34b9dc51b789f3d18c3539a71a9c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 21:11:37 -0700
Subject: [PATCH 074/170] rofi-pass: 1.5.3 -> 2.0.1

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -h` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -V` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -v` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --version` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped version` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -h` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --help` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped help` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass -h` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass --help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass help` got 0 exit code
- found 2.0.1 with grep in /nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1
- directory tree listing: https://gist.github.com/b535484b83f99920256e8f30a2b337f6
---
 pkgs/tools/security/pass/rofi-pass.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 61f51973ed3..3928f61fa96 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "1.5.3";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "carnager";
     repo = "rofi-pass";
     rev = version;
-    sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq";
+    sha256 = "1r5z9g2kc6qf9r2d7vanzdc594apf8fgyn1rh30fvxygl2976yrw";
   };
 
   buildInputs = [ makeWrapper ];

From e43e8254a14975a001e600ae1e2a688d7cbe7ed5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 26 Mar 2018 14:41:05 +0800
Subject: [PATCH 075/170] neomutt: 20180223 -> 20180323

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

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index ea7e7ee282d..d9c2a136adf 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20180223";
+  version = "20180323";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb";
+    sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w";
   };
 
   buildInputs = [
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace /etc/mime.types ${mime-types}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
-    # that has tests (20180223) so we disable them for now.
+    # that has tests (20180223) as well as 20180323 so we disable them for now.
     # I don't know if that is related to the tests or our build environment.
     # Try again with a later release.
     sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c

From 8163358cb0c766be78facd1ec5c5699edf745e4e Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 26 Mar 2018 09:39:17 +0200
Subject: [PATCH 076/170] testssl: 2.9.5-2 -> 2.9.5-3

Bugfix release: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-3
---
 pkgs/applications/networking/testssl/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 8ac2f7b0a3b..24ffe61b5ab 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgs }:
 
 let
-  version = "2.9.5-2";
+  version = "2.9.5-3";
   pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
   opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
 
@@ -12,13 +12,9 @@ in stdenv.mkDerivation rec {
     owner = "drwetter";
     repo = "testssl.sh";
     rev = "v${version}";
-    sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w";
+    sha256 = "07vlmf3gn2xa4wam2sql6c1s1hvj5adzd6l1fl12lq066v0k7r7n";
   };
 
-  nativeBuildInputs = with pkgs; [
-    makeWrapper
-  ];
-
   patches = [ ./testssl.patch ];
 
   postPatch = ''

From 2642940e71eb6ce42e6f0d00392285a98c60f369 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 5 Feb 2018 14:44:54 +0100
Subject: [PATCH 077/170] mu: 0.9.18 -> 1.0

---
 pkgs/tools/networking/mu/default.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index d0fd7af1290..f8c3d754100 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -5,28 +5,32 @@
 
 stdenv.mkDerivation rec {
   name = "mu-${version}";
-  version = "0.9.18";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner  = "djcb";
     repo   = "mu";
-    rev    = version;
-    sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y";
+    rev    = "v${version}";
+    sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc";
   };
 
-  # as of 0.9.18 2 tests are failing but previously we had no tests
+  # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests
   patches = [
     ./failing_tests.patch
   ];
 
-  # pmccabe should be a checkInput instead, but configure looks for it
+  # test-utils coredumps so don't run those
+  postPatch = ''
+    sed -i -e '/test-utils/d' lib/parser/Makefile.am
+  '';
+
   buildInputs = [
     sqlite xapian glib gmime texinfo emacs guile libsoup icu
   ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ];
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  checkInputs = [ pmccabe ];
 
-  doCheck = true;
+  nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];
+
+  enableParallelBuilding = true;
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
@@ -45,6 +49,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "A collection of utilties for indexing and searching Maildirs";
     license = licenses.gpl3Plus;

From d09b4d7b2eca0e39b7b84d61515add07f50763fe Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 26 Mar 2018 12:25:24 +0200
Subject: [PATCH 078/170] tor-browser-bundle-bin: 7.5.1 -> 7.5.2

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

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

From c9ea1ff5236d141e07d279459d14f3c6a3fc5174 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Sat, 24 Mar 2018 03:35:19 +0000
Subject: [PATCH 079/170] mpv: Add openal support

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 6723c9dfe1f..421e0dbb8a3 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -32,6 +32,7 @@
 , youtubeSupport     ? true,  youtube-dl    ? null
 , vaapiSupport       ? true,  libva         ? null
 , drmSupport         ? true,  libdrm        ? null
+, openalSupport      ? true,  openalSoft   ? null
 , vapoursynthSupport ? false, vapoursynth   ? null
 , archiveSupport     ? false, libarchive    ? null
 , jackaudioSupport   ? false, libjack2      ? null
@@ -59,6 +60,7 @@ assert dvdnavSupport      -> available libdvdnav;
 assert bluraySupport      -> available libbluray;
 assert speexSupport       -> available speex;
 assert theoraSupport      -> available libtheora;
+assert openalSupport      -> available openalSoft;
 assert pulseSupport       -> available libpulseaudio;
 assert bs2bSupport        -> available libbs2b;
 assert cacaSupport        -> available libcaca;
@@ -113,6 +115,7 @@ in stdenv.mkDerivation rec {
     (enableFeature archiveSupport "libarchive")
     (enableFeature dvdreadSupport "dvdread")
     (enableFeature dvdnavSupport "dvdnav")
+    (enableFeature openalSupport "openal")
     (enableFeature vaapiSupport "vaapi")
     (enableFeature waylandSupport "wayland")
     (enableFeature stdenv.isLinux "dvbin")
@@ -143,6 +146,8 @@ in stdenv.mkDerivation rec {
     ++ optional vdpauSupport       libvdpau
     ++ optional speexSupport       speex
     ++ optional bs2bSupport        libbs2b
+    ++ optional openalSupport      openalSoft
+    ++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL
     ++ optional libpngSupport      libpng
     ++ optional youtubeSupport     youtube-dl
     ++ optional sdl2Support        SDL2

From 9ae966aaec02fb89a423a32de7a93252f4aadf81 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Mon, 26 Mar 2018 14:44:32 +0300
Subject: [PATCH 080/170] fd: 6.3.0 -> 7.0.0

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

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 3c826206869..889f9d56d93 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "fd-${version}";
-  version = "6.3.0";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "1q666k7rssjd2cbkm8bm2gsn5shlkh756qpam53kibi5ahrwa7dc";
+    sha256 = "0qykzkwrj4w3i5h1a328kadd7fgd91w0z2n4xr6i3csyaiwwgd1x";
   };
 
-  cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r";
+  cargoSha256 = "1qicgfaqzjm7sjzgxkci6bg495n227pyicj4ycds5z6mfy15hi4q";
 
   preFixup = ''
     mkdir -p "$out/man/man1"

From 35c8106701d663778d883f71f264889b3928e440 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 17 Mar 2018 13:46:09 +0000
Subject: [PATCH 081/170] gnumeric: 1.12.38 -> 1.12.39 goffice: 0.10.38 ->
 0.10.39

---
 pkgs/applications/office/gnumeric/default.nix  | 4 ++--
 pkgs/development/libraries/goffice/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 60c8b0280a1..badc02a3646 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -9,11 +9,11 @@ let
   isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
   isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
 in stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.38";
+  name = "gnumeric-1.12.39";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65";
+    sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f";
   };
 
   configureFlags = "--disable-component";
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index f67129c007e..6cdd19f307d 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.38";
+  name = "goffice-0.10.39";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "443199d7a9833fddaadfc4f9065c289e639eed480de316f37da816e396bb9764";
+    sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 760e972a860b88146e58a7d690787b4ad14f6936 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Mon, 26 Mar 2018 15:41:39 +0100
Subject: [PATCH 082/170] cloudfoundry-cli: fix build

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7670add775f..bea9a0f65d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7575,7 +7575,9 @@ with pkgs;
 
   cl-launch = callPackage ../development/tools/misc/cl-launch {};
 
-  cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { };
+  cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli {
+    go = go_1_9;
+  };
 
   coan = callPackage ../development/tools/analysis/coan { };
 

From 8fe59b5b297543c1186190bda7ba1b2ac29876a2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 26 Mar 2018 23:13:46 +0800
Subject: [PATCH 083/170] calamares: 3.1.10 -> 3.1.12

---
 pkgs/tools/misc/calamares/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index d4ee1661801..f66cc60c926 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "calamares";
-  version = "3.1.10";
+  version = "3.1.12";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "12phmirx0fgvykvkl8frv5agxqi7n04sxf5bpwjwq12mydq2x7kc";
+    sha256 = "0k59wnch2gmbsr5dh5swbjp4rkf5c1ml0n4sxf196wdasraismc6";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..a5d1021c35d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -941,7 +941,7 @@ with pkgs;
   caddy = callPackage ../servers/caddy { };
   traefik = callPackage ../servers/traefik { };
 
-  calamares = libsForQt59.callPackage ../tools/misc/calamares {
+  calamares = libsForQt5.callPackage ../tools/misc/calamares {
     python = python3;
     boost = pkgs.boost.override { python = python3; };
     libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; };

From 4874ce17019cb815a7f8bf6fd1d23b453faa2a01 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 26 Mar 2018 18:47:31 +0200
Subject: [PATCH 084/170] dockerTools.tarsum: Fix upstream import

---
 pkgs/build-support/docker/default.nix | 4 ++--
 pkgs/build-support/docker/tarsum.go   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 653a651df7b..f531f1349c6 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -44,8 +44,8 @@ rec {
 
     cp ${./tarsum.go} tarsum.go
     export GOPATH=$(pwd)
-    mkdir src
-    ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum
+    mkdir -p src/github.com/docker/docker/pkg
+    ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
     go build
 
     cp tarsum $out
diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go
index ad33bbac75b..f91a90bdbda 100644
--- a/pkgs/build-support/docker/tarsum.go
+++ b/pkgs/build-support/docker/tarsum.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"tarsum"
+	"github.com/docker/docker/pkg/tarsum"
 )
 
 func main() {

From 5e7ab184372843735ed26ec1d536d170b04e785d Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Mon, 26 Mar 2018 17:20:04 +0000
Subject: [PATCH 085/170] Use up-to-date versions of singletons and th-desguar
 for GHC 8.4.1

Fixes #37856
---
 .../configuration-ghc-8.4.x.nix               | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d953236784e..a80a8dfe5fc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -244,17 +244,7 @@ self: super: {
     };
   });
 
-  ## Upstreamed, awaiting a Hackage release
-  singletons = overrideCabal super.singletons (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## th-desugar ==1.7.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "goldfirere";
-      repo   = "singletons";
-      rev    = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce";
-      sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27";
-    };
-  });
+  singletons = super.singletons_2_4_1;
 
   ## Upstreamed, awaiting a Hackage release
   tar = overrideCabal super.tar (drv: {
@@ -269,18 +259,7 @@ self: super: {
     };
   });
 
-  ## Upstreamed, awaiting a Hackage release
-  th-desugar = overrideCabal super.th-desugar (drv: {
-    ##     • Could not deduce (MonadIO (DsM q))
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       from the context: Quasi q
-    src = pkgs.fetchFromGitHub {
-      owner  = "goldfirere";
-      repo   = "th-desugar";
-      rev    = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837";
-      sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw";
-    };
-  });
+  th-desugar = super.th-desugar_1_8;
 
   ## Upstreamed, awaiting a Hackage release
   websockets = overrideCabal super.websockets (drv: {

From 2b3ba40c03a87d2e9c3e1bff9f07da2c2a3e885a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Mar 2018 13:40:22 -0400
Subject: [PATCH 086/170] haskellPackages.lenz: Remove outdated patch.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2155626daf..4a27cd012d7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -920,17 +920,6 @@ self: super: {
   # https://github.com/bos/text-icu/issues/32
   text-icu = dontCheck super.text-icu;
 
-  # https://github.com/strake/lenz.hs/issues/2
-  lenz =
-    let patch = pkgs.fetchpatch
-          { url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch;
-            sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn";
-          };
-    in overrideCabal super.lenz (drv:
-      { patches = (drv.patches or []) ++ [ patch ];
-        editedCabalFile = null;
-      });
-
   # https://github.com/haskell/cabal/issues/4969
   haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
   haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };

From a80856cec5811b9eb7778b157e5ea943db26e74b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 14:04:19 -0400
Subject: [PATCH 087/170] nixpkgs docs: Use SVGs for callouts

---
 doc/Makefile    | 10 ++++++----
 doc/default.nix |  6 +++---
 doc/style.css   | 18 +++++++++++++-----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 52d1f4630a8..714a2a3e273 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,7 +17,7 @@ validate: manual-full.xml
 
 out/html/index.html: manual-full.xml style.css
 	mkdir -p out/html
-	xsltproc $$xsltFlags \
+	xsltproc ${xsltFlags} \
 		--nonet --xinclude \
 		--output $@ \
 		"$$XSL/docbook/xhtml/docbook.xsl" \
@@ -26,17 +26,19 @@ out/html/index.html: manual-full.xml style.css
 	cp ./style.css out/html/style.css
 
 	mkdir -p out/html/images/callouts
-	cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
+	cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
 	chmod u+w -R out/html/images/
 
 out/epub/manual.epub: manual-full.xml
 	mkdir -p out/epub/scratch
-	xsltproc $$xsltFlags --nonet \
+	xsltproc ${xsltFlags} --nonet \
 		--output out/epub/scratch/ \
 		"$$XSL/docbook/epub/docbook.xsl" \
 		./manual-full.xml
 
-	cp "$$XSL/docbook/images/callouts/"*.gif out/epub/scratch/OEBPS
+	cp ./style.css out/epub/scratch/OEBPS
+	mkdir -p out/epub/scratch/OEBPS/images/callouts/
+	cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
 	echo "application/epub+zip" > mimetype
 	zip -0Xq "out/epub/manual.epub" mimetype
 	rm mimetype
diff --git a/doc/default.nix b/doc/default.nix
index 5869920415c..a8f0e935bae 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -16,11 +16,11 @@ pkgs.stdenv.mkDerivation {
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
-    "--param html.stylesheet 'style.css'"
+    "--stringparam html.stylesheet 'style.css'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 3"
-    "--param admon.style ''"
-    "--param callout.graphics.extension '.gif'"
+    "--stringparam admon.style ''"
+    "--stringparam callout.graphics.extension .svg"
   ];
 
   postPatch = ''
diff --git a/doc/style.css b/doc/style.css
index ac76a64bbb2..fe38986c118 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */
 }
 
 /* Extra space between chapters, appendices. */
-div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 
-{ 
+div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
+{
     margin-top: 1.5em;
 }
 
@@ -118,6 +118,14 @@ div.example pre.programlisting
     margin: 0 0 0 0;
 }
 
+.programlisting img {
+    width: 1em;
+}
+
+
+.calloutlist img {
+    width: 1.5em;
+}
 
 /***************************************************************************
                                Notes, warnings etc:
@@ -172,7 +180,7 @@ div.navfooter *
 
 
 /***************************************************************************
-                        Links colors and highlighting: 
+                        Links colors and highlighting:
  ***************************************************************************/
 
 a { text-decoration: none; }
@@ -209,7 +217,7 @@ tt, code
 .term
 {
     font-weight: bold;
-    
+
 }
 
 div.variablelist dd p, div.glosslist dd p
@@ -252,4 +260,4 @@ table
 div.affiliation
 {
     font-style: italic;
-}
\ No newline at end of file
+}

From 45e4dc0d5dc97349a4631d85107e12a260b25b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Mar 2018 19:25:55 +0100
Subject: [PATCH 088/170] python.pkgs.gpg: rename to gpgme

Let's be honest with what we expose.
---
 pkgs/development/python-modules/alot/default.nix | 6 +++---
 pkgs/top-level/python-packages.nix               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index 7c704c9dc55..7abc56c4783 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, pygpgme, mock, file, gpgme
-, service-identity, gpg
+, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
+, service-identity
 , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
 , withManpage ? false }:
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     configobj
     service-identity
     file
-    gpg
+    gpgme
   ];
 
   # some twisted tests need the network (test_env_set... )
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ad86720bb6..b5b86e3586a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8173,7 +8173,7 @@ in {
 
   google_gax = callPackage ../development/python-modules/google_gax { };
 
-  gpg = toPythonModule (pkgs.gpgme.override { withPython=true; });
+  gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; });
 
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 

From a11afa901f2094bba9e1f228ea53128d82acd04d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 26 Mar 2018 13:23:24 -0500
Subject: [PATCH 089/170] Use npth as "pth" for portability, for now only
 w/musl.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..a334398b54d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11002,7 +11002,8 @@ with pkgs;
 
   flatbuffers = callPackage ../development/libraries/flatbuffers { };
 
-  pth = callPackage ../development/libraries/pth { };
+  gnupth = callPackage ../development/libraries/pth { };
+  pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
 
   ptlib = callPackage ../development/libraries/ptlib {};
 

From da17974541af182f86bd98e992f1c25987adac55 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 14:45:00 -0400
Subject: [PATCH 090/170] Move the overridden CSS to overrides.css which can be
 applied on nixos.org

---
 doc/Makefile      | 2 ++
 doc/default.nix   | 2 +-
 doc/overrides.css | 8 ++++++++
 doc/style.css     | 9 ---------
 4 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 doc/overrides.css

diff --git a/doc/Makefile b/doc/Makefile
index 714a2a3e273..b76ea9ed59e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -23,6 +23,7 @@ out/html/index.html: manual-full.xml style.css
 		"$$XSL/docbook/xhtml/docbook.xsl" \
 		./manual-full.xml
 
+	cp ./overrides.css out/html/
 	cp ./style.css out/html/style.css
 
 	mkdir -p out/html/images/callouts
@@ -36,6 +37,7 @@ out/epub/manual.epub: manual-full.xml
 		"$$XSL/docbook/epub/docbook.xsl" \
 		./manual-full.xml
 
+	cp ./overrides.css out/epub/scratch/OEBPS
 	cp ./style.css out/epub/scratch/OEBPS
 	mkdir -p out/epub/scratch/OEBPS/images/callouts/
 	cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
diff --git a/doc/default.nix b/doc/default.nix
index a8f0e935bae..6f9804417ad 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
-    "--stringparam html.stylesheet 'style.css'"
+    "--stringparam html.stylesheet 'style.css overrides.css'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 3"
     "--stringparam admon.style ''"
diff --git a/doc/overrides.css b/doc/overrides.css
new file mode 100644
index 00000000000..dd11eab82a8
--- /dev/null
+++ b/doc/overrides.css
@@ -0,0 +1,8 @@
+
+.programlisting img {
+    width: 1em;
+}
+
+.calloutlist img {
+    width: 1.5em;
+}
diff --git a/doc/style.css b/doc/style.css
index fe38986c118..23cbdff3891 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -118,15 +118,6 @@ div.example pre.programlisting
     margin: 0 0 0 0;
 }
 
-.programlisting img {
-    width: 1em;
-}
-
-
-.calloutlist img {
-    width: 1.5em;
-}
-
 /***************************************************************************
                                Notes, warnings etc:
  ***************************************************************************/

From 83624b970cf8016b3a85f09417f05dea502ba65e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 26 Mar 2018 15:14:30 -0400
Subject: [PATCH 091/170] linux: 4.16-rc6 -> 4.16-rc7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index bcc1ec14561..5e8e861af25 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.16-rc6";
-  modDirVersion = "4.16.0-rc6";
+  version = "4.16-rc7";
+  modDirVersion = "4.16.0-rc7";
   extraMeta.branch = "4.16";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0kwn1qj44pyb404qhwm4qr8mmfni8qfh1raf010d62i48n7pgv0d";
+    sha256 = "13zpfjxd38202afjl6flc9brjw3sp4sfq3wls0v90k1i2b308qfi";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 807a308623441b6b765728d22751356d6e274a17 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Mon, 26 Mar 2018 12:31:11 -0700
Subject: [PATCH 092/170] qtwebengine: correct how NIX_BUILD_CORES is
 propagated to the gn driven ninja.

---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index df9995bc3b9..7e91cff065d 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -63,8 +63,9 @@ qtModule {
         src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
     '';
 
+
   preConfigure = ''
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
+    export NINJAFLAGS=-j$NIX_BUILD_CORES
 
     if [ -d "$PWD/tools/qmake" ]; then
         QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"

From 2456060458befca5f16b2a1dfd1efe895b83e004 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 26 Mar 2018 16:13:46 -0400
Subject: [PATCH 093/170] haskellPackages.lenz-template: Fix against lenz 3

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4a27cd012d7..22e2e5cc722 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1003,4 +1003,7 @@ self: super: {
   # https://github.com/GaloisInc/pure-zlib/issues/6
   pure-zlib = doJailbreak super.pure-zlib;
 
+  # https://github.com/strake/lenz-template.hs/issues/1
+  lenz-template = doJailbreak super.lenz-template;
+
 }

From 0874789dd5659b2048bdb5c054bc976cb00142fb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 26 Mar 2018 14:32:50 -0500
Subject: [PATCH 094/170] gambit: enable on darwin

---
 pkgs/development/compilers/gambit/bootstrap.nix | 2 +-
 pkgs/development/compilers/gambit/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 7376aec2750..05e804a1f74 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Optimizing Scheme to C compiler, bootstrap step";
     homepage    = "http://gambitscheme.org";
     license     = stdenv.lib.licenses.lgpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
   };
 }
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 95e8dba762a..83e02b14708 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     description = "Optimizing Scheme to C compiler";
     homepage    = "http://gambitscheme.org";
     license     = stdenv.lib.licenses.lgpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ];
   };
 }

From f43878ca4db942296feea4840a04c12f3c18c3bb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 26 Mar 2018 17:01:39 -0500
Subject: [PATCH 095/170] gerbil: enable on darwin

---
 pkgs/development/compilers/gerbil/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index c1a411120d0..555dbbfe460 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -85,7 +85,7 @@ EOF
     description = "Gerbil Scheme";
     homepage    = "https://github.com/vyzo/gerbil";
     license     = stdenv.lib.licenses.lgpl2;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fare ];
   };
 }

From eb828c68317908bf044a2110fc1625d47893edcc Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 27 Mar 2018 01:24:46 +0200
Subject: [PATCH 096/170] systemd: add withSelinux option

false by default, so no rebuild
---
 pkgs/os-specific/linux/systemd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index a792283e70e..d0f35d6736d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -10,6 +10,7 @@
 , getent
 , hostPlatform
 , buildPackages
+, withSelinux ? false, libselinux
 }:
 
 assert stdenv.isLinux;
@@ -44,7 +45,7 @@ in stdenv.mkDerivation rec {
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
-    ];
+    ] ++ stdenv.lib.optionals withSelinux [ libselinux ];
 
   #dontAddPrefix = true;
 

From d46259560030851e9a0ea73375779b9bf56e3b92 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Mon, 26 Mar 2018 12:39:00 +0100
Subject: [PATCH 097/170] Add support for tarsnap options -H and -L

A new option `explicitSymlinks` will set `-H` when creating an archive.
This option makes tarsnap follow any symlinks specified explicitly on
the commandline, but not any found inside the file tree.

A new option `followSymlinks` will set `-L` when creating an archive.
This option makes tarsnap follow any symlinks found anywhere in the file
tree instead of storing them as-is.
---
 nixos/modules/services/backup/tarsnap.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 59e9d122fb5..c33aeb76cb0 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -238,6 +238,20 @@ in
                   Whether to produce verbose logging output.
                 '';
               };
+              explicitSymlinks = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Whether to follow symlinks specified as archives.
+                '';
+              };
+              followSymlinks = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Whether to follow all symlinks in archive trees.
+                '';
+              };
             };
           }
         ));
@@ -304,6 +318,8 @@ in
           let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" \
                         -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
                         ${optionalString cfg.verbose "-v"} \
+                        ${optionalString cfg.explicitSymlinks "-H"} \
+                        ${optionalString cfg.followSymlinks "-L"} \
                         ${concatStringsSep " " cfg.directories}'';
           in if (cfg.cachedir != null) then ''
             mkdir -p ${cfg.cachedir}

From bde525aaaff5cd99e79a21e30b9fdfdf2cd616d2 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Tue, 27 Mar 2018 01:12:26 +0100
Subject: [PATCH 098/170] Add restore service for tarsnap archives

This service will never run automatically, but it encapsulates the
necessary logic and configuration to run a restore of the latest
archive, and allows to hook more specific logic, such as loading
a database dump, via `postStart`.
---
 nixos/modules/services/backup/tarsnap.nix | 47 ++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index c33aeb76cb0..88c847ed92c 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -299,7 +299,7 @@ in
         }) gcfg.archives);
 
     systemd.services =
-      mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" {
+      (mapAttrs' (name: cfg: nameValuePair "tarsnap-${name}" {
         description = "Tarsnap archive '${name}'";
         requires    = [ "network-online.target" ];
         after       = [ "network-online.target" ];
@@ -345,7 +345,50 @@ in
           CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
           PermissionsStartOnly = "true";
         };
-      }) gcfg.archives;
+      }) gcfg.archives) //
+
+      (mapAttrs' (name: cfg: nameValuePair "tarsnap-restore-${name}"{
+        description = "Tarsnap restore '${name}'";
+        requires    = [ "network-online.target" ];
+
+        path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
+
+        ##
+        preStart = ''
+          while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
+        '';
+
+        script =
+        let
+          tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
+          lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)'';
+          run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
+
+          in if (cfg.cachedir != null) then ''
+            mkdir -p ${cfg.cachedir}
+            chmod 0700 ${cfg.cachedir}
+
+            ( flock 9
+              if [ ! -e ${cfg.cachedir}/firstrun ]; then
+                ( flock 10
+                  flock -u 9
+                  ${tarsnap} --fsck
+                  flock 9
+                ) 10>${cfg.cachedir}/firstrun
+              fi
+            ) 9>${cfg.cachedir}/lockf
+
+             exec flock ${cfg.cachedir}/firstrun ${run}
+          '' else "exec ${run}";
+
+        serviceConfig = {
+          Type = "oneshot";
+          IOSchedulingClass = "idle";
+          NoNewPrivileges = "true";
+          CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ];
+          PermissionsStartOnly = "true";
+        };
+      }) gcfg.archives);
 
     # Note: the timer must be Persistent=true, so that systemd will start it even
     # if e.g. your laptop was asleep while the latest interval occurred.

From da04071c29fee118130d928d470f53710740cbc5 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Mar 2018 09:13:13 +0800
Subject: [PATCH 099/170] redis-desktop-manager: 0.9.0-alpha5 -> 0.9.1

---
 .../misc/redis-desktop-manager/default.nix     | 18 +++++++-----------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 169d6951d45..7a4348260fd 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -15,13 +15,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "redis-desktop-manager-${version}";
-  version = "0.9.0-alpha5";
+  version = "0.9.1";
 
   src = fetchgit {
     url = "https://github.com/uglide/RedisDesktopManager.git";
     fetchSubmodules = true;
     rev = "refs/tags/${version}";
-    sha256 = "1grw4zng0ff0lvplzzld133hlz6zjn5f5hl3z6z7kc1nq5642yr9";
+    sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
@@ -30,17 +30,13 @@ stdenv.mkDerivation rec {
     qtquick1 qtquickcontrols qtsvg qttools qtcharts
   ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d.patch";
-      sha256 = "1bcamjkmif62rb0lbp111r0ppf4raqw664m5by7vr3pdkcjbbilq";
-    })
-  ];
-
-  patchFlags = "-d 3rdparty/gbreakpad -p1";
-
   dontUseQmakeConfigure = true;
 
+  # Disable annoying update reminder
+  postPatch = ''
+    sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp
+  '';
+
   buildPhase = ''
     srcdir=$PWD
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 565eeaa807f..0f9c306a08d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20562,7 +20562,7 @@ with pkgs;
     pcre = pcre-cpp;
   });
 
-  redis-desktop-manager = libsForQt59.callPackage ../applications/misc/redis-desktop-manager { };
+  redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { };
 
   robo3t = callPackage ../applications/misc/robo3t { };
 

From a8d08b04a2d2397ad1b189ac80981513f03eb891 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 21:06:42 -0400
Subject: [PATCH 100/170] documentation-highlighter: init

---
 pkgs/misc/documentation-highlighter/LICENSE   |  24 +++
 pkgs/misc/documentation-highlighter/README.md | 152 ++++++++++++++++++
 .../documentation-highlighter/default.nix     |  12 ++
 .../highlight.pack.js                         |   2 +
 .../documentation-highlighter/mono-blue.css   |  59 +++++++
 pkgs/misc/documentation-highlighter/update.sh |  42 +++++
 pkgs/top-level/all-packages.nix               |   2 +
 7 files changed, 293 insertions(+)
 create mode 100644 pkgs/misc/documentation-highlighter/LICENSE
 create mode 100644 pkgs/misc/documentation-highlighter/README.md
 create mode 100644 pkgs/misc/documentation-highlighter/default.nix
 create mode 100644 pkgs/misc/documentation-highlighter/highlight.pack.js
 create mode 100644 pkgs/misc/documentation-highlighter/mono-blue.css
 create mode 100755 pkgs/misc/documentation-highlighter/update.sh

diff --git a/pkgs/misc/documentation-highlighter/LICENSE b/pkgs/misc/documentation-highlighter/LICENSE
new file mode 100644
index 00000000000..422deb7350f
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2006, Ivan Sagalaev
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of highlight.js nor the names of its contributors 
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md
new file mode 100644
index 00000000000..f4baa3c8e00
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/README.md
@@ -0,0 +1,152 @@
+This file was generated with pkgs/misc/documentation-highlighter/update.sh
+
+# Highlight.js
+
+[![Build Status](https://travis-ci.org/isagalaev/highlight.js.svg?branch=master)](https://travis-ci.org/isagalaev/highlight.js)
+
+Highlight.js is a syntax highlighter written in JavaScript. It works in
+the browser as well as on the server. It works with pretty much any
+markup, doesn’t depend on any framework and has automatic language
+detection.
+
+## Getting Started
+
+The bare minimum for using highlight.js on a web page is linking to the
+library along with one of the styles and calling
+[`initHighlightingOnLoad`][1]:
+
+```html
+<link rel="stylesheet" href="/path/to/styles/default.css">
+<script src="/path/to/highlight.pack.js"></script>
+<script>hljs.initHighlightingOnLoad();</script>
+```
+
+This will find and highlight code inside of `<pre><code>` tags; it tries
+to detect the language automatically. If automatic detection doesn’t
+work for you, you can specify the language in the `class` attribute:
+
+```html
+<pre><code class="html">...</code></pre>
+```
+
+The list of supported language classes is available in the [class
+reference][2].  Classes can also be prefixed with either `language-` or
+`lang-`.
+
+To disable highlighting altogether use the `nohighlight` class:
+
+```html
+<pre><code class="nohighlight">...</code></pre>
+```
+
+## Custom Initialization
+
+When you need a bit more control over the initialization of
+highlight.js, you can use the [`highlightBlock`][3] and [`configure`][4]
+functions. This allows you to control *what* to highlight and *when*.
+
+Here’s an equivalent way to calling [`initHighlightingOnLoad`][1] using
+jQuery:
+
+```javascript
+$(document).ready(function() {
+  $('pre code').each(function(i, block) {
+    hljs.highlightBlock(block);
+  });
+});
+```
+
+You can use any tags instead of `<pre><code>` to mark up your code. If
+you don't use a container that preserve line breaks you will need to
+configure highlight.js to use the `<br>` tag:
+
+```javascript
+hljs.configure({useBR: true});
+
+$('div.code').each(function(i, block) {
+  hljs.highlightBlock(block);
+});
+```
+
+For other options refer to the documentation for [`configure`][4].
+
+
+## Web Workers
+
+You can run highlighting inside a web worker to avoid freezing the browser
+window while dealing with very big chunks of code.
+
+In your main script:
+
+```javascript
+addEventListener('load', function() {
+  var code = document.querySelector('#code');
+  var worker = new Worker('worker.js');
+  worker.onmessage = function(event) { code.innerHTML = event.data; }
+  worker.postMessage(code.textContent);
+})
+```
+
+In worker.js:
+
+```javascript
+onmessage = function(event) {
+  importScripts('<path>/highlight.pack.js');
+  var result = self.hljs.highlightAuto(event.data);
+  postMessage(result.value);
+}
+```
+
+
+## Getting the Library
+
+You can get highlight.js as a hosted, or custom-build, browser script or
+as a server module. Right out of the box the browser script supports
+both AMD and CommonJS, so if you wish you can use RequireJS or
+Browserify without having to build from source. The server module also
+works perfectly fine with Browserify, but there is the option to use a
+build specific to browsers rather than something meant for a server.
+Head over to the [download page][5] for all the options.
+
+**Don't link to GitHub directly.** The library is not supposed to work straight
+from the source, it requires building. If none of the pre-packaged options
+work for you refer to the [building documentation][6].
+
+**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be
+too big. If you don't see the language you need in the ["Common" section][5],
+it can be added manually:
+
+```html
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script>
+```
+
+**On Almond.** You need to use the optimizer to give the module a name. For
+example:
+
+```
+r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
+```
+
+
+## License
+
+Highlight.js is released under the BSD License. See [LICENSE][7] file
+for details.
+
+## Links
+
+The official site for the library is at <https://highlightjs.org/>.
+
+Further in-depth documentation for the API and other topics is at
+<http://highlightjs.readthedocs.io/>.
+
+Authors and contributors are listed in the [AUTHORS.en.txt][8] file.
+
+[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload
+[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
+[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block
+[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
+[5]: https://highlightjs.org/download/
+[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
+[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
+[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt
diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix
new file mode 100644
index 00000000000..a9fbcc178bb
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, runCommand }:
+runCommand "documentation-highlighter" {
+  meta = {
+    description = "Highlight.js sources for the Nix Ecosystem's documentation.";
+    homepage = https://highlightjs.org;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.grahamc ];
+  };
+} ''
+  cp -r ${./.} $out
+''
diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/pkgs/misc/documentation-highlighter/highlight.pack.js
new file mode 100644
index 00000000000..f909702367e
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,r:0,c:[{cN:"attr",b:/\S+/}]},s={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,s,i];return t.c=a,{aliases:["nixos"],k:r,c:a}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/pkgs/misc/documentation-highlighter/mono-blue.css
new file mode 100644
index 00000000000..884c97c7673
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/mono-blue.css
@@ -0,0 +1,59 @@
+/*
+  Five-color theme from a single blue hue.
+*/
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #eaeef3;
+}
+
+.hljs {
+  color: #00193a;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-title,
+.hljs-section,
+.hljs-doctag,
+.hljs-name,
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-comment {
+  color: #738191;
+}
+
+.hljs-string,
+.hljs-title,
+.hljs-section,
+.hljs-built_in,
+.hljs-literal,
+.hljs-type,
+.hljs-addition,
+.hljs-tag,
+.hljs-quote,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #0048ab;
+}
+
+.hljs-meta,
+.hljs-subst,
+.hljs-symbol,
+.hljs-regexp,
+.hljs-attribute,
+.hljs-deletion,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-bullet {
+  color: #4c81c9;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/misc/documentation-highlighter/update.sh
new file mode 100755
index 00000000000..3b77af4af41
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl -p unzip
+
+set -eu
+set -o pipefail
+
+root=$(pwd)
+
+if [ ! -f "./update.sh" ]; then
+    echo "Please run this script from within pkgs/misc/documentation-highlighter/!"
+    exit 1
+fi
+
+scratch=$(mktemp -d -t tmp.XXXXXXXXXX)
+function finish {
+  rm -rf "$scratch"
+}
+trap finish EXIT
+
+
+mkdir $scratch/src
+cd $scratch/src
+
+token=$(curl https://highlightjs.org/download/ -c "$scratch/jar" \
+    | grep csrf \
+    | cut -d"'" -f6)
+
+curl --header "Referer: https://highlightjs.org/download/"\
+    -b "$scratch/jar" \
+    --data "csrfmiddlewaretoken=$token&nix.js=on&bash.js=on" \
+    https://highlightjs.org/download/ > $scratch/out.zip
+
+unzip "$scratch/out.zip"
+out="$root/"
+mkdir -p "$out"
+cp ./{highlight.pack.js,LICENSE,styles/mono-blue.css} "$out"
+
+(
+    echo "This file was generated with pkgs/misc/documentation-highlighter/update.sh"
+    echo ""
+    cat README.md
+) > "$out/README.md"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 565eeaa807f..ec7cc59917a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14202,6 +14202,8 @@ with pkgs;
 
   docbook5_xsl = docbook_xsl_ns;
 
+  documentation-highlighter = callPackage ../misc/documentation-highlighter { };
+
   cabin = callPackage ../data/fonts/cabin { };
 
   camingo-code = callPackage ../data/fonts/camingo-code { };

From 8dac5ce146c0c3afe963ea8bc955d5b147853345 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 08:24:27 -0400
Subject: [PATCH 101/170] nixpkgs docs: syntax highlight

---
 doc/.gitignore  |  1 +
 doc/Makefile    | 24 +++++++++++++++++++++---
 doc/default.nix |  8 +++++++-
 doc/style.css   |  2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/doc/.gitignore b/doc/.gitignore
index d8e765e38c2..d0ba103fa9f 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -3,3 +3,4 @@
 .version
 out
 manual-full.xml
+highlightjs
diff --git a/doc/Makefile b/doc/Makefile
index b76ea9ed59e..c16e70e9c6a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,16 +6,17 @@ all: validate out/html/index.html out/epub/manual.epub
 .PHONY: debug
 debug:
 	nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
+
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
-	rm -rf ./out/
+	rm -rf ./out/ ./highlightjs
 
 .PHONY: validate
 validate: manual-full.xml
 	jing "$$RNG" manual-full.xml
 
-out/html/index.html: manual-full.xml style.css
+out/html/index.html: manual-full.xml style.css highlightjs
 	mkdir -p out/html
 	xsltproc ${xsltFlags} \
 		--nonet --xinclude \
@@ -23,12 +24,22 @@ out/html/index.html: manual-full.xml style.css
 		"$$XSL/docbook/xhtml/docbook.xsl" \
 		./manual-full.xml
 
+	mkdir -p out/html/highlightjs/
+	echo "document.onreadystatechange = function () { \
+	  var listings = document.querySelectorAll('.programlisting, .screen'); \
+	  for (i = 0; i < listings.length; ++i) { \
+	     hljs.highlightBlock(listings[i]); \
+	  } \
+	} " > out/html/highlightjs/loader.js
+
+	cp -r highlightjs out/html/
+
 	cp ./overrides.css out/html/
 	cp ./style.css out/html/style.css
 
 	mkdir -p out/html/images/callouts
 	cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
-	chmod u+w -R out/html/images/
+	chmod u+w -R out/html/
 
 out/epub/manual.epub: manual-full.xml
 	mkdir -p out/epub/scratch
@@ -47,6 +58,13 @@ out/epub/manual.epub: manual-full.xml
 	cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
 	rm -rf "out/epub/scratch/"
 
+highlightjs:
+	mkdir -p highlightjs
+	cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
+	cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
+	cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
+
+
 manual-full.xml: ${MD_TARGETS} .version *.xml
 	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
 
diff --git a/doc/default.nix b/doc/default.nix
index 6f9804417ad..8abde58bb11 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -11,12 +11,18 @@ pkgs.stdenv.mkDerivation {
 
   src = ./.;
 
+  # Hacking on these variables? Make sure to close and open
+  # nix-shell between each test, maybe even:
+  # $ nix-shell --run "make clean all"
+  # otherwise they won't reapply :)
+  HIGHLIGHTJS = pkgs.documentation-highlighter;
   XSL = "${pkgs.docbook5_xsl}/xml/xsl";
   RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
-    "--stringparam html.stylesheet 'style.css overrides.css'"
+    "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'"
+    "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 3"
     "--stringparam admon.style ''"
diff --git a/doc/style.css b/doc/style.css
index 23cbdff3891..83dae0dd2cd 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -104,7 +104,7 @@ pre.screen, pre.programlisting
     padding: 3px 3px;
     margin-left: 1.5em;
     margin-right: 1.5em;
-    color: #600000;
+
     background: #f4f4f8;
     font-family: monospace;
     border-radius: 0.4em;

From 970f2b5063ba59aed2583a9741e79658a92d7656 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Mar 2018 20:57:32 -0500
Subject: [PATCH 102/170] Revert "justStaticExecutables: enable -dead_strip on
 mac to shrink closure"

This reverts commit 24d313e2039b6d89f8a1ba4c5be12b134479fe67.

Fixes #37750
---
 pkgs/development/haskell-modules/lib.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index fef827cd9a1..1e58eed2fe0 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -230,8 +230,6 @@ rec {
     isLibrary = false;
     doHaddock = false;
     postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
-  } // lib.optionalAttrs (pkgs.hostPlatform.isDarwin) {
-    configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"];
   });
 
   /* Build a source distribution tarball instead of using the source files
@@ -260,7 +258,7 @@ rec {
      the cabal file are actually used.
 
      The first attrset argument can be used to configure the strictness
-     of this check and a list of ignored package names that would otherwise 
+     of this check and a list of ignored package names that would otherwise
      cause false alarms.
    */
   checkUnusedPackages =

From 799e8c574548d1bc1bad3b9e8264abcdb93bf083 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Mar 2018 21:01:21 -0500
Subject: [PATCH 103/170] Revert "shellcheck: dont statically compile"

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 020b35d571f..8cc1893d0a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8169,7 +8169,7 @@ with pkgs;
 
   shards = callPackage ../development/tools/build-managers/shards { };
 
-  shellcheck = haskellPackages.ShellCheck;
+  shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
 
   schemaspy = callPackage ../development/tools/database/schemaspy { };
 

From 0709ebba722b8a2408365f1a731bef884a2b6e29 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 14:31:43 -0700
Subject: [PATCH 104/170] gnustep.gui: 0.25.0 -> 0.26.2

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gclose -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gclose --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gclose help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gcloseall -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gcloseall --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gcloseall help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gopen -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gopen --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/gopen help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/make_services -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/make_services --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/make_services help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/set_show_service --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gclose-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gclose-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gclose-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gcloseall-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gcloseall-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gcloseall-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gopen-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gopen-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.gopen-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.make_services-wrapped -h` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.make_services-wrapped --help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.make_services-wrapped help` got 0 exit code
- ran `/nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2/bin/.set_show_service-wrapped --help` got 0 exit code
- found 0.26.2 with grep in /nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2
- found 0.26.2 in filename of file in /nix/store/bma1fldnlpkx804zb7zxi9hqgkmv8ca5-gnustep-gui-0.26.2
- directory tree listing: https://gist.github.com/1f55420b15dcdd93eb98a06634b7fb25
---
 pkgs/desktops/gnustep/gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix
index a28fef8f3d9..399bad2581f 100644
--- a/pkgs/desktops/gnustep/gui/default.nix
+++ b/pkgs/desktops/gnustep/gui/default.nix
@@ -1,12 +1,12 @@
 { gsmakeDerivation, fetchurl, base }:
 let
-  version = "0.25.0";
+  version = "0.26.2";
 in
 gsmakeDerivation {
   name = "gnustep-gui-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz";
-    sha256 = "10jf3xir59qzbhhl0bvs9wdw40fsmvv6mdv5akdkia1rnck60xf5";
+    sha256 = "1dsbkifnjha3ghq8xx55bpsbbng0cjsni3yz71r7342ax2ixcvxc";
   };
   buildInputs = [ base ];
   patches = [ ./fixup-all.patch ];

From dab9d404ce5814a0d27e347872e0e44f9901b573 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 27 Mar 2018 15:10:05 +0800
Subject: [PATCH 105/170] ncftp: man and doc files were missing

---
 pkgs/tools/networking/ncftp/default.nix | 33 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 4c632899ac2..0a0eadbfcba 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, ncurses, coreutils }:
 
-let version = "3.2.6"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ncftp-${version}";
+  version = "3.2.6";
 
   src = fetchurl {
     url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz";
@@ -11,24 +11,29 @@ stdenv.mkDerivation {
 
   buildInputs = [ ncurses ];
 
-  preConfigure = ''
-    find . -name "*.sh" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
-    find . -name "*.in" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
-    find . -name "*.c" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
-    sed 's@/bin/ls@${coreutils}/bin/ls@g' -i configure
+  enableParallelBuilding = true;
 
-    find . -name "*.sh" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
-    find . -name "*.in" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
-    find . -name "*.c" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
-    sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure
+  preConfigure = ''
+    find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \
+      -e 's@/bin/ls@${coreutils}/bin/ls@g' \
+      -e 's@/bin/rm@${coreutils}/bin/rm@g'
   '';
 
-  configureFlags = [ "--mandir=$out/share/man/" ];
+  postInstall = ''
+    rmdir $out/etc
+    mkdir -p $out/share/doc
+    cp -r doc $out/share/doc/ncftp
+  '';
+
+  configureFlags = [
+    "--enable-ssp"
+    "--mandir=$(out)/share/man/"
+  ];
 
   meta = with stdenv.lib; {
     description = "Command line FTP (File Transfer Protocol) client";
-    homepage = http://www.ncftp.com/ncftp/;
+    homepage = https://www.ncftp.com/ncftp/;
+    maintainers = with maintainers; [ bjornfor ];
     platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
   };
 }

From 41676002b28dc0e71306e309c2805438ed256517 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sat, 10 Mar 2018 22:23:42 +0100
Subject: [PATCH 106/170] nixos/systemd: add option for cgroup accounting

---
 nixos/modules/system/boot/systemd.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 92c9ee0c469..b8a2d42e0fb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -524,6 +524,14 @@ in
       '';
     };
 
+    systemd.enableCgroupAccounting = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable cgroup accounting.
+      '';
+    };
+
     systemd.extraConfig = mkOption {
       default = "";
       type = types.lines;
@@ -725,6 +733,13 @@ in
 
       "systemd/system.conf".text = ''
         [Manager]
+        ${optionalString config.systemd.enableCgroupAccounting ''
+          DefaultCPUAccounting=yes
+          DefaultIOAccounting=yes
+          DefaultBlockIOAccounting=yes
+          DefaultMemoryAccounting=yes
+          DefaultTasksAccounting=yes
+        ''}
         ${config.systemd.extraConfig}
       '';
 

From 1b8d2a311904ef2f83819bc2039bf734028316aa Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@protonmail.com>
Date: Tue, 27 Mar 2018 04:40:44 -0500
Subject: [PATCH 107/170] bcachefs-tools: 2018-02-08 -> 2018-03-20

---
 .../filesystems/bcachefs-tools/Makefile.patch      | 13 +++++++++++++
 pkgs/tools/filesystems/bcachefs-tools/default.nix  | 14 ++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/filesystems/bcachefs-tools/Makefile.patch

diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch
new file mode 100644
index 00000000000..812f9954cf2
--- /dev/null
+++ b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index af7a206..553ac70 100644
+--- a/Makefile
++++ b/Makefile
+@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr)
+ 	INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
+ else
+ 	ROOT_SBINDIR=$(PREFIX)/sbin
+-	INITRAMFS_DIR=/etc/initramfs-tools
++	INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools
+ endif
+ 
+ .PHONY: all
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 0a5017de53c..3684b216cd7 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,17 +1,19 @@
 { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
-, keyutils, liburcu, zlib, libaio }:
+, keyutils, liburcu, zlib, libaio, zstd }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-unstable-2018-02-08";
+  name = "bcachefs-tools-unstable-2018-03-20";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "fc96071b58c28ea492103e7649c0efd5bab50ead";
-    sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy";
+    rev = "ff5e165532a2eed87700649d03f91a612a58e92a";
+    sha256 = "1mikhffkr4a1yhy36yh70dhgcimcpvdm5mjl5fyni0bpgqrw67dn";
   };
 
+  enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];
+  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ];
+  patches = [ ./Makefile.patch ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Tool for managing bcachefs filesystems";
     homepage = https://bcachefs.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ davidak ];
+    maintainers = with maintainers; [ davidak chiiruno];
     platforms = platforms.linux;
   };
 }

From 1f4f6d79ac54b240f6f7120bcb18d5e9e9a16707 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@protonmail.com>
Date: Tue, 27 Mar 2018 04:41:49 -0500
Subject: [PATCH 108/170] linux_testing_bcachefs: 4.15.2018.02.09 ->
 4.15.2018.03.22

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 5aae37418ce..f5e219bc74e 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,15 +1,15 @@
 { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.15.2018.02.09";
+  version = "4.15.2018.03.22";
   modDirVersion = "4.15.0";
   extraMeta.branch = "master";
-  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];
+  extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ];
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4";
-    sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib";
+    rev = "919a34d47a68f3e5f00a7ce5efb67748ec31bd62";
+    sha256 = "1j17my3046ry8zdcvf8h2vnij89wkwmv64w3g2pf9lksh2909djw";
   };
 
   extraConfig = ''

From 6558ec1dd5d7dcdd105c8ca4a2b7a79dfafdd63a Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Tue, 27 Mar 2018 12:53:11 +0300
Subject: [PATCH 109/170] zstd: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 6617a4346e5..8fa2d181de5 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
-    sha256 = "15h9i9ygry0znlmvll5r21lzwgyqzynaw9q2wbj4bcn7zjy4c1pn";
+    sha256 = "090ba7dnv5z2v4vlb8b275b0n7cqsdzjqvr3b6a0w65z13mgy2nw";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       speed is preserved and remain roughly the same at all settings, a
       property shared by most LZ compression algorithms, such as zlib.
     '';
-    homepage = http://www.zstd.net/;
+    homepage = https://facebook.github.io/zstd/;
     # The licence of the CLI programme is GPLv2+, that of the library BSD-2.
     license = with licenses; [ gpl2Plus bsd2 ];
 

From 9a4871ad826f767992823c6ac385e96d12fb7af0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Mar 2018 12:00:17 +0200
Subject: [PATCH 110/170] tdesktop: 1.2.14 -> 1.2.15

tdesktopPackages.preview: 1.2.14 -> 1.2.15
---
 .../instant-messengers/telegram/tdesktop/default.nix |  4 ++--
 .../instant-messengers/telegram/tdesktop/generic.nix | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index afba9ab022a..df0b6f39ca5 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,8 +4,8 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.2.14";
-    sha256Hash = "1412bls4qmfsa4nlqrxrc1j1jslhj6rhg8k69blhks9grrz36s1l";
+    version = "1.2.15";
+    sha256Hash = "18srw7g8h5zmc0plzqd03aijaylrsfaybraw97b1w9hj4lf2bl92";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "310557";
     archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 7027e70f0c8..2588340de1d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -1,7 +1,7 @@
 { stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
 
 { mkDerivation, lib, fetchgit, fetchsvn
-, pkgconfig, pythonPackages, cmake, makeWrapper
+, pkgconfig, pythonPackages, cmake, wrapGAppsHook
 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
 }:
@@ -37,7 +37,10 @@ mkDerivation rec {
       --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
   '';
 
-  nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
+  nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook ];
+
+  # We want to run wrapProgram manually (with additional parameters)
+  dontWrapGApps = true;
 
   buildInputs = [
     qtbase qtimageformats gtk3 libappindicator-gtk3
@@ -113,11 +116,14 @@ mkDerivation rec {
     for icon_size in 16 32 48 64 128 256 512; do
       install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
     done
+  '';
 
+  postFixup = ''
     # This is necessary to run Telegram in a pure environment.
+    # We also use gappsWrapperArgs from wrapGAppsHook.
     wrapProgram $out/bin/telegram-desktop \
+      "''${gappsWrapperArgs[@]}" \
       --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
-      --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
       --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
     sed -i $out/bin/telegram-desktop \
       -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","

From b0482248fefbf3b6cdd9c92053cfb49778a3a3a8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Mar 2018 08:12:14 -0400
Subject: [PATCH 111/170] meta: Add badPlatforms attribute for platform
 blacklisting.

---
 pkgs/stdenv/generic/check-meta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 113b95f3ab0..2f4ff62f767 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -165,6 +165,7 @@ let
     isFcitxEngine = bool;
     isIbusEngine = bool;
     isGutenprint = bool;
+    badPlatforms = platforms;
   };
 
   checkMetaAttr = k: v:
@@ -174,7 +175,8 @@ let
   checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
 
   checkPlatform = attrs:
-    lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms;
+    (!(attrs ? meta.platforms) || lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms) &&
+    (!(attrs ? meta.badPlatforms && lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.badPlatforms));
 
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.
@@ -189,7 +191,7 @@ let
       { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; }
     else if !allowBroken && attrs.meta.broken or false then
       { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
-    else if !allowUnsupportedSystem && !allowBroken && attrs.meta.platforms or null != null && !(checkPlatform attrs) then
+    else if !allowUnsupportedSystem && !allowBroken && !(checkPlatform attrs) then
       { valid = false; reason = "broken"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }

From cdf9a78a3ebb535fa6ba88fce88c655776d2474f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Mar 2018 17:45:22 -0400
Subject: [PATCH 112/170] kexectools: Disable only on RISC-V if Linux.

The isKexecable flag treated Linux without kexec as just a normal
variant, when it really should be treated as a special case incurring
complexity debt to support.
---
 lib/meta.nix                                  | 2 ++
 lib/systems/inspect.nix                       | 2 --
 nixos/modules/system/boot/kexec.nix           | 2 +-
 pkgs/os-specific/linux/kexectools/default.nix | 1 +
 pkgs/os-specific/linux/systemd/default.nix    | 3 ++-
 pkgs/top-level/all-packages.nix               | 4 +---
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 199030c103a..8516cc1cd6f 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -86,4 +86,6 @@ rec {
         then { system = elem; }
         else { parsed = elem; };
     in lib.matchAttrs pattern platform;
+
+  enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
 }
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index e8ea2bed25f..2f0c402f398 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -39,8 +39,6 @@ rec {
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
 
-    isKexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
-                       [ "x86" "arm" "aarch64" "mips" ];
     isEfi          = map (family: { cpu.family = family; })
                        [ "x86" "arm" "aarch64" ];
     isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 14ebe66e632..3fc1af28f62 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  config = lib.mkIf (pkgs.kexectools != null) {
+  config = lib.mkIf (pkgs.kexectools.meta.available) {
     environment.systemPackages = [ pkgs.kexectools ];
 
     systemd.services."prepare-kexec" =
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index c4c5b7cc3b9..26f3d89c662 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
     platforms = platforms.linux;
+    badPlatforms = platforms.riscv;
   };
 }
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d0f35d6736d..763c28464ab 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -41,7 +41,8 @@ in stdenv.mkDerivation rec {
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
-      libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
+      libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++
+    [ libseccomp libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 831fc8344cb..8d2a17a79da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3131,9 +3131,7 @@ with pkgs;
 
   keepalived = callPackage ../tools/networking/keepalived { };
 
-  kexectools = if hostPlatform.isKexecable
-                 then callPackage ../os-specific/linux/kexectools { }
-               else null;
+  kexectools = callPackage ../os-specific/linux/kexectools { };
 
   keybase = callPackage ../tools/security/keybase { };
 

From 26e8d58cb545004acb7cbd00db81a402923a2445 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Mar 2018 17:52:20 -0400
Subject: [PATCH 113/170] libseccomp: Disable only on RISC-V if Linux.

The isSeccomputable flag treated Linux without seccomp as just a
normal variant, when it really should be treated as a special case
incurring complexity debt to support.
---
 lib/systems/inspect.nix                           | 2 --
 pkgs/development/libraries/libseccomp/default.nix | 1 +
 pkgs/os-specific/linux/systemd/default.nix        | 6 ++++--
 pkgs/tools/package-management/nix/default.nix     | 4 ++--
 pkgs/top-level/all-packages.nix                   | 4 +---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 2f0c402f398..d7fabf684b7 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -41,8 +41,6 @@ rec {
 
     isEfi          = map (family: { cpu.family = family; })
                        [ "x86" "arm" "aarch64" ];
-    isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
-                        [ "x86" "arm" "aarch64" "mips" ];
   };
 
   matchAnyAttrs = patterns:
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index d953fd12e68..e0c77a0cf35 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://github.com/seccomp/libseccomp";
     license     = licenses.lgpl21;
     platforms   = platforms.linux;
+    badPlatforms = platforms.riscv;
     maintainers = with maintainers; [ thoughtpolice wkennington ];
   };
 }
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 763c28464ab..7b3590e5c19 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -41,8 +41,10 @@ in stdenv.mkDerivation rec {
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
-      libmicrohttpd ] ++ stdenv.lib.meta.enableIfAvailable kexectools ++
-    [ libseccomp libffi audit lz4 bzip2 libapparmor
+      libmicrohttpd ] ++
+      stdenv.lib.meta.enableIfAvailable kexectools ++
+      stdenv.lib.meta.enableIfAvailable libseccomp ++
+    [ libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 5140ddd0283..677c3896fc1 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -30,7 +30,7 @@ let
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals is20 [ brotli ] # Since 1.12
-      ++ lib.optional (hostPlatform.isSeccomputable) libseccomp
+      ++ lib.meta.enableIfAvailable libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {
             apis = ["s3"];
@@ -60,7 +60,7 @@ let
           hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system
       ) ''--with-system=${hostPlatform.nix.system}''
          # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
-      ++ lib.optional (!hostPlatform.isSeccomputable) "--disable-seccomp-sandboxing";
+      ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing";
 
     makeFlags = "profiledir=$(out)/etc/profile.d";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d2a17a79da..7c61381281d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9792,9 +9792,7 @@ with pkgs;
 
   libgroove = callPackage ../development/libraries/libgroove { };
 
-  libseccomp =  if hostPlatform.isSeccomputable
-                  then callPackage ../development/libraries/libseccomp { }
-                else null;
+  libseccomp = callPackage ../development/libraries/libseccomp { };
 
   libsecret = callPackage ../development/libraries/libsecret { };
 

From 7d45fff670c7a7439788509eb39aa9eeaa22cc0f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 25 Mar 2018 13:50:17 -0700
Subject: [PATCH 114/170] gegl_0_3: 0.3.28 -> 0.3.30

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl -h` got 0 exit code
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl --help` got 0 exit code
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl -V` and found version 0.3.30
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl --version` and found version 0.3.30
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl -h` and found version 0.3.30
- ran `/nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30/bin/gegl --help` and found version 0.3.30
- found 0.3.30 with grep in /nix/store/fn6gs9ss2l0qpxyg3w5y76bx4wlgr9q6-gegl-0.3.30
- directory tree listing: https://gist.github.com/d252f515654f002ddf4d8f3301559e56
---
 pkgs/development/libraries/gegl/3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
index 03f6054791e..e743b60573c 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -3,11 +3,11 @@
 , libwebp, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gegl-0.3.28";
+  name = "gegl-0.3.30";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
-    sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm";
+    sha256 = "0lg5j5kn24qvyb6fn7khxf3jadkacbpnb9nrqzy7w665s8xakd7q";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";

From 64340f42c1a137c7980b0d24557e491a93c806de Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 27 Mar 2018 00:29:58 +0200
Subject: [PATCH 115/170] pantheon-terminal: fixes #10171 Using the 'memory'
 GSettings backend

---
 .../pantheon/apps/pantheon-terminal/default.nix   | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index 22e790784d5..7f259d66954 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }:
+{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   majorVersion = "0.4";
@@ -9,19 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
   };
 
-  preConfigure = ''
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig"
-  '';
-
-  preFixup = ''
-    for f in $out/bin/*; do
-      wrapProgram $f \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
-    done
-  '';
-
   nativeBuildInputs = [
-    perl cmake vala_0_38 pkgconfig makeWrapper
+    perl cmake vala_0_38 pkgconfig wrapGAppsHook
     # For setup hook
     gobjectIntrospection
   ];

From ca28546bfcc32be8a13be71c474b245ff2d9f84b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Mar 2018 08:56:36 -0400
Subject: [PATCH 116/170] sbt: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 01a112bcecc..e59633a8571 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "0fy04mnnrbdm7kfnjh6sv1q3g6wqzvwyf1p43f36rw3qalap544a";
+    sha256 = "0w6j9isrcr1iqrwjlpv73l09wyqknd426almnpnzmqd1m10wwxsz";
   };
 
   patchPhase = ''

From 945b681d3b1e32d2dcea528ce4e5396408c1bb74 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Mar 2018 08:59:09 -0400
Subject: [PATCH 117/170] ammonite: 1.0.5 -> 1.1.0

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 3aa64356896..beebd8ada9b 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.0.5";
+  version = "1.1.0";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l";
+    sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 737bf1d22902f8f0039d7e89cdaa648eee755013 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@teamviewer.com>
Date: Tue, 27 Mar 2018 14:39:56 +0200
Subject: [PATCH 118/170] apacheHttpd: 2.4.29 -> 2.4.33

---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 41e65b588e1..dd076606da5 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.29";
+  version = "2.4.33";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00";
+    sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05";
   };
 
   # FIXME: -dev depends on -doc

From f396dd1dcb466ab119af7fa76a69fa5c77d5f831 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 26 Mar 2018 14:14:28 +0000
Subject: [PATCH 119/170] nvidiaLegacy304: fix build

Fixes #37768. Fixes #33395. Closes #37866.

abbradar: don't fix settings in a NixOS module.
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d0348bd67d4..1e2b8cae9ff 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -50,8 +50,8 @@ rec {
     prePatch = let
       debPatches = fetchurl {
         url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
-            + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
-        sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
+            + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz";
+        sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l";
       };
       prefix = "debian/module/debian/patches";
       applyPatches = pnames: if pnames == [] then null else

From 25ac79647cea487127c071f4ae9742e0bc70aab2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 16:39:05 +0300
Subject: [PATCH 120/170] linuxPackages.nvidia_x11_legacy173: drop

There's no kernel in nixpkgs suitable for this old driver -- tested with 4.4.
---
 nixos/modules/hardware/video/nvidia.nix       |  2 -
 .../linux/nvidia-x11/builder-legacy173.sh     | 99 -------------------
 pkgs/os-specific/linux/nvidia-x11/default.nix |  2 -
 .../linux/nvidia-x11/legacy173.nix            | 53 ----------
 4 files changed, 156 deletions(-)
 delete mode 100755 pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/legacy173.nix

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index eafc9869315..a1f1cef07ad 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -16,8 +16,6 @@ let
         kernelPackages.nvidia_x11
     else if elem "nvidiaBeta" drivers then
         kernelPackages.nvidia_x11_beta
-    else if elem "nvidiaLegacy173" drivers then
-      kernelPackages.nvidia_x11_legacy173
     else if elem "nvidiaLegacy304" drivers then
       kernelPackages.nvidia_x11_legacy304
     else if elem "nvidiaLegacy340" drivers then
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
deleted file mode 100755
index 5d47df9a87a..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-source $stdenv/setup
-
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
-    sh $src -x
-}
-
-
-buildPhase() {
-    if test -z "$libsOnly"; then
-        echo "Building linux driver against kernel: " $kernel;
-
-        cd usr/src/nv/
-
-        shopt -s nullglob
-
-        for a in $kpatches; do
-          patch -p1 < $a
-        done
-
-        # Workaround: get it to build on kernels that have CONFIG_XEN
-        # set.  Disable the test, apply a patch to disable the Xen
-        # functionality.
-        
-        #substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord
-        #patch -p1 < $xenPatch
-
-        # Create the module.
-        kernelVersion=$(cd $kernel/lib/modules && ls)
-        sysSource=$(echo $kernel/lib/modules/$kernelVersion/source)
-        sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
-        unset src # used by the nv makefile
-        make SYSSRC=$sysSource SYSOUT=$sysOut module
-        cd ../../..
-    fi
-}
-
-
-installPhase() {
-
-    # Install libGL and friends.
-    mkdir -p $out/lib
-    cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/
-
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1
-    ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
-    ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
-    ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
-
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
-    set +e
-    # Legacy nvidia doesn't have cuda
-    patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    set -e
-    
-    if test -z "$libsOnly"; then
-        
-        # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/
-
-        ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
-        ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
-
-        patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-xconfig; do
-	    cp usr/bin/$i $out/bin/$i
-	    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-    
-        # Header files etc.
-        cp -prd usr/include usr/share $out
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-    fi
-}
-
-
-genericBuild
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 1e2b8cae9ff..4f753a5cb6a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -63,6 +63,4 @@ rec {
     in applyPatches [ "fix-typos" ];
     patches = maybePatch_drm_legacy;
   };
-
-  legacy_173 = callPackage ./legacy173.nix { };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
deleted file mode 100644
index 51a230974c8..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}:
-
-let
-
-  versionNumber = "173.14.39";
-
-in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}-${kernel.version}";
-
-  builder = ./builder-legacy173.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "https://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
-        sha256 = "08xb7s7cxmj4zv4i3645kjhlhhwxiq6km9ixmsw3vv91f7rkb6d0";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
-        sha256 = "1p2ls0xj81l8v4n6dbjj3p5wlw1iyhgzyvqcv4h5fdxhhs2cb3md";
-      }
-    else throw "nvidia-x11 does not support platform ${stdenv.system}";
-
-  kernel = kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  inherit versionNumber;
-
-  dontStrip = true;
-
-  glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-
-  cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
-
-  programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ];
-
-  passthru = {
-    settings = null;
-    persistenced = null;
-    useGLVND = false;
-    useProfiles = false;
-  };
-
-  meta = {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for Legacy NVIDIA graphics cards";
-    license = stdenv.lib.licenses.unfree;
-  };
-}

From 00e5b20d1789d8527eb54c84cefef47369003d7c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 16:40:15 +0300
Subject: [PATCH 121/170] linuxPackages.nvidia_x11: build only for x86 Linux

---
 pkgs/os-specific/linux/nvidia-x11/generic.nix      | 2 +-
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 +-
 pkgs/os-specific/linux/nvidia-x11/settings.nix     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index bde8ad361dc..c8ae7cefb5a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -79,7 +79,7 @@ let
       homepage = http://www.nvidia.com/object/unix.html;
       description = "X.org driver and kernel module for NVIDIA graphics cards";
       license = licenses.unfreeRedistributable;
-      platforms = platforms.linux;
+      platforms = [ "i686-linux" "x86_64-linux" ];
       maintainers = [ maintainers.vcunat ];
       priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
     };
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 22fd1242700..21e6cb5d500 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index bbe3af5d016..740067af558 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }

From 4b67702e5bbed2471cd550e38dcff8ed9313e73f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 16:40:33 +0300
Subject: [PATCH 122/170] linuxPackages.nvidia_x11_legacy304.settings: force
 i686

This legacy settings application doesn't support x86_64.
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 1 +
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 4f753a5cb6a..57899d6f893 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -46,6 +46,7 @@ rec {
     persistencedSha256 = null;
     useGLVND = false;
     useProfiles = false;
+    settings32Bit = true;
 
     prePatch = let
       debPatches = fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index c8ae7cefb5a..13e5d1b76ea 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -6,6 +6,7 @@
 , useGLVND ? true
 , useProfiles ? true
 , preferGtk2 ? false
+, settings32Bit ? false
 
 , prePatch ? ""
 , patches ? []
@@ -68,7 +69,7 @@ let
     disallowedReferences = optional (!libsOnly) [ kernel.dev ];
 
     passthru = {
-      settings = callPackage (import ./settings.nix self settingsSha256) {
+      settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) {
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
       };

From deae713d6d9c96cd79fcffa74081b181e864dd4d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Mar 2018 15:02:24 +0800
Subject: [PATCH 123/170] firefox-devedition-bin: 60.0b6 -> 60.0b7

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 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 eeb130ed89b..257b871a845 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b6";
+  version = "60.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "69913589af0b21f301a14efa66a625a5425f917282e9a28fb3cd21d51a62785fceeb810bc6f2b3ee7102a559f51379b5d78b3bf4540d016039c183d3bb069997";
+      sha512 = "b296f17578b97bcb14c5d3c24dd0587318ad49d6ab4d1c9f1632e6ac16cd217e069ca4dfe26c5da0b5ba599f1ec300c9e47dad3a12fbc36b13300c18b657bc5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "16a078dcc10ce88562cdac50fc8925da21e282fa309718adf0bdfa3153d8659e24603b1254af64770ecb0d9112dc6024ab6d1810ef0696b895ef837dcf3c196f";
+      sha512 = "e00cb5e5fd8360604b1ce5bfa5900bf4872d3aa3efad108bd5f17997e6ce6f1cef2925d3f90544cc003a029c155697c9a3da68a6b330b5ca23f3b8a20143b19e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "9f3f3606f80bf01ce66988f687cd1d849eb4e220e002a5652e5771cdf89269917a206ce1f1bee2191c61cab4c57f0b422a40c75f46e0cf6d9f278f4af4a4e028";
+      sha512 = "dcc97c738e8a24214abcb034b061ce92ae084252125d7a8230bf93fd79f37180358fddbc97fb724935752954b14258f6f8844ac05ac3d5a5e0f998e852ea9b9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "7ead7009ab01a8e4601bc5b9a40041619dd1df0f421ad4e8629360318589cb9acfc95900925487f4cd1619d6b663b2d675c0115803131310358335a9813a17cf";
+      sha512 = "48f5a1775d115458515e8f6338d4f74e4134de9b114ac3a7a3cad688f121c3611524574d480cc8bc9f9d98ec991ca159ffb0c150fba65ad6ccbdf343495e07c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "ef5f3db024f39a1b8d5ff0333d22effb4b82ecbe9a0f85b616c93a33ea1cce5b5a48ea3f483512044d16766f720164f773afb3a19a62be1b5458415b36694fbf";
+      sha512 = "b97490a5bd434bd4fdaf3d2922b0d2c603916e545d094af08a47ee45c6cdb53f0eb248bb570d5a2bf1a532e8583e63f8d54535cdae6111c8b114eaaac247d723";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e45c0cf476f8d1d5211df5268fcc49cf0ef88a3c6546003d5e4ade08cf0620cf712a5e37da643284c2e114a36b650f76bf28fa047edda73fd31200e5cc5a2a05";
+      sha512 = "0939bf8224a804962b6fb509ea9af63dbd5044bf585b43def172870b99bc8fb9e3bfa7a218142a80c7bab67ae9fecb7d274630c35cbf938f294d3db53fd3ad31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "5c0574a0e7170d7cf1c5d04ed06439161d8dd2f7cf49d7da88ab01dddad22eae72764b518bddd04ea0c8fb4820dee5223fb6c062175358c9531bf6c13df50900";
+      sha512 = "89a171b9be48f61b7c821e675a00b51e8eb6a259c69ab9f3051603c6e3fecec03c42de915f01d07c0c81803689a61ab9788ae4f6f14877076fa7a2dfe187a10e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "3650054a3d97852e7cc450087d8a9ed41c122737c57c588e66646a846c41a2a7553fea263bda1828a89532ccb734a0aee7fc2803ae148ee6942462045813a0b7";
+      sha512 = "fc6026947802e40494a4f05291be61c780cc70b0a572451b7fd11d45589718a40df2c89767ffb9aa1db63dcdb2ce660261222d85efd067262e6eaff6e6b33dec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "35cdc212c1ce673305dbbc05690b0b80323050b85f3793b4f0f1cc0b7416ff01cc1a7783066643cafb20206d5c8b51de4668c81849debc03cd71b8cc0aeb9375";
+      sha512 = "8b5e359aaaa20a9f62b897543d31c569eb880483eadead008ead3038ae44fe01cc2dcfbf0d856970bae5553176d79b5408867b8a4d652c2da12bb4bbd61db29d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "bff9c7b7b3da3f0345fbcffa4f7be3496b6d127fff0014841b500eee261e84975f19e44983c6177e7c2e4f93c30d8b94e93f3210b5ffa28480e639ca51d96151";
+      sha512 = "514297f576bb475425a41a47cf2f42792dd8cb3ddce218c9d52ef421281a34cc14a04e9621a31573a0e5b19f90246c0309b8a4b68d70b835868bf8c1dc80bea3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "2ae654744dcda3627cf2ce9faee2b04d98b18aafbde71bb0c79c8751941df2df3a615b62c5e9f60a4c6c9ad3700e5765a7fdd0cd0f7af1c12e724d6343d077ab";
+      sha512 = "8067067e8d5a869a043359dabf095de32a874291b7c70ad332e62deb7ff18e85f7c60d58a880ed466a26424ef01d16858fc0542516661a39e6303133eb3b3d6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "5b8dee9188e94ff32485a4dc94fe0afe9c0dbe5b6e8aceffdef098a3851e3c90e2e6562b7503c3ed4174bedab94e7cc8f065f591e8e1c1ccb9afcf803cc7804f";
+      sha512 = "8e2264934d7499c55b465befbaa2b00607d4e6ae2a63aa034c5470a1086ae09db747aba9996452499e567d7698aebe3294e86e5649507d4b2ab589997e12e1ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "56cfd8c2e8119ea515ad0051152da29f44cedb60e04707433546f44da1b67498221d39d38cc4c18c1fe7ff683361831795ab5e26405d3ca565313b5e47a1d32e";
+      sha512 = "df10773c792da6f2ad8adacd032ff516820532dfefc77f1f5bbd7c92d355f7ae2694b63153fc8b06ea6bb0966025afb1d834d20da14dee7e55309927253105d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "89e745399ec681fd121da56de264b92895bfb614a14e4d1c2802509bb0857aea75082c02166ad9d678452fcddb88dec4eb6f540a51a8257167a585538757bf43";
+      sha512 = "d0865076a81e293b7c4ca0ed29903dd0b6bc93d516fda6330afbd06995359353692385c0ce43399a07c1c8027c164277c6941e80c7f1b0b793b346ed9ff1860d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "49c02148c13c7bc9994d029b108adb8d6622c336f4a5262fbc6840527adc53af366138f447fe91ed436fd3b8f625eb57cb227097fac78cd92df50af00bf2b687";
+      sha512 = "63e5e19c17df4589640b4c11cdce7d19991336da61f7ad484600ded979974995d8eb22fc97b759bd5c8c1d251ba7fe6b222f4faec7f5eae564466ee5003a30c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b5c9fae4d9ed3653511b6a7d2701f539203e39f319268332f726ae6f2345e356715ab26b92157cc5f39a285983f8d29b3e1bc1a6852a3ff6deab13b1cc169948";
+      sha512 = "a0206ac251b033cfef6a669729f5d46ed4c3b80fd3f4bb979ff304d1c479a713dd19f2b1217695a1a61540c9e4af5c9ef96a20eabe97c13617674cbce587e9fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "cc4f76b0f3e8cb1879db79b324056f94a72458ec0d578698e9f59a61096684f940174cffcb90a9ebe5062ac53dba62237582989c86bdf4eef6b0c54104e289c7";
+      sha512 = "88c53b3220f68aa626a5e08c00fec4f99174e2dc7cc40aad30f4e56d7fd555dab0ed564ae4f831f9fe0ad844e0a0c5019dd8afeadd8a7203b460cba15ccd0a0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b7fd250110db719aed55f3508274ecd6b9eab72606947309e8d96d2fe76552607724ff74aeae12f9fcbaeeb15569a05d0449a051d18304e59df8f872965234bf";
+      sha512 = "f67f2af138a426b005662a99ad5991a3ddbc2b1629561e542c49b9bc1c669bae64e0f7f2ccb91b229442ac8e24a4ddcf395c986cd63922791007cb8e50da3f4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "2a8c8a4c26fa9262db29aebbb5e9df647340669c3d0f549efcdb3f2ba4fa196abb22942df8b3358ec26321f0e264328fd138e8603157da4945567170f59eddea";
+      sha512 = "2a13c058eb565a993c07031d586eb8131ea5ab6eb2963ecbcfd3bac7ba1a73f4cf6b03f7b6d8bdf7895630da9ea59e1dad185695293eceb3a36ef1f9a6dca8f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "bd197a1091b9401d3759f8df407d6bdaee36184e0479dd6c75ff216f73e3782739eba8bba99a6733bd6fdb25a0812ce0274e233390762d622ca3aef5bfe9dfeb";
+      sha512 = "129857f8609e7bc2aab8bc6ef4ff3fc2bdce9c9ddb5c5ae2c9db811980e04773964d4b6cb28276435995f887d0ab4affb574006a3d924dec893fcb379125cbee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "93addd3420986aa0f44f642173b2a24b47bc488cb795b85eed0e01f99208b7c8757c6b1049ba519969047c18fdfb1fc1f43c397da75bbd7c763a4209ac6a5681";
+      sha512 = "637e6ae40a3ebf9e07db45df4c8719c34f3f924fb65973013c55fbad8c88057911034085cd83bbdbfaa7c5fe553245b3fd14eeed66ebe131b7c640f9503f9036";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "55cb7e0789b67d00a5b13e8c4ec2541ebd7fc9edb9cf5af38c23c937cee6b1f1900a73ee0d9c70a088d9cb093c806f309b97ee487532bb0cde1ddb0153150f62";
+      sha512 = "b874e873cfba69bf8f5c9f6deb02b5d2c958ecfba186b3f888a29095620f36c51993dcbe6f860b190405cb5924cc8c46a687ff61c746e3558568e4f77a0e80be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "62545eb38388650a91b3565237dfccddf9962e174d51b2cb5e38471e365ad155af08b4a04229e472669a5ad652b57d47428b90960ca09c4c8ece09549f23a01a";
+      sha512 = "2735d0b00e9cd24b96816deda48be1dee3499a3aaf2638f9e2d69bd741c50d4559c29279acc6b535183956cd383d96f3fc1d97af42734dc662896db6f39b4d3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "e5da78332abbad7c913dc917905b5f5e1d3e5a558353778fb02952675da465dd619c544441a42ab94ac5c14077f380a240a5592d84a6e84d4bd77194e1b3eca5";
+      sha512 = "d202d77f12eb2d525ff0fa692c3f4c2cee721ffed8cd76edecb5e05b91a714d50aefdfccff9c2c00886f937ca701d5832ef757700fdcc33ecabecf7cfee9989d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "a9ed1e33b92a061e6578a4edd0db18216bdaf350fd5a65f75fdf7e3f130bf007abee353facff8bba2a22dd91643dce0c3e22055474005aec4aceed7ad8752973";
+      sha512 = "5dbf297fb4fa3deb06e40e9babe4113ec745a0d75b189dfce1426428cfd0601822f99bf14c1b3179fbf1781d21f005ce35eb48bdef75354754e3d19182f89705";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ad70fb5093d24c2d05b770074c3ed3605a0d131869bb07e185fdbb3f6f51de6c959f0c46af108718d17381fcc8e20d4ec9dee2d56ee02c4b056574844880b2d0";
+      sha512 = "baea9cce74688548cece12939d21cda6c144041af233692cff73f7c65b1a7ea8e8da2567e7708792d5fbcaffb60942f6a7e0168634d1e99272540bcbebd94e7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f15fe7fdcfc4409fb14fd4176539520be9fc4af45b4e62b0d3b8c7dddb946485d208879003551c780efc0633031bb08f46f5694340b9340f35532ca1ac6077f1";
+      sha512 = "9938be04ced6d938a8775484ac4a2a6bb26d3983669a8d655f020d13002281ad10fb78aeff12fa83cd0aaec76111c7db19556a72c98c6be8cd0ef1f27e33610a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1024fb8811a0f97fbd391c406277061cf524414ed63a48805357fd486476cf744da28bbc166ac419f448d01748eda2e3243768db81965a4c7b88f129e0893b89";
+      sha512 = "abb228a45b18cfde9006f0a8bce48d16df4a2b5bf378e5f22c25accee1e5e50ce5a27ad9700651f6e06dba366449c72142c5f12d8147f3ed1daaadc9ad873291";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "27645528b9e8daeeb8ddf417820b27c48967437752a8a4939183e8c646840686d64ca3b21e6f26270965c0e54e44995da4ba1d325be85e740d6200ecd18972bd";
+      sha512 = "73078fdd72f4a4e1049d3e586315671d769395beac8d2c942c145075f64c6c559670f9256086a61d1eb0e7b017e6ccc96697837341878d5284fd36ed83d34b90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "863e4e532c22bc2c055fa354674b4dd38aea016ecc69383b746bfc0b70b634e0ff881dfa3de33d2a21811a9ac312ae2d7423fe8813c31d3af4d4403d07e5a729";
+      sha512 = "1292ee821d166f3cd854a3eddda9af6f1dc51e0c6a96be3ddab253d73993081172890ec0009f5c17254a810447a54e0977848f91c358edf0fab409c4c14a3518";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "a72c6a0d80453e82d6081fdcb702fe2f91f17a7cdc4f1ffdfae8c340bdea87064b4ba7f52d114fcfd87cd30242220bd44b36f01d0b09a7cfd7808de4d48a7117";
+      sha512 = "c086de065985c639c2536cd1d68d5fcca2c45f8bdebe320d59a38090d4207ca7fe19ddfe4c8aa3fc9237fd7338b5d6e1c9a78f3ab4776a080a1079287c46dc5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "0df9a0cb44c7775e4631a66daabd7c02f1d6bb38b87e9487d13e52ce02a6b7a93d2bf87c1ff6a7d8275d2f4d0357cac0a87ff9a9e9edd2b25703b8d9340d3e1f";
+      sha512 = "79bd164b30b4fc7cb71a9dd79c8c55c8cb5a4a3ecf3e1e50760726dd740a22cf467f08827bb5bf11e5268d13db52b47a3d21950aed5dd60c9cb6bdd6aad0abf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "2ff27ca36d90608a4762453ae89a93eb130acb8bae864e31d30cd135820867730deeae4a65bb942d64346fb9318da791d51318a398bd2c44d8addf6c40296e52";
+      sha512 = "53a4b5266a68b08bf94ee4911cfbf61ff942b91ef1d908be280bc3dd425849fbe3b1cd406aadbf0f2bcbe7e2ba704ade48afee690663f305912676f6830e3fbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "cf1513ca85ba34bd863ed0f1a1f279d86778733a83114b0a055bdee7f1dc5742ac9b138a564699a28acdf695b5786c8d6c92999e588e9597fbf79ded3db903a2";
+      sha512 = "008b5f8f65192c4839d0a6b09137b44bec50cced603c2280a93dc76a16a1b4893fb5d9aaff50e97eafd843a2cac632e80150aebd05074810a23f767605c53ee7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "8236fdaf20caedb944464eb00cbe078bd64c904f2064ce9b884e4f84c72237e6848afb4247d6e62f7452afe0c13f233e23e4cba86933eb268386c78a9b6e5d8c";
+      sha512 = "f593320a45d1a8b1312cfba188f527dc5847be1bd91df0e9175bc29aa83d4435f3f508e2b80566fea86019b1157c7fdc24a4e639727eddcd9e121d34973190a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "7eb670c2c408976701391ae65889e49db09cc8c155069da4ec67e6f3a8d76406297b13fc60d4253c0a664f41bd67f7482999f2c2c9d56c56aab02d1a351f7997";
+      sha512 = "400e28842ce0aef5f813e74c3450681a100a26afd5aa7d9f53cdcb23463e75513c63c3ecc60a3a134e43d194234088f6403ebb74616eac2539efbaa02931d671";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "cfc48df47e33c7ec1e2a07b5ea915958a4762db558226cf78e014ebf2578660f93215272137dfa52f5a65ab1e99cd24f293d145e7dd1015a2cc3e644bd4dba70";
+      sha512 = "89da8aa715cea7e1399ab315f8805744f6ed45cfc5afcda99bb3fcaa46f7c0f35c9d2d06bc708d9461616bebbe926561d292346555a8c2470cb6b2ff88589c3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a97ce4a5773caa3359828ec9216661ac480d9577bd511c44963309e46216e74e89ca876de035162654a07f5002359918f6eb4b7f1c305184e51461ce3e48ec51";
+      sha512 = "e9ef581defc3e8e161f6a8601f2ffe8fefb6fed876dba88b13c54b30a719b07c406db0d40c9b80f99735943985ebcec7802fe450f8ba5c32ee956dc5fcd46963";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "6a02e273b1998654d9a31f9589a44c9f30975976cfcf3e9d74f0e66508b991e7eda148756951cf5bbf781ee37f8bef380c12d3c25637d7557d2480a6925ab629";
+      sha512 = "c224bc20c1e8daa860189e710060d57ae7da1b7a2db1db5bfb096014af3a0d24d66ff9ca0c0eb226fcab1cf2ed512329a98b27b8d9647e2a2a681ec57acd9025";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "ed5bb626dc1a0c29f4f7e222b6090c24f6803df53baaa632727fc087dff5cc4a97a85b9105e9d5b228cb27df95f50efbaa7298a4e8c3e39eaa424a7d08dfe042";
+      sha512 = "1d09ad8de34eab1483405793334bbda5b7c2be3a539e020d34f262f39515404efac8686e1583c04363e13f3a6abf725d3973f8603686293572673d79bd943fe2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "5cf25bf3820051eab9e72637a66d6f1c082253953302363c2e95bc026422e84856dbee180c86b4c9bcf186db5dadfcd20efd6ec12e743be90d2a1b3ac229127e";
+      sha512 = "d143c07b03d36c62d816064f417da9d0910ace7b0ca295c571931e5e827f77ccda6a7fe48a73c048971630742dae38c7bbcdd0f076c26ab39d649a73b237b356";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c0e418e15b74101c09ce61296da0cea9b94300e4265dde4837157330082678aa7b92286db2c883b7ae5577d86232eb3e3337d9acecbc2de14dfca5032ac798fd";
+      sha512 = "cc05b4a6921d505e027a7f071505d1047d7a5deb464d76b07fcee192a38942716fb700574a41eac7f4ab77e94270f61cee78242be59ec649e73e93721341cbd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f9859b355359ca2ae8833b52afb8f4830844f9c264cf0ba72a7bf72bb0070475b0fe4f4d5774bc3243c834dbc671b80c6d428a8b6828ea43b600be0c90f9dc9a";
+      sha512 = "70e3c2f35f8fd3415e28e84a12f7cd657c7850ce8a6d9deb33fcfca90798dfe98271ce18d3833ca5c5825747a73cc76138cc1fd372acdd0b85f155a50c1f4633";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "18d7e9659a284bb0f60d3f59e1d711844c75e6213b26445590fbee2878952aec0a42f3336f2ec20cfef284e41f1d8f2d3677ddf767c94a00112d021b95d2749f";
+      sha512 = "b85bd926fd24ad9f07f35bd831cc6cbf0a228a89150b0387ed4ebe8e3f6052cc47f85f5627fb33b0b8f58ecd90d6987412e183f0f4be9925e30cb8fb62116ae7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b16bceeaeaeff3feebe8d895d92c32d23a6c6cd799d2dc7aca95bab84deff4288e7625eb680125695f144a21deac25d57d5c670424209c9e50e48052eaf10460";
+      sha512 = "a3c142310fcf970cd4bc85be065794b25d85c7356aee241f14214feb17a5585094b730931209c1533eb5e2d8890bb0ac3f252e70942397530dc001b1d3eb43c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5f176695bd41afc204360693f6587b54c3daf579dd0dee798228c5e9be09e816c9633d1ac0d92fa1c5ec3281354fc83e07c9406625f04c7331e0fce56414b7e3";
+      sha512 = "36d14585e06659b879cbd319770042d3652d2e7cc2db05da64358c7c1cd17fc123764c0dc9e1da9d242c5e8deccc840d80738207b255f39c94a209572dbf437b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "724622a046e95409f1dce53ec389d86c6bd178f67cc4cf3037a5cd924f7d47a14e98e75f09dc0a7cbbc3332469d2c0a11003a3b99f10996d64cfa5c0f607916e";
+      sha512 = "cf0c9b369e3557f130fa83e2e6c603945d9ef257f1060e6910a5ba1431c9d41839ea1d9ab51388ac91c646252386ae7eff5f6612748b00a25489f399ef447bcd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "c563d9670859cdd0dc58242a3c456d5dcfca041135d5a24c2c5cd26e61a41ccba540346f66a48cae0da67ee4d6e2627a7845d9cb794cb801f5a04523af15edb1";
+      sha512 = "91d7ef34465a184646b51750953e114ba326413117678187b4c3770859323715edae2ce1ea5a755b9610197ceb65ce3ce6a1f9077e45c3db1b89a3ad11d18367";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "d6695401cf7e7120556b93aedcab43e5cfd4988136fd40591f9c878b708ba449daa3a1bafe09a18e4ed51053a7c6f646a29e94438628d81f409063e48ad97a97";
+      sha512 = "01dbafdbd7c48ba8f3da536e5d25fd9c7656125cb508d9c52d413625a77fb0fbff2baabbfc2d8a636a29a35e767d9f055dad90d3adf4f6224961d1de7866eabb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "7ab5d656e411be7b94d75d61887a9ed231c72b1f58b72f803310b000092c1f7d284c382a93cd998d64912a548c01785284c1d10f37359facf28ddc0f77ab5584";
+      sha512 = "09f6e0effe61d0b24ae3e02937a1408c08a8c9601451c632e61856277ac72a3c39d7153b768eb7a7cf3af744c919f3dad969d11f6b84b584b2817a2a518e9db0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f1d7c8abc9b9ab70c4444a5a9d04ae42fdaf04cf3d865fe23e8f29a5713967385122520149e6e0c07ba54d7d376c654d730c671b027de047b77c584664222867";
+      sha512 = "f536df8eb68868ec0174531804bf91d552fbb41afb74bf52ea7c559431a194163a628da65d5218238ea91dc19f65f0bd44afb8f1d95aeb0d072120d6fc7f1f13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "7ff45b4c97399f451924ed1eced10e02fff31d8f0718eef449eb52a7bc7ef62e90b70cfd1796cf288e227b1fbd1a3e109c4bc085b7a3e1d2df5a90291569722a";
+      sha512 = "17150e6f79cd485477a00bed5f720c82683a45bcb94e6269a84068adccf06f17c4610e0e16d0b208e1ca864349fff0f44ae3f6c287a20249631469f783e44d1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "b73283342298038102f74c6d2fa3cd947b9f03fcc2b8a7eff77b56e9cd6b0ec6d8476f8146fea510ec0ea2de811a61d8b86db0f412f4625325ae78ae9579d3f6";
+      sha512 = "582dabb84d58aaf61ed3d204cf5973d320b447c2eaa41d246f523a10061179fa73d8327bdd0c4ab8def7106677211caf424476674370731dabcc641d88f8b735";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "182be98cf92c1ee0d13fd7bc8840e54e4a2facd450f2dc9437af8363e202628ef8d5172af7e38ae674f0dfa7e1d216a9d6750c62e574f73f6f61bcbd370f786f";
+      sha512 = "dfa017fb5ab7140cf27d2c0cb305d4f5b93d8220995d50f401af25eec6235dd482f64083bee4dc72264094a9231f866ec99cc8f0de271dbdfbf9ebbaefd7af9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "bee217e50d42495730a9b861b07eda1d68f761b87dc2f3cb3f4e174d8179f65eb8e00d8564e8795ee10b736db338caf0e19174bde043efa8c5fbdbb12db55394";
+      sha512 = "3c5ee916d8f01ecdc0132aaaf6506df41a603eb4e373fe9c8a8fc21f3015dc1643e3153984b8b86f6cb230ac3dd55296913684c03c0b0e6a11315291458b5c60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e2366510cb2a0929689e255c59f029ca91faccc12ee92b42f6e9efb96c3c5c0af941be2b366ad6bb17c1c64fd3be18a9ec02ce2fb0d4a5e37bf94f3c49ea449f";
+      sha512 = "19f0fa885b869ef5fedacd46a24621e9132d23d042220e19a10ac8d5d2170a7eb9a39b4c13c0448528247da9c61bb580dae05a1cb80e7cc4775b101a1fe307a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "159186c8e0456900a60b1b896d60b5d476f33ad330ebf926c8b36690eecd7b7bb365ef4b9ad2a5ccc0e3ddf635a7d6017a7ffa7919d1daf7d15f0bc4f7897678";
+      sha512 = "32107b6e62961d30e9b7d17cd96104d6ebc761ff6d9448850222ee2909958cb7ef0fd51ccd883280051926dcb346b32043713cc5f872fc99a22ecfb46f031b2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "7a8a08f3a587e859daf4f385b8abb5d83ea23cdad7797661394bb39bce04581d3c6aac417154ff9eb0f842a8b9b6280dae43edb8ad559586b6215d1e9a1421d7";
+      sha512 = "3b798d8f415d35f260566ecefa1808f547bf0dd43330895f0129d9388755b3169da8fed80079da1c090f4707acccddaff05dfd2d37a4be562d07276ec2672318";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "471d8a445bc80a0c091c1dc07314e4256262299e7080656b4084225d7843dedc045cc30623f2d163937dfb5d2938564660a161c4f9fc0ec217e1238354e991b6";
+      sha512 = "6fa1f9e9b82ce40231e88b8439f4dbfb15ab40e2583fde9c1129fc8a668d13e3338bdaf37deab90e2c87ac0a8452c90eedd11c8adab1356a9d9d5035b644f522";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "968498b4db1b3b07532a8900b4f4018339ff988a13492bf2407bd80859abd927d571e86dd7c5363556c510f3a1559479f4022060f77bf62322fa8d3f41ab2901";
+      sha512 = "d330c66e31ec9fbecdc5fe56d50ad2aa6a6afb49c098a6546a093a777fe415a1429b233cb29405993914836314cef2335b0d5723a1fa67070f294d3d5e1bc467";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "7e1e1a8189e76a7bd1324e680488dfc5d5e2c6616b0b8c30d9511a74c04189e4e20367e66ea75dbd3365c339ead9f58a4c95553590bc5e09f977582014298dd1";
+      sha512 = "041fd534ca158c3e073a98391d903f2d8a738aa71354b30655a4e96c7490922208d7534f7008d6ddedf91434476346f810441ec56dd76201b81672b51faf08e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "b713c0fbdeff13b0ef0c1cd45ca5a5b8239afdc4e9644399d69993a01c5a6f8e7fe935c8cc45d98567b94d7ff3d4fa0e17cdf16fbf29cb1618d8618a5967daaf";
+      sha512 = "f95b4e9f08e9d89272f50b7841660cfb9db01f3f5971ceae239219c7b01a16f0bb5484f6e7fc5907e194555774d4e57a8664f9fb026c35adfb74dfa0b246a769";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "85e9aaefe76edcb25f9ac86a90cd44aeddd480842382e95c0d95fcb3d05ef3ea7dd3861ff4796d4a3b2213d7fd94cd02136cc409cf9cc73748a30b97b882406f";
+      sha512 = "6a093c9c19e2ec27b1c1ebac0626a644789b15963d04cbb8cf6e1ba584913b9d886c73b1d60c1ce90a2524d243ea52460decbee433e67a88c1735643927a04de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a462bc19b39678309fa2efaeb08eec5f10b31eb2d552ce6c5c906643d13bffe152035269b26edec6674b0dd56f91c82b7ba56734fb99f4f65561bce4c76f0582";
+      sha512 = "934fa8c9a17b61472d324629b397108ed746e7f7586868734e01ea9ac6e23c75cf1237b5f930a11802fb89d3c97b3a52ff44f9b18a796758edf623929f61cbde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "538c0985685681a22fc6ca3bc980bbe0401079b3aa313eddc709d7a98c8cd17bd3ca984734ef24266099549a75ba71bfab0459734634e6843c63b13dd91996fe";
+      sha512 = "05531b6333b123cc9f2f677043a4b7e5e7101ccbdec684603ffd9998433f09989bdfabcc65d57378823d0e9631bf44b29aa78938339619c0f34ac883086cd50c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e0e0cb40842658c370ec275726f7ab1dec51d0efcd39f9ba3b3a95daed2e8e2b409e3952ed0c4a9ef2a40756464113bab55bc10f9f3801d8407151e8e649000c";
+      sha512 = "9353da96ca92385ec156606e2f4cc18cf4c04ffc3459f8cef79778bf8a3440d47767d7ec67477f4ef535818e9d4faa19e656289598a50f0b0300df7b81738a32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "3bcbf9f2b943081a957cce922ae56d636e23c5fe6b582ccba468da0a337cd1f1b4d14e84f8f971cc6bb65d61269004f2ac53efd30a9e784bc432c37628a86262";
+      sha512 = "65b0d02e215523d7a859f8ada01fe78f5468bbbaf6b2d4988587383d3c008bd7595887804ba91a284fddbc613ca8dbd07058e9403c7bba808b57f7589886cb23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "9bbfcad0557739cec12539a36e7dcfddc62294ec2250e4d8087d44bb461db45d0511a4d4a31e968e22912c84d4b5e5fc1e6f68418c935b9d31b02de18c0f37e7";
+      sha512 = "d31ed2cf15eca0aeca8267257823a3d294a96e1bb64c4e56d7a3a1098a865406c3ea2c741cfcd2f6624f00eb5fd61430eb2d5bb841c9c8c2f1b7ec4dea2178dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "d76abe1a6a98901488b80b60dfd1b1b4118024ce3f860d4d6fbf371684e335b0138157b26e02a95c7eef0bc677ed3a6e32eabe198248a2c50febaf30ccd3b60f";
+      sha512 = "cafce03f660421ec23d76bfc52575c8dc1cb82542d205f3b9c1e9217c636a07e86facdb2c6a43808ad299e45aaa85f0a44a41f9f67ac1bf2feef0c81eb582f64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "a0c0dc00686a3774d74311a04860d409a4e82ce79df57adf3de6da25cc13ff054674ba0c86eb36b0d3a29d7d4a3978202f4e86b18b8800e6af06e68d7524edfc";
+      sha512 = "49290b484575b2de9fdf06973c14be9640f5ffd8c7e54a2462911234670b3e6ed554e92c5dcfd40ecd7100c50b9427873d9105835877661c8a92a6e181d588c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c4f9b3e8fb475403a3b64278e4f2bb6e216f32d05077e837fdbfe11fdb4aedc8e7f3034f112295487a50d30b5c109445994ae284abf96100ab2c756f33c9a61c";
+      sha512 = "c9b5ee5942fa3064bdcc629ef672253cf87f627024d97158a1b2a4fa8f1e6fee46e0dcf68e163cfd21f63b7867fbeaf27faf9893f182eb8d0c2f37566009700d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "4817e979a82b22116dd329ea096007978e52513aa6b6ef66fd4d38fae352873f8a204f1aa545549fbcc6df1a91bd07b74a27735ccac49712793ce1fa88f14054";
+      sha512 = "18f4af488f0286414e03b38aa9a03563ab8768e161b874ef8bd8e5b35d9605866bff4a24684180509c0a4bfce168c2379e02d9b3bbc22e25e914fb035fad8ba7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "b262aef80e28385c8caad05a381b3e086abf509e402c639215253f006ba773b70ed4592be1f8a0c2f43a82f453a67910f5fc5305f702efa132e4cd2103df3407";
+      sha512 = "625e9497b9a4546ffc9c28cbe5c63fa8a3cd6412b16e18123de5f4062dab8b37dac381661ad5d9aeb91c6ab65dfb956cae3148fcf087e342bb52df6472c3add3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "1dfabf1664ceff2000945e86d4c7cf867f86586e440462275e693194ee25489ef9ae50de95df7b0a2eb76cc1370f1c345c9ea2d7f68155faa2d08fd1694fc729";
+      sha512 = "0dc3a1d0cb54b9798ca42906a97982bdde4ab7fd7daec5d424867107c502fe742536b7bcef0ba00d366ea2941358fa2260e32ed491926ab58060a19e0518af88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e84e9eeda4c98a7729e5a2efda377f4010d7d403400dd5d21b65078ddf15fa9f86c2b64512a195d8072ca9dccbea49e9d3e7b96d8ca391cb3886a204e3e5ea07";
+      sha512 = "3355f47c8e8d0b2e5c7323baa356d60a47863b808323740a766494e7ae8c149b064b5d34cef38a5202d6e1ae0353fba6cde14365e785996ebf884a0c828634a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "3c3088d249a72c565fed6f6998ea558c65fdefa654bdad5bce04e46aafa65381f2972cc4a12b2cad1bacabe9f257e16f91b08f851c8a3387dc4e0ae842528375";
+      sha512 = "86bd1d27ed36ebf84a72bcf5c0ff0dcd800dfcf53c5e34f2f7000dba8894c864b985d85e410e8bdbb35fde8bdbae2198c5f4661d20a84af87bff25fadb46f49d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "329ef21051652bc5d0fcdf55f2316f2cee19c16ceb33819e03c8b50622f86487d5bc86d5cc63fe588b2b8fdd333bd11e05a1cc36c555049faaa02dc369fab71f";
+      sha512 = "b06fdfd947ea58cb8ccfc137cb488c1cbe3c643d494acfdb6c94419f1dfad03866ef3d1d14ef7edb45aaf00e73405dbd1bc594ae195ea91dc480a4015226e1c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ba4063f13a0f1645303b15dcf25d7592983f42d8568f873d49cca6be7a28d115f483e6fd09e4629510b6960a84fd5c0d999b93138d1a39dfb7783a65eff0f068";
+      sha512 = "6a668a793b6bba79c476f58c05d1354b7598ac424e119d514e04e0da26cc4610f162a6af26e169013670ae97acc4c67f799daa06615ec3461e41d10a82202657";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e41ea2b85f7c5fb1e46a7df01e90c7a570b3d026be785fa9cb1550770ae0cb44c80286885d6bd72b20c373ce201692fdea6548a6402cb09ab7ccfcb824702c21";
+      sha512 = "20f3a15732e4bb0911d3546e63a61a175c49c496294851aee86a25508c9a42321f1620546175db4a5387ac2dacae0e4baffba6b46b6cbaff5d0932c26cff68c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2dc99f7e36fb4a01ab79b72a7f55e6c98bfa8e1fa8fb0d682dafa33fb9941a0beda6f79faaa3dc0f8e38766982e39a04b96c9fb91075d08d1a1fdf5caf848e51";
+      sha512 = "e0229a82be96e88cc3169ef9bfe2df4e4c909be1332bea72a9caf32235146594526fb9351c7a787a1d1e95fefca955c962ea58d3ae3e978d921da8a1096d3e8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "2dd5dccc3fc05dfd48690424e7d88cb85ddd48c17d159d21cad67b17ecf132c487ddcf129ffd77de14c61f8dce9c297827e9fb77316d310db7fa65cbe23752b8";
+      sha512 = "4e1acc4b2a624e2bd14449f6f40369c57780197d01e7afd5ca9f568e091711e92bd99c9029d540adf5abb10479816646add2094f5e7321e3aa17b457b03b07d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "84d2d507bfb684ec308c35a8fa865cde2b36e8098f85c04008e07c7f6709cd30171dc1519048cf2f7dc9e8306135af485175b192921df0fe4b3fba45cb00f7c2";
+      sha512 = "2b42f4573ab90c0a99a2b37dfdfc0a6454ffb856dfa3e3c31a74322056ad2f3460a58b3d21140bc2068e7fbec0d5a329ccb0f670643f0700474ed65009c0d429";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7615b6451a0982250661a3ba499659c5fd17231889df67b885b2168060f83699f96473ce44b2e3ab3b6464986038585a899acfd7afa6c3261a4c7c9361b7ebb3";
+      sha512 = "f8025fca340f791b15f0d9d5f9a298d8b2540ad440be9bcfd811c0ba45a839fa76486d4191a0d4a743af629e85edb9c38f602d918a5727c4e756002628b508d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "622a1e87593f63a4908144b784caef9995e6b5d5351748724aef02b1c14ba25ad5541365bbcbc3f6f230655156f9fda86ae81510c4d5c352555bc7be82788695";
+      sha512 = "ca3f7f90ff76670406600c3c55ff77ac456720c89ab9a03376d7b3772dd9a279dc07fec19666b424ef328a24692323970e9552bee44eed6795d9e4d4b6e7e989";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b3983b779a2336c19f3a8ef78228b78ea623c8bc7dac7062ba9fbed73b49eb62a1dbf5283e22be967930dc17f11abf7fed8ad4a9025d158a783349eeba2746d9";
+      sha512 = "47869c846d5eda3f208d3485db3d7329c291147fdb66c9aa05e23a0c9fb94aecf578709eb9b4ac58945bb3d8243abc6c4faad968e77b6151674cad8aee4abb13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "595684c03e6664d9afba2ebea6b621baad182791f5d365e4865450559798ebb620cecadc5d9f93c99bd635431879c21dcd942611589ec1ab7b6ef1a46b92bc19";
+      sha512 = "37c8845ff3668169288bacfcde152b257e12b320fb624b4f82eb565cb388c09082338d3336f827f1b1a2960e719bef1498aea3f5a0d9d937bb83ab4f3c194616";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c605eb65b20826609b3d3eaa3fd41a4b4d0aa5e9c76a316ce31932e5d627d7e50df7d0284381d108790a82385dddb65a2e4b27d04f2d3ea7e168bb96b1dad5ca";
+      sha512 = "d09ed017f8cda8567db84dd8bef373413f93ae5be9bd4be085f0c8076afe62ac08adb98e8a54996d761b27e0b49fb89a719629e6bea8354bf51203fc47b9bb14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "3d57a416e7dcc74ee89d8fb5371b1fb0bc2246999a134ef027c66c70d6a131aa5972c00a7e6a4f215c05712fc616e998b88ee4ac5e7bef1837aef31b4430477a";
+      sha512 = "8a30ce7402c05688b65db8f8c13dd271608150e84ceddc27187a89ba58c592dd61ee078f061ed8ae1ae1b6ceecd6b85e88c10958127dd712550263a4e7cd1556";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "f4eb7e97109f1f4a9b2670cd60e00a6cb02cb6b7717d5051738a1f197f083c480385642a3134ab382df86a216613586ed2268cd9a1e6554d7986c638486f2f1d";
+      sha512 = "d3f9afd0d46f3e3eb585d66129a6cd9ddd9e287cf10c1154439025eff815e1f6cac27f4a6c7110f84692c2c4cda5e9bf79c2a852ccc4ca5ef764171a4268aa49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "824345025c9980fd43d750c890ba16c2fcff2a6ce0ba124c35debb69183b92040ef4fc862f6b7bfe282fc20087e0de960093eaf6a95d5e56b8a4ae9ec4710948";
+      sha512 = "d49e251ec1b0d570652efa24526760fda3dcfac5d355d4f158cc231adf8449a48f0863966080484281985ce41ce7959c05b4918d5013f727ec73d22212a9d906";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "87a55eed53878401f0a11c73fe8afb3d45ec4a2ad1779e230b6b43908ad8c0915e3ef0f923bab911c530e0b110fcfe18893480b8e85457d037ca2f9b7e838e50";
+      sha512 = "8ed8579a8866b61d2946976f3086ef7bfb743d8c5ebc84de57551d3b3b1d539447c8f750346b045ef04f215b6fef1244d44701ca1278714af74c4d3a06d158da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7ffc03f7ce3c44b185bb0b443c3c7b8610fc7f155e71b829553dd4cb0ed52c59bffc0bc0e7bfaf03ed7f4387e9a4dca5c0560d993958fb52e91d1cfa62775386";
+      sha512 = "94b0a77e93ddec74bb8c77a6d087bf463019afa584a1d06b69eeedbb817b8846fb8706241c057c6f33ef1480dc72eae7b1191ea040c67094a83b9c650b62ea7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "a46338a641a8b31a8d12fee7afb67161b467f3572059d5d44ccc2b8fcef44f66e7bffd5c3c113bca100e9f72a101f50611cf5eaccb6637eb90d56ef005671de7";
+      sha512 = "f38648dd9162dee03b1c17638c235fac73099e58d1ac8f38ebc3bc0d22f83555f2dcfd5d07448410373f030f1463161c5f93268ad4bc52c0186328a9803705e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "b7b9560ebf460368d76fba33b0685ced7ee3cc2b9ce7035eef413a2a22c71e401bd64ad5dad3fce92d3141305244583bcc4c64a397491ec4b2b18c69ded60d2d";
+      sha512 = "7ed9bd4713b95e5078e2619054aad9e42c3996db7d20071383e2c158ede85e3527c6ecc2b8b6bcfd0541c32a4c2fa56591721c937cb15cb0c898f9e0f5448afa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "7ad200ce8927dea44d2dc998d3f80147d4b580cfea2f1492ed6176cbc6c7ef8b1704bf3ad631298c119dc1207d92b44d2cc9213db7c03e8c01486e0fc506c0c2";
+      sha512 = "a9502645b4a8e3d63fa0131e198ad07742247fbc8aa52a873fe1095f3e52d73407331a647220311488d46c4599ec4d21b40050612b73ca3f1bc793da1aad7157";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "3f6c83edbce8551907ed669c21d0d72e8279da81c28609e18f2be5b0bd44fed7b08315da8cabb5056238e921143b2a4980098ce82ae877f4bd50168c56bbb80b";
+      sha512 = "58ab4a269c202d2863784d20a274aef9f9e11c5536f0542d77b3bcb5ddc48815659470da6193db5f12491d164ae47a2761d2d53ab8b68e7a61c4d4fcfb262e27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "bc99e02df22497b3623e47dd1f05f2c08b9517fe9c171cfec899f9b682c4bdb8ff900a8cbf31891c8db74ac7acc7204fdf54f8e8b5cc6acd17440b168b08cf00";
+      sha512 = "320a259bde544a2f9876ea31b7117b958a3b9e5962d6d6c1b84cd3c0a13e1da58817b5844e4833ad87fba30dc60468088e8796ca2113993dcaa5941739fc8fee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-x86_64/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "92a7f2aa34065a7a5daa82f8663f9eca5878723ce8f6a169cc34373af8c1a04e50902d55cbe8bd23da07176118f869938986f1547b429318aeec96acaa2dfe36";
+      sha512 = "9640cca8e0a4c7ca4758532acd07e1f92f9544fdec640395e6ac1b7daa1c3e87619ea8f32c6509347507834188fcb4a4e7b61d8a8e16e1123475a573936bea8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "cd1f367793a67fc8dd5b9df8a73de85553e3d02007cd1aa5a90d156d82cd6612d7e6dac2cba3567e1892dfce7b2e507b77fe8a0d191167671068f6786624675c";
+      sha512 = "8c5c0d5673ce502f2300fdfa573b5763794ef98698884b6fe7f037c7dcde0adf5aa3bac0407df8c1486f195aec970415344cb46dcc08aff8144353e77d7d317c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a5ecab1f3c46264c76e0b631118c02705adaf3a1bccb92c6c863c971b602b80922015f0c1fd5c0448cc44f73152719fd94098b3c964d6aaf7da5e0d30cebc2ac";
+      sha512 = "becb389fd7e8574c7d53464b67329cbba901f6459bf96a904fd38e4489224b7d7035ced7f80da6a50bbe2321589371e3a46a78c51d9c388183de7d409b38fd0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "e94b95807610ab67e47e544f76fb6d411d864c33ce07fce4ee29bee101dc68f402855ac983094472b039e2c711745138991ee97f2ea00ae0f9e3fd59d19b0260";
+      sha512 = "7686883f06bcdd7d1d7affeddb70ae3477e7f4cc865e23541814c9b4de1dced322ad1b27a71748198f9678dc2f88d9bfb82f21c55f780891fbd0fc6b3d9f8761";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c3203b20feffca9181b7b0b5b22e1fcd31f8fefc4d4fb1a5029ec609fd2545f702cb91bc002d5cd4df46dd353bed75afab40cef3cedd37c79e002b161a3c767e";
+      sha512 = "f4de362efce3e639fae3795f5d5d8c26511fa18244264197e35a476b0eb1034c2045dd5518004d63c9d56d77faeaf437d4c6bbd5d673941fc908ffd3267f621f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b1e833c8612a23757d094e92d17c36b8db2418cfc903a8a3b1542d4ec77f606394adb55a6ad10da9422ab69e784570544bd2135dfca52a519935d391b3928f6d";
+      sha512 = "7692c77a4eee2ab32546f3f92d252b36848c662ed39e8f8b6ab3b25be93003c610586cc3f8d871da16ec60eae86f4ddcdf4dd264a30e5aa3e2fdbfb6395be441";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "108f4f6b6cf5beeb6939c8d22c75ae53f68d227c6341475547bf95f3423f26f40aa7c089be2b6d789806b2a9e35eba10046410b45ce032787e12aafb2ef7fdd6";
+      sha512 = "fd723c59ec13513deb0e8b7a25e79c7d59b0e2af037714e36608a76bac724c649c82fc28062e385b620eed71ce7a5743c828498e30dbd964376509f2a17a2c22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "9f352b4714ff40e65d70ef8e4488a1679f3c5cbd4a18d14d25e055a955a154eef2092cb0d378d5de9da3e16851f57697e3d30608fcd95072156f225e9e6e8632";
+      sha512 = "9294dbd56ac055a41e0a5abfd7c0c2e1630dfaaeb5f4bc88c20ce15b5ecaa43debd00a117389509f4c6c74c488f9893e68de36159fb791396cb886469cf772e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "401ba2a23fc180cb789abd5af3322bdafd65c4bab4f170d7d8f6fd34efc828809491698f8e1a5c217b93bec2827b7222c126479c1a4a96e3c0a22beaf363f90f";
+      sha512 = "f7a871abd3e91b904f69284e72467ab54e13a5f0f207237f520ebd290011f4bfc1448287272dde84bc0389a8708942e215cae384c6dde6c25416182d5adaf11c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "235bdb35de6584a144dc7c6b58f9ea4c526c843f1cf973d68f042e99327a578f07e5470377c0307474eba5c972a9f50b940c4008d8de98689482bb76cbd41203";
+      sha512 = "b8a1de2af55414b73482e9031ebc91c3b1bcf7b9f031ad6df3029c6854fee74018d216e3410550f6a75e49832ab447af661f77ab84d33ee323eee10e15dede3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "50562a3253bbeacd68f6d4474fe448b53d7b1a7f3b2791d955dd7a064dfdf1b1bb53c9736fc90c593e5da4a33939f51748c760d6f1739ee5930ae459ac4e4e83";
+      sha512 = "c65f20e5493935f1bfde0a704aa17768ebf3898fa6d8baba255bff4625b32e2d9a3aca12494d07a1dd5b0f53da764e589b096564b91602ead15dcf054181a29b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "496f2629de38138c17eec6c9db1d2bf3aae0adbd7802e1a209f8e5b1b3cb9cb9538bdf6fad74189905882e1c4ab5aa3cc1482860864e3de9a4aafbd2ce66d080";
+      sha512 = "827be1a041070afd835a564733bde9ed5c435fdbdc63ed95807d84aaaad351c82db8d64fccf8f760a8434fc0968abfc041abf008eca71c4c53d292adfb731a9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e34aaf8fdfdf0708ba1fa5f6205a9cc316b6074d3a439b92909229a94d7d55c5dae14554fc0cff27ea1768716133bc9675a1b34ee08fb2a892dc9dc85bce436a";
+      sha512 = "8b3c8e748e3e9d02f5aece76c5e0c067c72d3575e40b49643f4ad9f3360b19ed0f026f690c8056cb0d72e0d81a50cc7c6b41c090a12a2ed4abd8e8b3a087d920";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f3e26c456cefc519d222c837a2ea5515cecf803c4b215dd82ba1e9b5aaa97c7115ae22e7d7c29520c3faaea7d996f67028872ed8e7d6aba8e5bd1fb6f8ca493f";
+      sha512 = "269e02ce58b98ee54f39c69ee95fb1ea5dfad7ac157fa2df6bf009718cc58b4b3bafe0bf4796cca4836d87d4a3b3845bcd062b64f2265bac9dfe930acc7ffa27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "bdcdc0d42453a290a13bf0d420dc5f324d50e2b3ced7bc480c3faa35a27ed94d1fc455e6d32adad31960baef599cd779feb66fa76db25d7a9b0c49a1bca2af37";
+      sha512 = "3c998e4bcac8362dd8932cf4ce53e3a18f322b22b9a98251a30e586aa00a3dc61222b0c1836e6e7d2ebefaeda0d196b1cd5d4da19d740287387e8ac9282c4c1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "8820e66d82bdaffd1c16d4f3aa9defeac9decb85f89bc03a2a0e9ef7c941ed7f499b1681930ed307220477b94c449a9f18c8688e535c91db3769d01ca90e1d96";
+      sha512 = "708e216a9443bad1abbf7280c484a6f285bd585e05293d7f7d676fefc1c9c5d3d6c6a4e1e7f7c5cf88f74c9671e542b8525c8969008225a28347bf170ba1f8f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "6f845a09bcde455d9a39943e44d4aaf0befa5aec65e1e0e40c170ecf9eab8d52e7b9cfb7b176d31b6cb7e96c7f2ce9675cebcff8cc8915622f8e5adbee23696f";
+      sha512 = "319c5e63fed5f9c97ee0b290bde3f8199417fb857d8c3b36ba731e0b9dc3a176a899c129aa09c1ebb6e4dd449d298db661b532876ffb4bb6454458428a653478";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "bc4bf3a3410c5625649126fbb008743ef20065cf9a36fa3e00f73418b3ca1728e03cfd25c1c97e381eb644bc213313f06903edf3d5dfd91230f9970850c4c6c7";
+      sha512 = "348a6a8e91bc205e86643522fdcb9e6df7f28618b8fc7b1f84fb505b7cd3b40ff0244fe1960778ab8500a1f397ff30236eb2a78aa7b78a545c61e4754daba40c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "52b54fec39905d9be5ca88997d0e4872a88ee2a787a5bfb77f7f78010b8b2363f5bfeaf8c2015b2a2dbd388d8e27d968bc7f6a67ab5bcfa245ccb9e894f2e432";
+      sha512 = "3b5f95a388fa4779998da9da8db214f1f4319505d9dfbc0f5e900c3aff35da88152f1486f939d5eeb44f2e5e9149635852e3a40182986b771535ea7b6ad5bda5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "02631cb9137a681a45fc7b74c8c19237ad52ac9c5e392923027842a877d1700decc7e5f17a74958958c114036a2add93ffb610a3c9ac8ce3ab08af1b07cde11e";
+      sha512 = "1cc320ad036995b5190aa5017323a409e068de7e813ee61d31fb8a232ea5439fd6190ba840be0a2c6ebdeb9af68dd8895c51f95dbf839f3769ae4bd927de95bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "5308c46510ac95ccc3faa0c631f6976b747089392974572390870806b6688cdbaf13e5ad010ffaa680cb7055e4c2d482a288afa7d991d9c52821859b21b70e19";
+      sha512 = "8b5181da6b8ff98f48fae289e44ec8b31d6df9575e4cb45b38f03bc2d653bc8f0803c75804adee8a6bd5cc0395f8548d9c9629ebaf8e1b38e7d9783e8ccbf8ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6bb52b82a721369ec69172f3529210b46f211bfca71a0cfc7c4db2ab9c15d6ac69f475e420d66ed15691e2c54b1766a1e7d8a277d0cd1b9318d796bd67228def";
+      sha512 = "e20e0148e3b09570c36b2c41812b90e9e68ab5e936b44e54e7ab3c84ae2006ad5543820bd75337f23d5e5dfc27678a53ce749273d32212912335c4346f7946f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "c820a0e1792dbb0bd52e9a5514ea0564fec70b685ba23618670f6b6e99de92f50c42b91b772649a67e84ca5f099db92b1434a400e347ce56b1954733ce976770";
+      sha512 = "455cbcbde1fa1173d11188daf641372de887b9280313e5cc1ef28e290c32b5be8a3e7ab1ac85948da8da8fae8be41fa736a70a7a1e0b4d4de8acb7b3b1235d6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "3d8a71e12f995aebb8b74d99ed7b9704143b6320de3d44c19e94a6e56431b62648ea80a295214d0ba268c7249edb826bbf07c2a0f260c47a0f45a65a97fcdfc8";
+      sha512 = "9ef0ee15207812c2e92463350695c7afc952324d4cf55a99bd4bd6424b1b7c5215cca84afecbf86be05af17bc5a67a8a95005f93e5f93f95b4cb4db074d59c40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "c5086f8606f0e94385d0edd5aef16ce559e8616cca629df3d67c45400bffd5e3ddbf7546b08dc5924f4e44afc5d16ce6b289bcc4a67007d9ad6356253ff49add";
+      sha512 = "3595fbb8b3ee186193d4c0b84c339f560238075fbd7a8d69fb3f2b4716dc85e4b0b799cc3524ab3ae646e777284ed3ae80ab5f2bf6648a8ad425505120c04a0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "744960232bf5d07ef8677f82fcae4454a69712010d6a6c62be3073c8e5826f8e43cea3c2e0d544db8e1e40bad83c42db7914412e37f516d8ac35fe46220a182d";
+      sha512 = "b1bff7c52877be383a55707f421bdb18b21fee45979c16ad91d4665336a6796731930da4051460430eeb36765ec4f8fa489eeac4583a57cf7553cbee59156c33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "975d0b008d16d46d48c97810b6fb9afc5a2ef42ed7f324ca285adb8d5535d8d9d73a32f1c2919a5435a14bbf95d89abb5ef1b3eba88a2af05f9aaee538488cdb";
+      sha512 = "7798c4b84854d8084fd53e241eee0c5a36fb278e0130f5131eb0e04f23d7ad4fd597e21780ca546c4be1f46e13b2a8aa9c704e6b9b48b6c88ddf6f48e10da753";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "2890ac9b3271fc10943d96b15bf7fc880217e2317d6e915e41a687688f2afa7821649b6b4cc8ecaf7945d5058e576d127d10663278fa23a78f002ccb3fc75044";
+      sha512 = "6c236ada8a5cd397a7ec94b4480482da351fbd7eccaa2db93faa47d04add275d135075109f48c2a06b7bcdd8876907753dc5be4b7b1cce08f3eb9985fd1063b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0295ecb400fa4f60795e731b26174d6d42ec86cadf3b8e546f5180968d6e2f383946de3189070b14de5f51f93560bacd76eeac35cd0c29d6a4a349fc508fbeae";
+      sha512 = "5bf77ba43776a5bb3de3a57bbf99de96c8b547c664ad940bb9dea69b5231a176347622ab631765cc2ae0d75ee1493397bfe6d6fc42a61dca89f79d96c3738479";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b08aa29142418dcf7159a9ae97d1095ce368f244c972022e23369db201c3e68a1b823b29f4e5ebe65aedc28990962d0fbcd2838a9d6c85e46128addb12e6cf54";
+      sha512 = "70ffeabbef6b53d8aac4f54e19f077495a5895ec5427e8fd00ba4cf149763d003f1b0660fb80d9f837c1910c103487bb77b15dc345fa339f2585142590f82de0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f3778bc9dc46c1b4d02e148d64b450f26c388ed3ef6b3d757353ff8f9a97d99611ac6162267053fcbe0eb83df32435229f7b25110f079ab193d6f3faa5d35924";
+      sha512 = "1e6daed8dcabc37603ab9ab4ffdd8d16984c64d913b0b32eb21d53cc1f8088a0fca4ef140a090a5fcb92894acc3702b5d5423c5d2e06759a80800e03cb09e139";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f87a23b6ff9ddbc7a45c60ac5d04e1bcefa39f743cb74cf9c701c320ecdfffe67c99a377d2419a97386167e19164bdd0bf6c2d2b5a057e4108cf9570390e4e98";
+      sha512 = "904ae45defdfa71aec5cd59b3d6418c92b792680a6400a0a1621a8a087c58d7fd518fc216da93761023f8c8d821253d992585c2ace74878be209daf45fe6193b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "81d792ec070194f4d51702711957a71bc01d69e7737e7e07132ee3047907f7abcfab300d0ab95ad4d50821e95a45d6b3762b51c16e8268132be742caaaeb5a8d";
+      sha512 = "65d9c2b59b26ea37c8c7c44ab0136935fa715328ecbf0af5392ade21f77225cadf3efe2b2e0c6babb735557eb6c0a3d4b833aeff5e38bc27059badda334d1021";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "318998c6585db455b82fd278efe24f707abfccc69ff1ae12ab5ca6bfaf915db8ebb16f845eae7832d88aab6af8ca1c2b35bff504019ea265b938d5e7d09088c8";
+      sha512 = "68964a74d1fd81664bdfaf8d614f7a78237beb3cfa6d86ee7e569361afa378df1fe1430f4cdb19ef59e960c264aa7032dd1991ea4396c88c7e8d521fc29aab9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "ac63840ba086bec205d7c730d9d9503a0f72976c875544d09457e4fe37f802e56aa7075ac0ebec72ec9dcdc5ce67c99b83bb2779eb6c2bfa981f2e17895f801a";
+      sha512 = "8cbd78d7822ea1cc37adaceec7ef1208422c5069c93a9057543c7a3446754cf6cadfac8ef220db77ea80182c0cb0bf4fb5675d7777f87f5610a3c482abcdd3bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "01807e206f1dfa499b2e578dbcc6987bef6d0dcf02e362e13ed845ad7d513e42f54e3f5113164ecf75376735ba4d45496624a283cbb0fb0a69e2bf80943b4dd5";
+      sha512 = "0e8030bb95051862294bfa94201d2e701736f9a46cbac0848f7036552a53af131fdbad64780be307a63bb8d74b6c7f9b015cfe6c2959e839293e1ac3bc0d596c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "85cf988e4038f28cee3fb95d62112de2883240bd493e7c03e4a8998baacf428ce529bd236a6fa9f90d764cab1c7e4d975c5d88a876e08474497151a4a71987f5";
+      sha512 = "c34f58438b653023c68502a284d51ba5ea895b350d262942e4546d098ed17a10f32f4ae455e9a24ac17fad860d9db38cc01460196fb92096273d6e52a4b62b9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "16094487fe1b1a49e500fd56f5b175510a07b7a44cb916d3840c3ac42580242e1b121738eb23f94c1dd8c7875ddf1821e8ce8bb2bd2d9ed799391707c168c82b";
+      sha512 = "a367fa5bf03b2c05dceb9dcb08597e1feb2dee91a3a2389efab6a3838f2b2f569a62d0ccf44d8a78654097545da8d7c002f127113e671af3befbf886556b3b87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "570f96ef84b4b12ee4c2d3eeab0bf57720954943696559850cd6e3c1eba0fbaf42085e3c6c60e74430208131c0f6e86735262c4c69c3f0490b191a75b8f91fd8";
+      sha512 = "cd8f8d6e563ff79b99c9af0031db1ebfb7278e980d8d093d1610058510b5880d44c8c93e4ce365b91175ac3082eb445d815e3fe26dd30bdfcb16d4159e9661a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cc883efbbea7e187881974dbbf27243d5fbb1810f8c605baf3628b32a308c15ba66598617fea40cf22a89990f5690fc7c8ee4f4256019794301ddf49982a45f7";
+      sha512 = "1eef9e5469b98cbf3873a7ebeddf74250f81436fd0729dbd46cffd95ff13e96cf1f1b65bab55ec784e6ba2ca4159ffa1d9121a97a55de1d6ba9daeef1f711f57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1bfd3ad527b5d668a9296163890f2d7074b236eaea3661e17b39e086fa0a2fff96e8d6aca4b29ef9fbbb2c1d8ce8f7d38438dbd6c7689c1012ce86b9daca58eb";
+      sha512 = "7f94a36d30847b27f39fb6838bbb73302582917cfb932171cdcd00c033f24b0b23a82fcbb0ceb8416cac58e27f8b298e6bff9dbdf1f3fdd6b91621d897afca0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "b540ee3505c4b031ed348ff99135eb61214e99ae543de821d84b9f59078efb87b34536308ebd5aa00b1bd12dc311ff769580373b13f7814dd3661f821973e264";
+      sha512 = "4a474a6a1b0386369eb5f719aa938bfafe51958adafdb854e8242db3a3da8799efc6cb1055f4f85e805e8edfc8117e96de958e9b415e3974efbb6055ee097fdc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "bb8cfdbc08a20a719a14cadaebc50e8702dbab3007e43e6e2d3a951e9a6ad5af00f14f79be133411002852980b2efa37c8dd48af0e827f0c7cee98556f6f6f59";
+      sha512 = "74145ff3b86d515e3cd7c5080091e5a734b125432443d7ff5d6bb79aa1f2d1d28443f1db25ede8452e58ff81b58ab397bbdca44058d6713183864d353fa4d857";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6fa1f94847bf81ed7b3f676475ba4e6e7205d03980e4a7f031a16310e2525f15e09da85c63902ff2a5c249152dfef0f6502bb10e9ecd934359d9490f39564a0d";
+      sha512 = "ac13b8b3e7adf1c2daea80d6f294d784f7912f7166f4305675de821a048e84241081848ec1b0ee5ef96207cbf1b7b5aa77973c993f9450c4dde0d0d9c60936c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "3b3f751ec9893220e0cd264d9cb7f555d446d12f5e4efbd31501c38e39d3f3dd2ba14cb55ff5b99171588ea6474e7b6f0dbff1d927e3f19bd5a31bcf828b09bc";
+      sha512 = "8a89f909e525df4260855263f8d7007cf83176912fd19a0de425b1ec4893fddccff3723f01cbb48457a8c2e3a2ea1c9c969a71d171f3a282342626a2d6821277";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "a3668d643f18332b87aac8f718fcf783d3df063d0eda0a94c523157c7cfcd7da7af676d5e7d6253dec2dd657e4865f60cf441e4bc31684cfbb66f9ef497d12f8";
+      sha512 = "56b92973f3803e91b9859dbe7f0c35eb92364e9983e48dc063a3db637af0e22478047c7c6f5e1b75448c73cde117700955af25038f9bbda4178c8cfb39b5f0fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "9d9b9327f687b596b368e3ac311d5e2cf17f6e171f2dded66cd09c19661c82a8475843675279359e1af73603dddbcc42c270512fb1b37fb54538b76e54df99b5";
+      sha512 = "ba03388e6cc42238383d7b779a0c53cd65a71caa30b6e6ece78317bb95173b27081489d6ed67de37608cd3029b162777451d4ceaa69234d71423daedcba1e57b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "dc3ac85569698ea73e2f146d6945f1e1a863a55150d46e9064b87951ed3eeb8caaa40c7b89fe11644acdb06f610e6200dff3a3a6cd48838962f8908d08d56e34";
+      sha512 = "62c345ea2b6321e6be77f54864c9ce8c1e8cd68ba7a496e1e779c905f6f02aad19556a4e7cb4b2a61466773db0eb3d5e0d187d7cdd2dcac700a3d509dc31247b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "cd51c26629502707f277b111388794ade3c12af64fdfeb009daa01d676b64940c6155e9f8002b037106da3913125697ef7305cbbbfffdc9ba6701e6f476df058";
+      sha512 = "c8f60684f81114f5095bf106ea456bac5569b767d10dc59b4d9adcd67b66701432cc3d906ddde76c0d71d18716972a48e65a7b36a1c91f471e6e2d5655dde917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "10d6ce4f1f16d3a1373883911b29da8b01cf746b661f4d99a1601b3ea1e1ab77eb6429393e244c61af52f63e9d4b890f6a8df7deaaa1f2560795c16ca877b952";
+      sha512 = "429edb9fd687057dd4e77e4a6cf2b1df1d2f830472e75edb6d975986583a0726beedff4025c0889c28599cb36f9a894097a4e391fe333a44410ed73faa27cd47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "b89d94cf18fc50a6ec3798b95ce4afa46d15ea42871955cc1b46f3e330c06552f9ed8e53d02d55c17c25f62186e6a3c1a6c45de1bc21f9bd7050bfdd4f965c78";
+      sha512 = "afc42947556d206f8ca0e83cad9462c057ad5d31a2829504d4a7d904d31884ede260f2a92fa0f1e5ac68aa333c2ef65b41ad229d51d1109d41703c6f928f1541";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7a34523c801b5332c26aea08263248e5f471130300320c2768f06df9ae5e3bd90a7c547e73dffb789c763b2ab7b94c2763534c9ee408a67680d63052db280b4e";
+      sha512 = "9318d88ed98c3d7d30cb67d12ca1ed4c3857c2fd4dedfdd8248e76edce7757f5d6703854b7c82f6fa25a721f6b476ac6fcac2f93cec6b36c192ff38e28ea4e41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "a556466c16091dd2107e97bc52b1fea9875e15e5136762a57b71078d6189bf9dd57fcf1965c921df73dddd2edbd435e678f519a424ace1d0daebd665c4364f90";
+      sha512 = "76fded79e5d2c268a370927f033883311ce3baffb3c3ad6c5cb2c205f4dacc78727b3ec845f8c98cf9311df51d079e7cf386f0356b804b4da32498d539f90056";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "558c865772fb9eff258eadce29d2f03d97c3bf98b28d6c9210567b08c99f3532c1d2be534c5a6def292c060219e3d777d052d4e9db9927a1f85e41ed59f843d0";
+      sha512 = "0e344600ea643346258eaf507171dfa71c033aeaeac30d2872c62396007a521f68393f502bd32047fcbbcb8bf083fea5e7dd5d4c626c97ae8741797520ccbf04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "cea6b3546c6e94cc3667845a2c93de22068c4abd9fd79f73889acfa8b7d3f5e0af3783c252a07cd5c7e6c0a064c2e7932c4e2736b5f040266140e19ad6697ca3";
+      sha512 = "a68a04d7fff97141635feedee2f89eacfb36e73f298490aff4640ed0f09d16f5dfb8e3e7275fba3c77a5a79b7c6dab09cd85ed87bc007eb420d7be897c3228d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f3a72c805cef49afc1a9e59652698d295abfd70ee2e91ece11c2d68d58329c1bfc490f03470d277d4398b4b907588399d3733e3e907b751d636873b0465d6ca4";
+      sha512 = "702de0dc1a5a8d36558332aa5b8bf0a16571f8953a2de486906f57a0ec644723c65c12c63c0ad944f7db1a93fae2a96ac24220f7068f3098cb2cdc9e64d1c782";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "10b03735d8f98180bbe9741cb26bf7f349b7a4afe65fc8bc0cee0bf61966ddf7be48b233092f90dc829a6cfa753c3e35cc07ed35fdd09965ade816b5f3e9aa20";
+      sha512 = "22156bfb697297c35a22ce55af66d02e58a7879db0fa1edda04450836564e5e67ef4789be90e85e5881acdbd55654c10c2b0d8a0d2bb06b6775ce1d908abd5cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "4cfb064e57a3e90a4719cfc38520de2365bde3d9c0df17a34affa7bec1c19e7fbec0e3f7fd233331024706ab474110ebe9059d4ed6b6f1575491579f47c4b2f9";
+      sha512 = "21e9bd936d57ca6e12d58d185ad15786d5fcc00dade092a0cf47aa395d3a7b93d6eb7d63ab5784c4787e9613c866f3ccc307869225001495eeb0d0e8f6d653bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "b6211e70b039f56f4b65339487fdde03c132211c0b362c6df2d7440c15856a946944e0a583b624b7e928c39a63706dd495a06a1ae088d2ca484ce79e5fe9c795";
+      sha512 = "89d8e1adc81f0ac12208760a5cf8f7f1b94bf977052d6762618c6decf6472dfc62cdb9f42303fa9cddcf4a9bcfb7e7a52db7bd5080beba994bf5fe8434b7ab2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "5973e89146d547f8cb02b613d54f88d77e7f00979f8f6c64db276313e101867f6c27a0e7d5bb7e894a6dfa8e185c467dec530d4e7baf9aab839ff34a811ea84a";
+      sha512 = "021bef0155b80b4bc74fcc197f8b901e1cda73c6b2ef9e5d4f82a9702ea59b38b427f79fcdcc393873a5004ee87e609a58fc33c871eb3f8d43deafa07c52b913";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "d9a3fd7752a0a1431a46ae385cbdd331cd86e758e28b994604135e67bd562baf5b9edc1735fe1d0681853e18a235cb29c1be52b4b951954c5d6045457b909b31";
+      sha512 = "f4fca659d0c46e3945323e695ed6fc8ccf57bb7967114c4da97a552ff93c892320dc11525cc57111690b799c23a1f0221448d963123294b41ce6de428cbe50bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b6d6d4f6c950ea05680d6f9c5c247ae11c35cd3b1cb2a0429410f2e8ee05a7c2782ec7f220215f8dd7a5a2566c4bad05e6bb6c913a01788f707d8e37f9b9c408";
+      sha512 = "d79841de7eaa394a033793ab01a7e6b45c9055622c28de3585fae2ab5ea1265dc90a4f27064edbd0662c5c820db4d4a906e3bc60f07dcc800a70291a913f6c9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "472f6f670643baf59807eea9fcb171c61a305caa917c25626277d1e7a723e667f1ca5c1cb07b3b0b9cc3f8b50ad4d67456ec1c3214cbe813f43be5be74d90eca";
+      sha512 = "ec9610ed1c0be19b14243584bd649e04d376091e21e19337fb0d573c79c5a73f4188e207faba30d03cc555d9556d83ffc5ad0418b2b5a079ab5cda5371ce8f26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "44743e46e04f5f175af5a6404c6f2702818167948dd841ffd2f9eac88622336af6943a03cd1e615c58c6090bd8dff8a08b967d7f6dbf781f91d551bd8b687c88";
+      sha512 = "0526371496118f44595bd6adf161870956ff72184ee0a57a00d2c374e3e76295a3cd781f0dcc70a6c23561da721448c715203ca04d082819341f14c479230a9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "5da4efca4c9c8c45328afc78b24e6616ccad539127f94b8fc3525aba832c29d6bf3a54c9a964562d804a9095314ffa7e2daf67d55a0128304607e98a75088adc";
+      sha512 = "b45fc0b6569c2276dffafc6a97638c7acf57e4cc71455380ee4af68f4117700570e2728b14ac49e9ffed55be84147d0448dfd73d55aa59dc350ab3d1846be2b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "d78e51e71b8f309171f1b78fa5c2ff9058b92051c0651953d875d38611d7180bbcde18a71d54a257ebfa24df43f86b526c92f73517dbe43de8ec173c33730353";
+      sha512 = "3521526588d64ee31a666728628515a83b3a8a6e9e68ee5c07dd151c128a5fbc3f1871bd44cd38b681cef2d55a3d1c770db3227e0cb64df64125699a1c30ae88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "0bbd82629f59d71407477608475d0773851615346ca7da6e338563eb70c18e7e54795c22ebf4d9cd965ed956ccead2950082a0e9780b13edc6478df985abcad7";
+      sha512 = "c36237398172fd7e14c340393b68bb810fb7072979b953a17084a5afd90394e6f355b4d05dbb4a33887aca8a3dc90c8efefd24598aafcb6948ce8ea199614887";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "1799cda7b7f040a0471681891769c16c8b17e6ebcc6e037da0a45757f1863ed5a5def8d07d6fd4d172e32ca2de6cb45481bb1ccb8f8c2caa8d3b712ad4374466";
+      sha512 = "8067d2b0332f812c43456cb3bb8d26a8ee4e25065aa35d892235a1ce89603562fe3537aef767d06cb9952e3c3a90c3a2f77911c9e24c7ffdcfd43980619341dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "7da281d3e710897d7af9fe2b384e73b27e76af5ce5224a12cbed81400380e506e5fb17a0d91094295c6435acae942aa423cceb58ed97bb52835ac375af80410c";
+      sha512 = "b15763c9b95278ae9137239157341707e10c1b64a46f1502351438798a14337040c4aacd6dd7d6e11342b7fcc4d222a591f3ab74bcd8e7fc198bacd2345875f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "4eda3e69ca5ab51d332aac0639de33994ba0b42fc244d191a7b1c6990edfeb453151de7c1e746feba1ac6d7edbd8c653cb29db76353175d687c0ef46c177013a";
+      sha512 = "2566da69640f5e602244dfa5b773fa99500f47f4b88ce914e3a4703f7b03b55f6887b5a1e6596f5614e43d85c343accdd5a6797ab90954437140ef06fc29a2fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "eb7615f59583a95ba013e517d42d80c5cf33362b2bbc6ec6250d17a0eaab574d72bda6970f38177791a93088eb5f8d1cd088e46faf373e323d9dd4772b12e8e6";
+      sha512 = "be1ad5cea319b29d1bafab2aae668fcde126c440daf8a433442d44c539a07b3eb60d20d5af837ef0d820fa74430512ff5c0b747471c995ff208351b3d1e8cfff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "be72ad38323c545fa7ddba6d105dc39eec6d3fa82fbbe1c4026c0087a555b77aff2802fd4f6c51a01efee78be7652527b759373d920f2c403e9f9db784a66369";
+      sha512 = "a44149ec66afae54278c4716d3b39a519202fd8b388fafb5ba4c6efcc97b1406aa4307f5d583746d4c0c8df2caeed96b2d4aa3440032ee26cfa46e835ec780b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "200631e7d275728c98f02da92c82de33f4e6d13e3b0fd2537c6395d3f8fe84aaa568ea3b8f2e63fefdd64e830e0df9ed10ac3631581c05cbb790f745ff9c4fd1";
+      sha512 = "0cc0a338948789fc370de9beb3982ed1c53e31fcd290473f08000356c0a3637e1fa8ad500bc1327c198dfeafd1f3d9527e6a74e80f6204f419263750b4e61e1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "0a85c88096d4b470b76c9162a5e6ee9e4f8f6d75cac8515b7b76c3ba4f8cf571713d451aa54f5608ae38bbb910c4bc13c7dd870060f82834b0fd1bbb64dfdbe1";
+      sha512 = "b39f505e618327022112a471bfb75345c0f9a489c268a7062e563a76829a4c216fe151726ef5d1895e3434131af573b825507ca6dcf53b81c78cf8813cbb9d87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "6eef06306bf53d92f33de53f65bd2c06eba4e2bf86b112bc7d9e90555721cee051d071047317d0e1b9b661aca22c71ebd553386bdce70c8a1a8ea35c14710095";
+      sha512 = "f077c9c36635560ba319c573b8c2a2d560edbd9488fa0121c436aa37f76373eb081289510a0eadf112c5b44687f3971198a89537dc891740c739238711b2c6b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3f3d4605a043dd32d416d55c2a6572a82f311af38feac305392cc0fb5ebb99c1c8a8513baa3927b008f178e2655c3431df284549fd6674186fb28f4eabe417e6";
+      sha512 = "3855c0a21777563999370dca08f4fc139f1e2724ae6eaa45857cdb0d6590a44d3abf2d24660549d7010dd64ca62de1f7e720a1dad35d45b7cdfa8df322193a07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "aebe22d22150ae7e539f9761b1b9470b840e8b475510aa71b2256edb0a8de6e041622d0920b64ec4ebad0f71ed16e11cfaa8496b22bfc212e93a4f7727fe0bb5";
+      sha512 = "89f18a34c29744e336607a9de3fbdf7b461f9ec12efb90a56a316991b03ec33b7014998268089369263d8ee81fa4b7f0a1b007b87978545d8fae00ad5933b2a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a31ba99c189d2cc6dc432f5cf707390976e0f8b901bf0adc039eed276011d825bca22d2c9799b87b729baddb086f55bc2a9579929e1f97c6a5aea7917f07e01e";
+      sha512 = "8dc5b13599b5666ef5bce95131c293a4c22c34dec80ffb7b864a387e62a36c904acf278c261340f136fd5528d098ddb0d16601b751acd2e407dabce7216e7127";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e8b349efc6a322dcaa9c896d865df76f940eabb7c9157a9ef198159f7c92cee593a46e77c36a6a85d33ad44aa36a0f6fe094e2722883a84bb17d61201b6f67c6";
+      sha512 = "0b56c672bb4125289467c741f58c07f9acbc16233c959f1eff0eb0187f5ad9c08193a51373db3057207a14aed55f94d17d42db2d784beb896cd0f66c543d76b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "e388c59cc421f2cc409642db6776a6cb05177f16c0878c7c07399fa311939fb2b09b5c9a50b57f7425c18f375b25c93ecbf6be0b44c4a534482574019c6e3d0e";
+      sha512 = "6ad35e3cdbeab355c54d62332ebef650ff417ef7a133fc7fd18f287a1e489e8ddeb2675532ab33efcbc560127e23139dff3a85ad7515cce6fd2ca22c673484b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b9bcdca2b82d285c1c51054666744b9710fa492d460fe0e56707c5a92fdda013efced781ffe8774df588c8c4d1898a58915171d4317f37586dfa341bc27919dd";
+      sha512 = "8026c5bfcec6e8b11571af0a253854b087cc25737dda79083e6dcaf1c48f60592418a0f73c1966d963b7f526a6ce828a27d2e37312612fde12d89b667bd29db1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "9848b1a71e45d9b741a239cc12c52d22df1d663f784a3491174df75a479bc7eb610e913e49684658256464dd9e5cbf1a54be07fb821d4de1727614ce30f934ab";
+      sha512 = "c9e978ca93a1e7120f3aeae2c300c8af4aff83a278717657ea1ae5cf4fb5707e871e7fd1d5c74da2fabacfb2d46c687954dddcc50ff585862cd3cbc6f41a1d46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "4e28013a4966da67d01cffdeb80da6cf530ebb093dec6de519914a42d3d1fe46a3543ae6e491ec0ac1e67f1d705756983693b07333436983e446a347f17a39cd";
+      sha512 = "71dcb1dfd06802377730c35e6e842a0591c9ec287efd191eca4566c73bd456c02c5d7cfd68a49c7537612a46bdb7c09f6fa5d6734dd1252544401a047f13a524";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3e54a685ab48b14b7e98a140027786973dc855bdf70466fdfdc9fff646c3c7331a7d3f569dc94ff268e8a4c42429c0991d227734b0c6497f8778d908eaa8b1f5";
+      sha512 = "f46349d5207dfed0711ad2f7a858dc28c61f924d0272f6209a63d710f7bb6800930930d0b10b6493652699b4d139146f6a4e0a00b63d1d4ea4e58869c664aa65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "0d6f4df0197b5a03353b33c1d2201e43092f667340b0103fd9e312440425dd0c482a1ab1efa0be194b93d9c5002b6b2e96fbd4ab5a13fc7d967c90cf7c8fa976";
+      sha512 = "5ad4c5c10d4a01b2766201d1ca906b9f7112d58722253f6488bf552922e5fb2ee2d44cf9ef3ea74c2e62c062e8a6f52f44738b7e38917997e5e2c24d6a19003c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3e50a9e33836069e4ab5e368ebedaf7663ff26efc7a34e3602c3a099402cf5172a984669f579c2e24f65ca61a766cc0eaafc2d78713777cd8796bc77187d7ff0";
+      sha512 = "47dc4a61b145a2ac4b8e91907d9115f67433d68aaedb841b40b4bf3fe234ef1972fa2ebbbdfa4a099881500da815b5c4d0ae37824aa21392fcbf4900469f0c5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "d37ab2e22d959def3a320b400cc31359a62b285c21d634fc52737109b158ae197a008dfa63336f9c94362279a7f3c8ed7440ccd457fc3eb30ec39cef5065c6fe";
+      sha512 = "0d2df7c1f41713d0ccc2a6436dea281d5e7daba90397c5f02f52ade4225326cc1866dafc0ac6c2dc57883b44bc6fb11f6515c1a18d15e138a6acb4e6924f3924";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3a789af772dfef54904c429e885c941427493e23fbe563acaeff3314113b0ed0d7d01b72e56db42eecb3a759690ea1b99e5a2830ea8a119432fb5cb80fed3796";
+      sha512 = "98be094aeee77d6abcea37e6ffe339f13df99ba557c5ec90edaf025d1adb21ef240fd963d056532bf0ab3b77f84e2a7997dbed6299db4f2785cdbb61fd529249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4722689021e31ce9901c7cfe9f6af45ecd7d0d2b3456d152e3ca1b4cc473e6bcb093732f8e365203080db3e45f99f34b58eaf4f3b07157d1a7ef3233b937c7e4";
+      sha512 = "08f1e6d0a2492c2f4c423f025172ee29a2b5db49fdb04887664d4f800c2763a2c1dd7f4764ab175437527099c825714526620e6ff11b300bd61a3c522491b8ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "aabb3ece3bff1c7c8d3341244468ca0f79b8656bc2ac156eb5aea935b2993497ed4f87c5095ddb710eff04a4d08eb8995cfbf8081ae1db86a026842142252d21";
+      sha512 = "538e82bd706abf3bc52053f9d388c1017f28dd94cbc44fc5255cd81f93504f413c2c65d218f1ed0916fdbe9b4ad50d8b2af4612c84f7115f305ba6d135c7db26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "0bf938ec04eb1595a230a715f863fbbdfd59617b6b652aab52c756b47e12f06380351acbf111e560e0c299522777c8df881c6f73147ea697e9aae6d68371cac8";
+      sha512 = "0f21274153c4ec5021914889d7e69a6aa84057ad9c85a282f91957f0e2f14d4c4da30dd2c7aaed2d082c37c28555e65ad7ac1742394ab7a3cbe8ff7dcb3f3473";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ba9e855a51afa3c92c1ee0309c4cc5b489d60be06b033b3b6a31de9328ac31e3566f99e5edbbe13ad125e730141890ac937126a73490f1bd6ea412fcf99e2ef4";
+      sha512 = "b34beb110fb96c03d8e19b93272a951f7e94e792fe2e1a5789c52e316a1de99020d25b246b38212f912b12d7b87f55cbbbac24d470a432b1a715f313cdb5f7fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a27588eb0ed61068604c5cf7a816be660718cb59d200718456f3208218c624d9ba83d1b8c53f8cbab9a65ead095dfd4f76e5baa3ea1f5b6d13fa826b27de12ae";
+      sha512 = "7b2e7ef70597b6a0c0c66eb003927953d4416221fd967ccb259d3980a640b16b65ca6c6b757559baa010ef12e76ee8c92a255bb5cff4af256efb775179c24130";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "4bccf3f6d5a3b7dfa2bca47f31f7d22d7eea537c07cba8ea83088f3c71a6bfeb9c91fa945181b2765ecf4aae2ae8e0d61a7455bfcf9c1fc9c69cd3b0a9b5e8fa";
+      sha512 = "758fb694aaa821c4234d5a05d6f1035844e2f30a6afb559198bd88a6fd27125178e933293302fb26b64789c141b965778ed5c36426b60930314738be98951455";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "0f9b6b7df59b724706d93745080488c755ee34ce1466edaa18efd09e6b99da9582ae70d271efe4fb46d566d66256877b60b0da593071cfb7778ceb95a797319c";
+      sha512 = "ed46f4b40f8140fae43b292371ee5b991afdf295877d0c92530f8c988096f28434b8b396def5b66e4d2c273e4d0fc2fe6177c125d9adc57e6eeca995d8916c1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "58bea0b6a303e89a22f1f513ca15a3ee372a62871dd4e4def2249f72de9fd9f7724bf559b40b5f8e29f4439666e07b9611180296b51bfaa7558fa89f9c87ad5c";
+      sha512 = "d961992fc8643c8bc8344e8c439628c5c8e786acf9875b38035e36759f8d194804910326df0caf0ba0af13a6aab1dd026908ca1b81e64f6e99113059508f2134";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "00190deb133a575d93bd362032c6272a8c39d59c3d44663421a3a225e1abfdcad1b1cbf20e7b4ab766b8974c016984bcbdb945abe32841611b274f81d76c5217";
+      sha512 = "891caf22f30eb4765f1c1d12dfd71e5155ba7334538be894317efca94f4d5b789e7ee9e7bfe6261f63ea0b6efd61d45d06e21c6d54c6a561ffc0673f7e725776";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "11d38a85c29a0ef8457481109048539bccc859aa352dfe32608a695c69b5311b5218875519b6ccc341fb06d856294ef6d0c6db79fd96e057377dffe08fc4b2de";
+      sha512 = "e197199cc971e75839b6b60bba9379dab65e81ea0e93f007fee2e447d2e0b850bd2b7b380517a925497fbc6e01e9cbe8f1170629d3087c5a7c5887c08c1c2740";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b7/linux-i686/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3c0789c98c65857b4cfb2620d2c6bd0400a89d790dbc94e688c11a84166686bf3cb716bbf71d1786a2c38543c0dafc68f8907492d3e843a07285678c31db7bc4";
+      sha512 = "7de394922b2a14643b377e185bc91e4b72abc12fe65aff4deb7509445bdd3902b4c647277feabf6168f2dd63c6976f4cdcd42eedcf6f945648ad0a9cc64990ce";
     }
     ];
 }

From 29e757ecc537baaa7a51eee69f4da7c0ab02b4bf Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 27 Mar 2018 15:02:33 +0800
Subject: [PATCH 124/170] firefox-beta-bin: 60.0b6 -> 60.0b7

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 11867ce8703..f1fd748cf84 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b6";
+  version = "60.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "818e692ff3c7a142e343a09f8f6594ad933199125b1c9e9b6d0b6fdce5a495b1322bc18eebdcd748c9aa8e46e7c56266728e0c3f40de1613e583c36672db4712";
+      sha512 = "ffd25de3de0a1a7524e750136b9439ceb79afa8e5ded88d3a7bd42aac3276717de51b7740bab09ccd075deda148212124ddc1a6ae07146274d3c8177176ed247";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "dd4f43e2040ee5f0d5ffb0fd51a62d8f8175e867607068a3754ab214f05cfb1a167e5aa372ce193deec8571ae76ff0acabcc668ebdbf98c2e3de498065a3152f";
+      sha512 = "039e4699bbbfd1c0bb655b158d671897e70b3d7b0c51069b0ff52a03a78d6b7cef4ea46164b7ad510a3e71c2df924569a6acffc66c77171950860ea8c08131b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "d5f22c0ccd447595a52ac3472e0c2442f9a399287b115f57b10ef0812fa42a6d2b86eeb415bb1745a3b641218783a477fa7dd3146160e91475e6e8dee57dedc6";
+      sha512 = "fdfdfab6ae2247a746d4e62680917c9853ecbf9643bb07a86d61f797ac244401013427b0c2abe8f88a56ac3396b2c3e67e857e97a9c11a774067544b7c2458c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2c73b86bedd50979943ca746105e2a217040cde9161be3e00c94fb34515b8ee28dabcb24bca83fe8a78f8c368e99d813be3d19e9679080d75e1b55eb6c74abde";
+      sha512 = "9ed3f5da2f9e40cd02efe435caa28a928bd1d8c87bc13f059e0e612cb9194a05d80b3daf502d10335b49f6c8c10d587ca328f7309cb351d54b49545378978f47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "d622b8bcdc67fec6e8eda35f650f9ca3a6ea947d4ce17f582440ec5f9ed9bb4da6e32607a5f9883990e6efa8751ebf7cfd577d57e748cd44e06c528f692fb839";
+      sha512 = "9cc2cf3cebd2ba4fd3ce65bc6f38b916736cd2eb056e5f9114f51b0bc8e2bcf5dea507e056f21f4428314b20c1647854ba8b48862dda17f5aad07b35b3d863be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "b95e2b2337ec40714091b4524e1155b6b5f33da8221f70425f20af9703386c9e7c65cb698f604b9fba2b032a8e38b32f7fd97264986806505f83b8fa569a1c68";
+      sha512 = "ca3d5f2dc4eb850c2a907b095ba9f59b5a4d51f28bdcc5bb4f27b6e631e91beb0e374427c9fce74ee25f540907adc21d4d5933d512fb47cbc41eabe51ef2d58a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "ee5a7eac77c46dba07679e35bd5f3de7ec0d7f2a342fe900b7a09476ca164194874205054fc6f5fb114e5831e6412c674b79c5ea8402cf9a16a7400499fa03dc";
+      sha512 = "8c02488c170d705923aa4022c32c75f405ab01a83c821b228d90d030c69235c19ab9c6ebeb4e5a926ac3ff2e06a639a549b98632ed167037e6447dfe5f977bd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "f051c711fb5e0bec5d7a819aa8a023641888048bbf3189cd9f3c381f0e695df1036743746ba8f9558435413662ea8c0e0d59be26fd6f56f451725b59855f3b6c";
+      sha512 = "82c3fc46eb2a8b080632b183e250f5063422e55f0bddad16b42a436cbdc6567b3e0de7bedc280128a34838fa08aef875c29e0dd0358a31deea13d5e6f499a349";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "65af640674c8487e947869a7eb361b0b75d7e86bf2047f6d7280e7ce724efa4f842697651ec8b3597246cd199ada40dd237204f9e3357ec658056b9a18a4c1b0";
+      sha512 = "8ce4697b290e9df4247879d75cd30c19a3e517268f25731ea59078df363bcda584b70b0e9602cb35999b7c127cb505a3c8ebfe6d117761a2fe74e7a93c82f499";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "9ce702615808d1515106c0efe657aa30ea9675b75450d31972733c5a02c058070fe4bb7110b3ecf87829d93e4e6c7eade8bb1cf49d11e0d36235ca3221dd38eb";
+      sha512 = "fdb54d86095c1ff2d6c2c7873552a5b7ab49c26a70c192f4b24ba1b1f31acb48280db6bb47e688f5bf625d5f01c40f115b5c4cdb2dc6d16f73038528aaae5e4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "8fa1eddf2875ae3a48574c92df88d9a0cb7f1dcfeea81047b61b1646914343a426f027359ead2b82afd52fb9dcba3d3f5212f47198ee7307912b060ad314e085";
+      sha512 = "625dee91caecd225121c968b4dcf0d339cf44530217474f292602c779bd5c058c72630d1977de5517bcef5150049b91d37e87dc33ca77b986dd1d61fa975b11a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "8764ea6734d8eebb8229308d8d75b11e603e8e04fe26790bfaa58847f71e8bef9691544931c8019a5cd603dfa04997b20767be81897a18bd1fc1288c73174045";
+      sha512 = "0b38399bf8b1d577990a7e07a46d855c525ec638eb5040b2c4401a38f83822523cb51d97d007babb91916d764a585f7160d8ad627d6582f15451e851a2226f3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "65a6a13fc099785a6be9ae5b546bb9a370e7a0a8cec679d27e9c87c4e4d01cc9b07cb4486fe243d1cf82c0e774f543663f7f68e62ee31b16fb505179d81b6c30";
+      sha512 = "75dd3380634145249c98cc7f4fe9a773827efa37f8dd5eaaa19da3373c143fe22d144189aaa0d1040193900eb1e36ad28d47f969cb0ac8356e494316ca107cca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c61f865c1da38d137bb64e6cdd86e63a793a42c916e241db6ebcafd2b061d56c659690c98ccc65b1bb2224ab6b98ac7d6cacd85947f3f8b0b6a4ad6422db2f98";
+      sha512 = "3c51d9feaeacd1ad824f4acad7fca73b2e4afee28fc2ec8ffecc2f1ec442eb1ade1c37c429a97400314a5e76b6f3cbccc08d44cac9098252f481c3154ba422a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d0fada9251271f3aff3222ae3cad1b429aadcf9801231388a79c63a2b14ce21a41fa93cd6353a0bac4ed3cb58bbb3375437e07c11ad939c1cf281554319a497d";
+      sha512 = "68883704fcc49795ee2260b8bc4e06b736adc73db4707ee43b7b539f59836ecfc217e391e73dbd3830f8bdd5fe169b03dff516af378609e65a626e91ea20849d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "ba962cd22bf2b0b3bb5a4c40d5e3628152af490586824dee3e890c02a86828945c4dfed7a9ff595d8cd60fc30f2cbc799cfca2b41ced1f56af303c4edef364d0";
+      sha512 = "d02bcc433a88db175887454142b5017e5c6c8b47633d46f24b43397b938f8835daab1fa48c6b7531d275400590f2cbe391867ecb64130a449e9501e3cadd201a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "fe5e94a6a0caf594df4b96c0803a71139249c993769d72d607baefc9bcfaa1a9b33d26267919bccaf1e707d6894ccbf0e85867783a104cce6211c891418ee46a";
+      sha512 = "e47a519360cf397f09f2d04e1e4875863852a88b2cd3ec8b7ce16fc475114d0e0da041f63f91a1b51178b528ce791f3e4ba3c1fd37f6de55929a9002e4f7624b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "06a5ac528b7f78bc215cbbb3db89450a215f277972c8cf3a1f80da686a48de9e4c603dee40432c29d62b2a566f2f0eba0eeeb5ace16fd4801820cd6100f8f2cf";
+      sha512 = "74dcd67de284b0b5f55c59292f3a53b0371960bb5dc134fdf79810e02c08f9a90547b29af5300e3f5f55ce7b8da788d52d492d6349a67999ac1e64c8f4059429";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d88656e118cd66c3f7ef923b2b40e6674952259980df6ba15489ee1e283a5a4999105b178c3ca2e55ebd67572fbd679ff178b75a4f4f2acbadc6cf7f6a5beb01";
+      sha512 = "437ca724cfe872ec616e5c3be80e3ed2a56112aa324e2a5dfb31ce89295b2bdcfdbd57c017ddb54f12e8013b27d3cbef243c75da7b2230237632597203d9e6a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "758d2d67280e08fe1b352ebae495d518143274eb38096908f22235340a3e67fdaeb073e79af30d36cf5c8251552562167931b5aa8ca7d3a54334fa684074b540";
+      sha512 = "029f38e891ac57791c5ef5946782c9d1b846d965fd2e2a5b12cf12ee4fa600c333ba8275d9d15c85ce259064944279a71f70aa9f5acf07f8c6d5a79ab0ae8a78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "6e9442b5cc8a9689490903a4b12e48b23f16a08258386a842f20714e598f31fb1ef70f9f9f73910af888ce41a17a5acb0f2afd5ee776d10f1547e904eef780d8";
+      sha512 = "c5baccd9d9a76744e12c1e3d25b3291a75f9b943bb3f6c02a3f2bed5e1d76d62362a8c53b1ee10328c1f0b43619d900e2f99bed977aca2dddf5116d37b1e4751";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ace71b137db10e7fe9093e95213cae7e8a1f05ac1900905a1c1af68ec59e075ac450dfc537de62f0a7857ee49364fe1658028726d51c2e34120f1764020c1ec7";
+      sha512 = "24c07b08bb1184db2882164775abd356be6057a5afdaff3b80c43b0c6fe64ae478b0b75b2d473fc722381eb7c80fdc0f511a5d23d06dc181a1d11f811a5f9207";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ad923bdf87283beea05bd91f64a4582790b676b91816698dadd22c575db020b1470e06761872caf346d01a9cbee148189e98ab1930cd10b7ac88b69b76b4a5e0";
+      sha512 = "412db155c7f6c0acca7ee5c0b34adae4be9693326b342d0fbcf8e72eb355fcc190262c56b3b29763a1fe0b849572d635d0614fdbe5e82531486a9217c9eafc7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "af63f7cdb9a7a1b96925e55aaa86a592ae8a8303e49e9825197638aa79fc3a884d95a1bf0ce829f243fa767381ae40f26d040b2e5475058d84c95ad4648368a9";
+      sha512 = "8bebd039ee647de940573fab6f31e56b42799ee0718ae7ce0c19250c7585c12dc8b0da71ac7990417c404656bbb00ddfc8e3d3f8b9f4d15bb804c1141d8f8e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "64b2a7d7686352082da9cafc08489c8394a780f452edb5b76eee16750ccf9b853ba69045bc6c4a4541531c6c76dbd5407fc0b6f1a8f5eeb66511f3e38ddc085e";
+      sha512 = "4cc05bf5872e5a92f7dcbc509b214a81aad18b0efe8a705e7611ad769dfe2768d4134dfd1ae07713e11649833377cf6b04034fffde0587d44fbe377ce44cf05a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "047abd61e221f6b7335cb826d72de19f30f3b83a5beb9249f8ea127abe7d497371628f360c8369bda4ff6237e2438bd37804ccec8cbc7970a4e795dcaca80196";
+      sha512 = "06d7a689fd0af0c87237cc7d8230c3adafd03447c5edfca1f1940c913bb6c6732c08b16f82147214bb9ba89f07c719fdf15ddb47e5fafbfcaafdeed87078012c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f0b6d6a21c213ba0886d8e830b5d8b91dca7e927a998f51ad7e885bf2d2768ceeb68626fb96d6641912127685c733984f8fd90879739782ec36103f08a8446da";
+      sha512 = "ba395b7917be98b51bccba8acd2744fb713a07684d6810fc023e0fbfe4b1a39c323d319f7f98a8297a9023a55e58c62ddf899aec926d467a9c3de7e2b4763783";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7cb2579de2774ecb0d810e943c5c821987bb0454a45e1c4b07d4b1988da634bebbb082d961db59e5ae9802cb58bf83500efad5cce7d8a06b1c47293b9eec6033";
+      sha512 = "81e259af02d7523510f3e340f89218561fbe68b71fd52f2dde06856f3b0b9f10208e19393d1404043019a690d593c232d1b3c8c94c25b35d388444545296ff8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "cd8cdc7990681f755c163e866fa24fbaa741549b4fa7ac2c541a59180eb7e732052e536e5b231a088cfef2986ea0c53f10ce519c823c04238548c9e31945e383";
+      sha512 = "1574939452f4c4bbb6817870979b56c2a2c0845c3c3b563ddcd7c622b9d6a1f68423b8e414e4202ad4980782b6030a7c5ac47c1f497bc25905a896d8a330e3dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "1736a87b10d6b8a9da5bfad680f0e6492581b21dc4dcba4424ef04b4fbf8070168d14b19cdca0f2dbb9e467b692fe31b885cb5a0d6d58d70de59ff4e522b6c79";
+      sha512 = "8e4e5ea879d76da839d32d33b3fb30bc29ce69ecbcd126a75cf5899c1a0671931918d54a9e98ed55b0327d5c3c5910ffedfe49c9a27980f757142726f09092ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "0836aba5563dd942e581c6c2855978ed1adc2f204ddd254c6588b06f7c47f0c11b40a4f935ad509cf9358d43b226b46fadbeb150c55b69889f3485145ae2710b";
+      sha512 = "6da7117e0831fc4b1a9423c5151159681b9666f3f565f014bd749b97bb30f715158444329b8ea06e408a530792324b6ecaba5b946a35ce410531c6ef482bd8bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "aca25ebbbe9ce3cce5ce6a03a4fce799735fab30c37f97ef27ca21ff5949919a660e2708c25da5e3e9d679c4d4dfa388636e8ddee60479bd35a46f9af3bb1b6e";
+      sha512 = "a8dd7949e21712e384c3e9a40b35b37ec6e78de3043d3edce920cd09f43f69738e6d9c40b534a268066ffb652b5dfffb85aaac8b76716afed0e8d716bd406548";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "f2d010e76281e24055d17f6d3c8b8fc925420d8fbc837c14926b1f8f8adcfdd59a90f5048eae763e3f63ea3c722aae6bb0bf4ecc13d5d12194f9bee1c7385c64";
+      sha512 = "3824f5cb19c75587e1c01c9196d3705f366f4399e0c043dd0e8f5fcd5a43f1b1f4a3c3a4e35364904514fc6df27d976cc663e0789a908c095c81fd8c3bba4997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1321cf7ac911fdb5ef58dabc151a75f916f154f5e30db58e0915f429a7c9cfb4afa39cd5b52a5d960f5e88a27727c8068fc9523db3363977683b20fd85e1438a";
+      sha512 = "8afd3fdea42d099eaf06609354dd593168f510e799702b0cc3c934bbab6ccfd973dd564df196bdfa7182a58977cc2bee6528ab7e228aacdbb3f6062c37a4a1f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "e0c600dae1cac652c81d31119b289d20aaa71f3eb499d801c98ccedf9300832bd276994d899bd68dc4162a627729ee49b486b14c0314673fa0c02ef0ff01a19b";
+      sha512 = "e010b72cb25946634662921a46a930fc9e3f26ac3e350cd20ecaf50a61ae8d73a941383a411e450efbb2e786a71aeadf31cb268bb43f58689bc37e7a7786ab6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "5288a62e184f561920718aabf1a705c424f192505d20e24584feb8b776713e1e94669679ebd4795c656224e7890bfb532a1a26ebceede30ebda980867f25e5dc";
+      sha512 = "4e529dcc52bb77c0d4c9bf9390862ad04c112af89a8864715ef2a9047a8bef431ddccad2798dc9aaacf5ca1ea47189873f348d5544854e903045a4456c095978";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "b47340fa3e4dafed945f1e85433b0266e1a8d40d1ccf707d7be8343c0b457b14d2aca836bf45d15e29695056784e6ff5a89f1ea8701933d2d12e885d042eb556";
+      sha512 = "ead2ae4612d418a25d162fc41de423f57245f83c5b79ae149582572f4301f468369c9325502a571d648a89a7d45dbb64be94e66248e1520a59b8afd57f5c651c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "36e56dc8d3e42b8e689db2725c100f74983c6f8b96d94714738e2b7dab237797df369368928437f7031bcddd78ac1e7d6c6d20d2d76502826ec93d561b596e53";
+      sha512 = "1aa9a80b85e931e1812ef2e8afa10e9d0d198e756ebf4d4d1a49824e271637b9a5e9e629dbc641a98f65c9de033aeab41e1288ff8a0537deeb4ec730c5d29f1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "abcd115639fac3da0f271b95ea20eca18d3e42fb544f2de7c53e626c6619753cec658b89a5cb2b99f9192735843be9f1ba461e37a7c7df2dfc5c695455f4d13b";
+      sha512 = "ac2a2b0b3bb3cfc60161ccacb5d5c28aae7706f1d3fb547dc3aabb2c4547172bb0302f37b63a878df73dfdb23afe5a50da80e9f5a25df6f9e767cf1435937c1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "02af1e0c56fe69f7e6f5aed233601d25811effead3a80dae623787528953dd34f057aad958ae792875d3775c74b8b6051a9424dc8c11057bde3f38e18fe36b38";
+      sha512 = "d59037aaafd743f7df2cd9b4c0d26ad862fb4e7fe78da103e4995f06c6abbacdd935ca7c340a157695062823c7d035ed166f26590904a9975f8ce7f4cde2294e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "3950b6a88b260e9662395f4a049acb86ff9fecae19dfe16fe315785b7dd6816d88006e9916838ee21d9b085a34ea580cbc1d8f2cd67fd03b18ab57238b7ff624";
+      sha512 = "7b4ac4f0d1502056d5201b6ecc95498bf181c7197c629a6d5b4d41fc61f96261d65657b25a57be42e78f0f87da56ac4b6342ba308d1067c16df8523c460dbc86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "770147e023008f566640b1485846bd3ed24a08065e0d1064d8e39449101c30e0414e92012fe49e75a0608d3b467f6c2b113daa12eae5623276a892c23a05a9c8";
+      sha512 = "87122ae571aa64da2048f17813b2fc881c876952ffdefeb2d8417b251159a69b48be4e682ab269cf1b86270bcaed00e82df93f3cdd68aae5a130baec4961cf97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "37091abc6c7cebe2e6686598dc3d1dabc0019d2ebbbe85d929845d3772e08378a487911193ff5cea8f216cb9c20a4e16c349c6e4e85e979483c56919f918c4e6";
+      sha512 = "b3c79cedaefac1f2321b06702b2da02765d096c357940516fdf36127f5177e09c543e94ad7d4010994c728688fadf83f989ead456cf74ce7386892a14e7a6f28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "118417f29c55e2309feb4569813433f05979a9145155cc5971dd7e1332899832ed3bbf63e377db0b6c80da62946d157e9b53e0ab3e664c188544deb2ace752bb";
+      sha512 = "4f412acec51f8a3008dd0fb4d793baae3386b8f9af9917ce36b7d7e3b3174c18743792f6dc9e4815d164f0dbbfd888a556c9e284a0dc9247742e381c3675d541";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "791bb212dc0a55410656b70bfee150f609f46ca127093a5dea7abc9e73f959237e5f816db6ead316926e881aa4d2476624493e2e13d653fcaaf7356ca778147c";
+      sha512 = "5cdcfb4aede50ace119ec97816144a90f8e0e8fcbed811297079ad321ceab968de8d546d816d896b7a59ebd509205953af86d0d205d04b4f1647b25e5823427f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "ae1d37160a7a31b739259fb4b08598dee895a7af4c9d9edc1ebdaef13ea196da29cfd0c6bd3cc1ed9215c109671cd209d9bf1a13e735363bbf73230d80496859";
+      sha512 = "5ba8e2a4167f1c93e771d1b37a90929f355acaaf78bfb3d372f04e2b84cdb003d77e1e70df1d71e2a21aaaadc3b28f2acafcc0cb354253e844bb4b2122f19852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "7762806dc14ac8f2356a7fc1f7a7060f277c2271688aaca0d4d7cada0172eff4322497886d961812b0a400c1fcf41e20e15a80b101109ca5d300a21cece2799d";
+      sha512 = "c1fd37d95207b3d4b77dd1f24802d052471d78a6ed9e93aef14f54f7521f1102e497ccdf46d9ccad78043fdf1652168990ca5c97b4149453841f24eab7bf07c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "eb40766df654371a35444ae888265a7838c98f463f9f7d2752bcd67031b8e5921076716b23b94da37ec907efeec30fcb7bb1cb0c43466c58c054ff3b6dcf3825";
+      sha512 = "c03c50475ab7454c7e485f5af2774338ac2f859b142a9b3f4ec51206b6c316cf8f931446f9f52b2241fd84f0082a7ebf4d396ec759aea798cdf954ccd0a5f50f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "0d3a7d94e5d148dfc4836b78d3f7ed408bdc1cc1fecf81d4364c0ccd79b34e04768dc2be147cd0af2a502c5942aa349d704bed5a8eaed72e32b363fe360e37ef";
+      sha512 = "41cc681434e485ada9157c1f7cb44692f2116127897f59ff8bccc9528710e461f98e548ede123b4678ba715e5b066ac765c5c0a120cc6a063256f7d42985dbcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3f66a086542472353c137902e635b5119325b11d74f4575bed4a90b6cbc3fb3cb9fe3bc5c01becf64b62063ce38fa7caad25cb80cc2b3b28ce69919b9a529a84";
+      sha512 = "7122d0db4656c267692d67129c930ccaec28829591f5ae29492b39c25b1267fea844e984a7815338c9528c323fb93631e0b26bf10a01c1696fe5f547f429a56c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "a81ca3eedc13a54541a9d20980225f8f4ad599e4407f2813eef39bc081d914dff519f0f65ba4865739542cc7f1374c795d49acf5c388cf81f0ddbc91278553af";
+      sha512 = "8bf59af36730d9e94433ff901c56874452e3c201e8cdc08fcdd37ed82b3815c8326512f5e7548e264e8e79175cecda833675bbbeec179e37cd2e1c58438e3dad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "a89943d49a19a9baa199c79d138db7378392780ec31e2c3e64fb2a7d07cba688cd88119b22cf43a598470df4a3d647961b728e0c0f28aa54990ba8d747096112";
+      sha512 = "fc33eb79dbd44752a3a76b69c1aaafb8f576c3d56e76f11a121754c759b059d318b25a21ae665b8af7bcaf994e1d9be2846e311355296768a1715c5f7b8b8404";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f8bcc977b7f88ab33ee6027ff58bd73edade0a9fd9352a5ae8614fdc6563718654d1b0764b03e0527a7f1e6e77abf39e5bfafce90e877f9c94acfdfe3484e35b";
+      sha512 = "8db174868151dca6b63a769db1e10ba38b49dd5bdc4d8656fae2a3005d7fb7f57f6b8f324a6a1ba2f116b22b1d8413ac4df6e4e93bd1c335d6e6bd601dda429c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "e7074d790e75d8ffdbb88b8f21dabc7c9dbdc43af2c57db7d34a34785f317b5a6755f94ef05cf22f8d8a4fb5d06e6300538809a0cc14a6ea23927c79b0580c39";
+      sha512 = "a21cc4aec4dfe03b8dd3fae776524a597e91068ffba7ec1ccb8670edabd59e7d193f4ec97c996c7e99973432d02184408e0508ffd155f45480053c81205eae5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ddb0e7edcf47cc0337c7cd8cb1b6f63922514bf8ceaa964ca8c2bbe415f23a2cd147dca604bbf102a56ece7ea8634476a55a36c7915f54709fd1d68b1b4dc95d";
+      sha512 = "e51c63e90a07b411cd8d4f0ee4374b980cd64b623138e1e58a679c59c23a30e5a232229208c3dad3659e8ded306935b6c88d0214dec7008f4a62a5645e1d6b0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "6346c457b6e14d8deaec311012bb6bf62baf4f9c556ff244ee9f2048f8a8e6d0bf4172549ace00794ca3f8cc0be4f81e74cc1649a57e07a604b00bceecd91111";
+      sha512 = "083bea1f3d92a85a1748cad54e67221733929fb1f799c0827b32c061d4e0c8d16a82633537d5efe2bdf06ca7ce5eb0af646586e822ec53a40db18b34c6159a0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f1eda0b6d33065d8690160de1171806c8610a04c278cb812eb1f01dc204d1975b210544fc8263b474dd27ec44a4d35ffe5c59575a8cf2ba353ea9002220c78c8";
+      sha512 = "f2a276353249e5e75e9ab9abb97d7245c1dc45f07ee4c77204e58b4b58560ad9d0145654faf32f18615b5f92442e82e3f4fb78d7158f83108e95e25a62d1054a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "8c2f83daf3af4db3c9c2fe7edf67f8146f028353d5bccd83be338afda9c24cc7b79831fce80b9c67996b76bc483da8ecd3c49a212d5241eb2543d28fa64ff4db";
+      sha512 = "cbd247f8e531ddd9d134eb6b2dd2fc41bcf2ea161e46ce983a4e4705851fb600d18b0d4cfc1ddf6dd0a565a9218015c9008aef1334f0195690d0b03ef05784c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "da8d122b5888c8d20ca55fce7987375e6e4cce13944363f86cffc1a68584e413548ac8da8c946f6a169ce1a0f991e749ec258a4fab2b0958a6cdcc1069c0768d";
+      sha512 = "bd44ff3d64617ee639ff3f1a4153b0c71770b4f2c26c8eea5f99f2d7a589ddec6bb553aeab8b8931a39599ea897a22a42559e4c771195962110aa7f2cf1a2f5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1347817c9b98c5f6110bccf16e2adcf4fb7d04b9edf59a0b0401a1cc8c4614cf345d3ee07d465c52f421692befc4cd6561357e8b5950b1200100f3555721023b";
+      sha512 = "fe917779578a5f8ffe2f109d60b5b0bf8b2b88974a2e82f9b067ff88d9dd5e210878ddd2e1653c17a0f0e0bdb61bb1e5edc613bc72cc43165b287430808c0f10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "1d06e60582c51808c9dbad7869258952cae1b5f10abc39fcf18a3ca57c0ec6065936a79976a851bbf1a98ce8e1654de0dd51bfd2fc8178297eeb40b6dc16a2b2";
+      sha512 = "ace9275a6933abf4cc0288fbec2be91ab9ce8ba0e25ec6e9bcdcbc14a5a0fecae6ca489ff7c226496ec345c4c27af645f0694b51ad7703adb81db14be66bacaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "87e5984e5263a406392e704571207f02050093839e58c833b3dc10a78f88b93e99479e317e17983a51a3615f03e84861d4bef8142493447d24ce42e57bb49e7c";
+      sha512 = "74d5263c8b231a61f4adf3fa710bd0fc281bad1ee97d52b10dac108c81e49f1d26a0a69a8331abaa6157cfe086499188b4729b3542ff093ed344674ea733ec84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "c979e7ba1b36635197a3ed5ec581da57594fb014c2d71a0dba3c135db1c8e632b671203b3f9b4b5765c74d149a492c94ee327393903a683755b91b4677ef4b97";
+      sha512 = "3ec07d59c4ddc7763a4a1a4981dc4cddf56be53e22e7cc679e7115bd29ed1584dc434704f26847cb2aaf02149c31379caca16b6fe2054fb26aae24562ddb4a01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "886a2a0d6d88101365c2b497eb4f5dc56325818b5dc58495cd2dbed1fc0a8c91339e3bbf9f5c0b246c51cf44f2a61ea07421e06394460d2d0ec2b60c728eabf8";
+      sha512 = "b9f4d4808a1b60e55d98ba49f49420708f90ab481e0d382f9d37a22039969553e976a4c7a36ec9971f35dd2fddb1a97f8524241ffca98e57aff991985310a2ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "39739a0836f61a98dcd9b6633f4baf73fef07fa2dcd1c51b2309dbbdf62c4256e9b8b8fc94270e2608d4042d1c92e19f03337471a38539a8e9b803b109c2fb97";
+      sha512 = "9fe06c2b06a3cf07a9d3d081fa693efd8f445d5257ab4d7fb094822cb023962b69d7640ccf92e6cef6acc7d09114510f9a80224d7399dba3228cf66a08893021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "fe6d7fe4bacb0789b6b8ce7ec8fa0caf188b9258f21a0d30f9dcaf555822ced17240bc07f56e28c12342d42b5514f60d845a89755a92e3bdd68d7a33dac6ee0c";
+      sha512 = "ce15f5e51e3e74b18a3fac89408cd15ba37486e108d98760e0e902f0f3151d837dc1d85e028bac707c95c86e3c38ed2498a9de6051917c5dbe0cc4fb13ee2425";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "59384b138f1279aa6c40ea95e6e4574eec4aff91ef2fddd14bce212f27a1be2acf91d751afd984eb7bce52a2dfa49ff977943ffaafa4915402d9cc31a5a0c95d";
+      sha512 = "2b4611153876f77ecb42029844e5b85285ad7700fa3abf7d61ab27bdd60fbda8357e951edec43ac20ec62cb29eeb12cfaa7edede9757f35673003b9edf3b2070";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "863bbc400416d114e2ac4842e33d53065f872ff36df31305c800520c7e180b749676a11fec62ac1abc155a53d079374be4ed3ec19202d83a22e144f541fb4d32";
+      sha512 = "faf89b596a239ddd18ca65b8679a54f7ef6615504935789f397bf804eea86f2f852925e260c78bd123f7de811f2cf619d6366caee5e55fec52cb1beef338f931";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "cd3bd76bb005f0ecc66b7f4113fb7ce67f650c0f39c03dddd2ee2aa7e854e70d199cf70004d9b7b75fbf1b9083459e81ed0a9e4222985556042e4c542261b9b5";
+      sha512 = "b653bfe0b5f89363508ac9a5835655b39ccaf8a95d9c4be3337f8e2180873e194e0b1d8fbb35a8332b33bfe1090fb430f66ae2fd66518c1f3c342eba578afcc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "1ea3bafa52ff02080b21865d68c111ff5182a9d93607a260d51f59ee5bae560ed86ca1a3fcde3dc4d1b45431c1b1cce616f79775628a17a6bd3fb436c59d11a6";
+      sha512 = "deb8665f03b730cf36fe5307cbb5e5f9ef532c756df7e442d35deabd1e72f960f5a90b39efd6e306572d8601ea5a2c56ed1dd5c3a8d4236fccd0ca15ebfe600c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "219655c7a1c3b985e05ed162458c3988e3f7a60776e3c76fa7492bcc77b7fd7a37a3c3f622cda194e4ba82c863c63c1644df1e5f324271b7590775e59112d21d";
+      sha512 = "0d26ef79bef420664e5b34628258e50dca8b203aa7f92e6a3a3231cf40dcff4d027cb575689964021954d21f5db348e1140b4c4e4f080da9a56a12087708c416";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "0cfb2324ab02c302db9a19da5e4872eb9d5389c81ec2e66f434939f5fbc4cd9f97b8d72e7c745f29d62a12799eb8362ce928f16df967b4d6d557dd99a859b443";
+      sha512 = "eafa596c235859b2f64f5b07e24ef5b4c2920beecd4bab4ec9537bec3c452db1fc42719f20afb00fb6fccea495ed4981e6bbfec4ac29a56ade0785a41cc04160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "a3c30300291d68ad7798ae29fc5c475e527cb8d555476820a75ef6a9ba90c8a0fdf71a69f8e69d6ac93e8fc8044106c2195b6964b23e9528071fd1bf925ba744";
+      sha512 = "c6059f8a0624e39dd3a3ea6fdc6cca028a5bdbc0b75a971f2160aacc4f3eea1bed566941d7c01a82a4233942f1c56dbdab41d5c403cff6fcc5b6a7aad6fc8365";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "f8e2eb014640112896fe94961537b058a71ca3929fb4cb2229c4de071416ab8ae466c6b53ff33f7bd5356e126b676c1cc15414c1d3dcd79ae0906091f86f17b0";
+      sha512 = "0ca496e789bdfca3276127f2fa3cf2ee8a257fc383d66ab10553165de3413db46b99b4a6c3f049d429cb7a35a03252de6164e63563a066bc15f5a26bfe8d7a40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "20a38bea0bfca6ff08d7b4ac3a779f5d4edc17e90d213ba62011aefba7fcca1b6dd7d602fd36ea714d129f4ed6edef6d1c1d815be25975c0f3e699fc3b312487";
+      sha512 = "9bcc8395623a1d5600698b357bbe95861cba29b8484ac7db1432597fa205ee972c6005c16ba2c44ba8487b4800b6bb697c79f06d0d1df0858915e42d9fd044e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f62cf2814b271de78b21bfb696889fd47665d12cc8d729216870e48af2f0ed2b87460f90f1685dc78d34e41af4643eaa73bf51009f683520910bf90fe1ecccba";
+      sha512 = "92972a32c35969ae21407c188dc107e6d436347a87f2de5233a242f2b9ab6d46681f2f44a601aebb0c52fc1084bc58b64875bf165e047e7ae9dd88cc5b5a95aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "b05e5ecfc31926cd3c4624ec7d70789a6d729adf40bb73c2c756a97e7e24a36de0fadf180bfac4a10c39a11c62485fbb9741e0badbd95fe95736c067f47b8c47";
+      sha512 = "9bd7fd4e84b1151729756b8caafe5521557dc0747c467db95f822a59fb4e9aca02f781751126ad49291eba428691c262c1b2cf8f47b61daf860172de6b493f8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "789a3c04d1cbb109e33682d3377c56a631b77a550829c296e439e6bca75bf3d3a240aab8936b0f5131ba7a6046a0cdd7f662839bb165ef83ac62c1982cdf5efe";
+      sha512 = "e6c3adaed2881cbb0004a2851d7c499a53e7c4fd928047c2be861c45277350dc0474c198f8335e0eafdb624d7fa3d4752814ea33d6f8c857abcfef409552686a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0153f20d08d73f796d57a1e1cbee63179a943f00c2afb3c9aec666943a9b46d94d602a6b74b815350f637c516701cf849703675f8f8d128750b057f3b40cb579";
+      sha512 = "6354405bec7ae13716c9d784ce8cea4d5e5ba950c6ca985785501bf6704305c00c3758f1a304790cbf1fc8a6203c0df2b72dce70cd3d4d3002eb8260519d7e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "4bc96007e1bef433a2309a4e52dcec9f24a858940ad4400758d42981b3184211a0b6f23c2a1a3255f05676f69fe4339ce3a7b5a2a48f60aa62a1d3b5728d7f97";
+      sha512 = "fd4b499f8d7fb635692a71549668fa1f7608c452073caa18b826f6fd063d39cc11c6149435c8c467c157d16a51bb2389e828f8b856df70c60721f0617b169f81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "c8fd687dcc02f0937b7ce71cb422562a7bc286cb9ef44f3d8bee8a27ba1d21a5a9771ee4b362356ac7bcd9035e9c61f45bd9106873abca1dc96d00c016d228d5";
+      sha512 = "224a15e6426a2f770d489b2afe061b2ad9f92b2f9c01bd117a6f0b074a759f1e77a4333b9e84558121a5784970cc470392eeceba4c07c1d51861b85525d2e443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "2bb9ab324b096663b6f7fbed363c424336d1772a87b9bd602654e29cf021ff486501be3c1846a8fcfdd8e9401589351eb2443ce927697eb5238db19f26e35989";
+      sha512 = "b91cc032fc9362e23d6339efdc0dfbc1397ef3e4b067f2cdef1d69972867b331f29ba2b1d21d7c1f7986d928efcb4713b439528dc23c0a7d2228a55ffe49ed24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "72a0341a9ca3ff0a5cb0e5a020d518571efbc6888d16fd6481b14a170f36436879d73f1c1df88699067e180733bf72a9d4c8e7f594d4f5b0f6416c8309a1d121";
+      sha512 = "0c6ecd3364fd47485eb3ff139c0e46200eb2fc6ceb50c3ba203c67348f7e46cf1968e7e225b48da5f65cb63ebfae4371dded2de89a40a629e86b21352c6fa309";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "a59e7c9ed6eeed8d2f7bda902425a25926b81b4e5fd8b58cc692ed78ac37e2305aa02339ce20fa9d538d4afb226dd8f6c456571ee269722d798ed4d79e4a25da";
+      sha512 = "84109b6b1a27a470f3edf67bcdefa1e0341f97889344049f125889b379f55621ad8a8eec4390ab5cd0f070e105c956da11abf7ee18fba18fef9a068164bfabdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "673783d9cfb09df51f30ff00fa5ece151a6faf730d91fc4926664346dd272feb741bb6846c8ffce99757640fadbab918efbe93f199fdfec3bb2a1e6ccf762dd6";
+      sha512 = "2d1700364e00a36196b65a1b223aff3de48f2873196a9d70e1f99a9b9b570ea0b7182a722bcb18d3fc3085ece48b0f87fcde56849877fc677a51195f14623665";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "cd44afecf36098de1032e76ac8b5ab46983e26a8caa8c8e842ec9c1d85528fdadb1507c80e5662a1c8ee1b744a6104418faa1d0792c4ec3177ff7a133bae4cdf";
+      sha512 = "9e2c0da8cd220cce4c6180d37a954375ad3ad4ca93144c61f0ea20da82b74025ba06637602a864bfc56f53c65ff5cc470f6da41ab094611a78b1ca15064ec16f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f722f3926aad0be53db7f6d6f48ffa739cfd34995b8fbf6a91f1634214bfbe7e9babebd285a720e41eea63c696a80d4b2ad905f7529e48000b3d6e5b6434660b";
+      sha512 = "d75958cfb3c72f0622dde818345b408350cc48e407dcd83376807659ef687340879e7da99bbea1ef2dc9440897ceb0618161e1986ac3607a86a1386629b9752c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "53d92f7beae4a1d4d1443729e042d392908d184826aae925174c72ee059358282bf1d003155863ffee0daa527584dd33107a3486f849ee903823d123c5c10dad";
+      sha512 = "5f277be4f4196b4cbee8ced0ddf861818120672f1ffb7733a7b0be22eb1c9069a59818fb8e193a274db2fe5a8cc648eecbc254d7e49e9e15a77a91f80c86f36d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "9f6646a6d62bd7dffe925080bb471ee995b1ad6ad496b1ef58f7689d7349f93ddde3f8f6008dab983cc5826f0bf66d5e6512a9c7b0f121efc41b985e23761065";
+      sha512 = "945af4c0fa363170b45268290274b73765959212033ada481b1e7143ccf0440cda981f5f009cdc84c2d145d109c275430b769a6c96bbfa736ca6885633eeb8de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "d068521185090da46a9bb44ea1b9c285584d9a7028c0c20731046092bb1d924b4562409b524aebf293d4445cb0ab342fa9f3b33b2ed5b2e95f959b6f0dccb27e";
+      sha512 = "fc793fd7d840f71991a4c2721739d1747baed2175fdae113d93123f302346ee28c6f6d1b4999a066fab9eb9eff2be848bc2ae8c92d2cb98376110e442e0b4f61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "2b695601c381c91058d8b7cbd63f46a63efa004b2b14430aae79838a890cbab818b34fc8401d5620dda5c17f22509befc3e6f737dd040eabd86444353a40fc30";
+      sha512 = "de65d81fc55c67be74f5da3ba5edd89f40929943b16aff7c8b311f9667004a00de873fd17e03a684517a8504f90e0b06700703b0484af6072aefda0640ccacb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "a890a5be030075461ed2936af7e0ff0d147c822e29fdf381f57e8c6e53dd8f9ba39d51dec6f2c28aacaf26847ddb9f1b8cc009a7b7ad22defe469b28c28ad7ab";
+      sha512 = "a6fb5246b50962816ea30d84f9508771662442add3368bfe1020d691adb8e467baba89bd260ab27e506c6fa9201156bca9b59f97b878f5b10007b1a9f856544d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "9e34dee7fb72b3f268935e32f95cef9bb1ce045c2488cb1db087eeb9b1db79b9e2f859f707aadc125b57604576a1a1b3d6856ff509e341603bcb64afc7edb63c";
+      sha512 = "816aaf7b63f95b0cb14b58022b708105ae2d4487354579860d25a2e264a0cbe1aab3a2d7d310fc7b2b5e9daf9c7c6cd11ff61113da36dbc2b552e26dae542e51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "25a62ded79e4b559f9e857b7d451aefa3e54bb6f8e94ec25fc596de16563dbba44be1d196334a66861f8a835fda39f1742d5f5226e50ae9013b72c95a01d979c";
+      sha512 = "023aa98c7881691ae4cce0d63477452bfe01483a35a40b2bbf63c33c13fa9382548c66f8f43d2da57f96410c78fb48dc96c06671182aac97fa8aefb175118f4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "eccafe2e8931aa5d4081cfafd6f39ce8094b85da4129ff86746670eded5e4946a63953b4f7431b11f0742c97bd7abcfec17ca8ba27f1ca3727019274832fee06";
+      sha512 = "21662f8627c3f08e7070b9e62acdb9864dbb8d6530ed2b92ac62f51621a92feb5232eb96f1ac6df2c2aad2c4901a8eccbd2fe0ac3a1d32450cf48dfe6c5c8a52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "189e76b67d21370148216b5bbc8cac7aba30d32c0eeeb9e972f2d8dd3a9064f8c859fc0c59a531573b6d3d7ec6cdca3f9347197cb2b680f9bf335a236fa3633c";
+      sha512 = "3f84903bf9b3ab64c93364d0d555474c8929fa1ea15f345fe0515f0e82a660ea1bb5594c3e879ff4b0d32d9602c01e4983c5d45e966234d478d6592951300e25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3225e1708f34532b50c5cc35eff1cc4d6718328fe427fd98eb0a8f34fc44fddf25cf28296793f5473dae429e1cb82b4b7e5b99269178e11b2caaf5c8650d0d55";
+      sha512 = "df0568896c58af9237025f212c5e7efe3e788f9d97ffec602a66dd0680b0c1b7e7207b0fd46e39fc69ca2f91a117353f92b7b05f9e61c42e54f6987389f87f2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-x86_64/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-x86_64/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e1f8f7bd1ae5904349e58ebac109d169fffad677ac9ddb1ed39aef6c898eb112f419d743b79b278df62b41cc661471a5a4fb6fbe8994a10d6d247fda4154986f";
+      sha512 = "b880e3f3eff3ef3ba36402be569c36f8c438d49e54b378f0a4bb725bca0122cd327fffd25d672c3eebcab7eebd6840f0154b72c4b17dc32e8711af0bf9b9770e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ach/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ach/firefox-60.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "1de3d7ba3c34c458842da33207c0036d7217bc3deeccd2715c7a22e57502ff41950a73972dc270acc02c63e16a39baa33eae125f77ab68a36ecd603a7e237a51";
+      sha512 = "9fe7497dde682766bc18893f343e5e40250a9f88514b9ab6c5f6b4341d840b1a71849a66022f6e312fb53d87daac61885e0ed7fe353da9741fb8da443d6b637c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/af/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/af/firefox-60.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a694fb77b1f8871875320fd9cc91a8def83cb32cf759e1513f8780685defa8f4b73741c5ad8f7da38f3e12b48d4032f2a04841e5f9be459714254aa46bfdc19c";
+      sha512 = "e9c7263be2b8e18a5f48d79e9601d74b5ecba6c1d04b2d0973209891dc9451a1d81601a92534202daac773562dc02e6c03cab1f5b4af221e41a778395573c59f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/an/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/an/firefox-60.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "15a2e985f68eb528b88ad17fd06ec894c2b6b84b18b755befb0c01153a7a351650489adf2ae1f7a8a8848e260a0f112ce629ee6524e0967f2da5c60711c6ce74";
+      sha512 = "697398491023ad0695f4f14fcab4d7cc62a1adba61de374eb0f35938d179d00693372964a3c64f286f48b8a73a5f460500dc307fec03c4641d2171cf3a8bf84e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ar/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ar/firefox-60.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "29b840f1253b857ec28add64c576c4fe078428de191dc7b3d937e9321b9d47e39a1da555c09663e5fed86e6cb9b8f85094e416fc6f49076fa03850b381553d1b";
+      sha512 = "15204710b24d93a343dc9cac242b816beceacf207006ec6e8d08949aa9f880d015ec69b2328c3cc9961d33d6c3c817eb5971214f1b9b160e3bd1f6ba6f74c5d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/as/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/as/firefox-60.0b7.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "4f586b5994be003c931cd4e1a1154dc02fcd1344f90a6a0e58cf2e86a601036b773c2fe38a55a6ceafcc489777a2a4ba9d9addce6057920843bdca4655b2407f";
+      sha512 = "9ecfa49068162b750fcc9c0e7ddd5df5c6acb5df0e02c93a52d7520af0768bb6469a340659b6289fd383ea3195d0b54523bcdd2bd1366103ded73369e3d87244";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ast/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ast/firefox-60.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1f3d66fc796d501764a80f681efa8c85513005f6f9a510b4d3e61c251cc98f9140ca6cd56a199a46b9cc1cf4569b75e103826feadf29d6bbe517dd952b234886";
+      sha512 = "093cb81f51345f5862715ec4fcf4d573a7cfc4d5105a3957bdc16731c620f85cf7541e9995919689f48dd42636a45c4390f6fdd294d119998f9ed1f05a228ce2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/az/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/az/firefox-60.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "fc812728d7bb259bd541847ad51f0614b051f13eae4c794140dfa8a651eada2ee82c36cd7f76c42252ae1bfad44f63d01f77d43f91e55f08f047f29f5b8dad5b";
+      sha512 = "8d5a3a57cbaff56cae50dfbf73fecb5f7ab7fd78d4c3ed6e2e26b4e4271eb065bb104f0ab36b1c8e45f4ec255595167089200448267029a1831ea072926d70bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/be/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/be/firefox-60.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "cd12fde14e1f157ddb938b38e99ca05173aa8e5c5b09dd826c7aa2db8159dc1b123a792a772b226939fc44f5b9b364d630287431b3326394a4f964b9c83ba337";
+      sha512 = "0e761be550dce2f7b92c5066c7978db3de51deac09909f4908f07fea9bcdd4061362d96f96b0df9d2414b64c700d5389f1ef50b211250c7f19dc31dfb8d39135";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bg/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bg/firefox-60.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "ee5f3d9ea385450b0bb3da154480b0b0d88c345fdab8a6ef43380d512c10300f5b00ecec28514bd74abac3b2c7ce492097b0189c4d7680fecc512a171edfb55b";
+      sha512 = "e633dac1f889a53f6a5653012889f802bdcb6ef78fd16563d1b1db5d37718f7bd49da4978ea6e5868b216e175ddf45908b4fdb7fbb7c56e9f949071c4f08d140";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-BD/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bn-BD/firefox-60.0b7.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "abbca7a1410c717a8922d8dd0bdc2fe14a4a699f4ba1887bfd443466be523f5a0aefecb5d8163d1b77ab0a6448fe2fc3559933a5a8fbe7f119c45ed1bb4c48ce";
+      sha512 = "d5d77ee359d5c89264477d4ae70194e3187b3f44f413de4e10ed81add87bc8fc77e39aacc95f9192fadbbc6c81b5666c4952bc7d3778040ce6315b83f5effeb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bn-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bn-IN/firefox-60.0b7.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "02bb6fc55ed10d05061071640bcaa8219ea719c3645f368c4fba44ba5accf71f8de9b7f4b9306dbc5da7716f4bfc3cb414706a31f336a8d24343f9de5c4c0a23";
+      sha512 = "6d5c4c1d1a245f58750ecea5bcdd592d76f013ff34c9f4812a24559077a04a38cfef011530ad17d1a9b2d030186099eceb891f1b468ee1a0c9504da5ec311ff7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/br/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/br/firefox-60.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "da929fcf02a4b08ac03f5ddd076e5b1433e69daeab0b246b0f475da0e56bd6b7f122ac14e34a14960e1d5f881ce2b9b9764c71d3b0245258bcbd3e57ad9c7a20";
+      sha512 = "354d0e64c85b6e56aa2bb0d4188c9dd20abb180b99dab6d9d1c13bc8bcf8b3ce5c9f136d099e0357579d60673ac52a35facc3351eba2465edf67a5dda2b8be78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/bs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/bs/firefox-60.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "bffbfc0f14495524555f3acaa0ff7bfebd605dedbbbbbbcb29abd3f2bdbd5b5d924fa562502af8f62714f11a00d060c33e8d9b3fc80c6410796175a04f8c9e70";
+      sha512 = "b748c6d1b146d99fe3dcde6f1eb0047d58f6950227d63811e9813c11578e8dfa59839c70062ef12e7a9ccfcdbe97bd3bf589d398dba75ca9544550463ed72da1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ca/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ca/firefox-60.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e8bb642b9498b300c6f594cd1865776b633a2ab7e92b0171860ab9aee14c8d4d1845bbd3ed2417b8c3fc035a297bdd36d668f5b45eaed58adee0e6f5517ac5a1";
+      sha512 = "835607109dc7de538df2de97526244eed96f4e09f5f177f0a9c161cf69024a9c90c8ea00694909d1a1ce8be1a18f43854b57746856120898e8da458436cd5e35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cak/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/cak/firefox-60.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c9dc7edbe2b7720459afa58e1ed2949b48e87edd29bebf4b9911e4d78e6e8b00cf0f81a5c36fe5e9c01d3c9071604acf9977adfb6034d25f88d48f7b171dc336";
+      sha512 = "f29e43945b2c3c8430b807b07eb64e2128e532780959739c2ec03c41adac0fcff208efbd47b68359efa29384a205f192cecd23c3f4d7ccf0b7e4c6406d88c60f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cs/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/cs/firefox-60.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e0c6aed3db6b4076d75d3eac57be9dff1198a83ca70043355c0ba5b2d9c3327e76f159fe3ba957379b8e59a4014d1231a9092876d3226c4da1643fa19bab13a6";
+      sha512 = "ba42ea29971bb9510cbae8b6c4bf7e105b18aaed5db7fbb375b4edcce800fe7d3c5fff6a4d9d08b57682d42f1eb177e20d59c832561348ce4fe5bb9f9193f399";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/cy/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/cy/firefox-60.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "223f90ad302b6c66afc9de7c1cf0b9cbcbfadefae2ec210d53399f6657fcabba0dcc0068e8e17e3afa68aa94e9ee654544ea5307a957ca26606a2e8777509cbb";
+      sha512 = "58d30c2995d3f3b7d27e4e519fb0fd6629e3187722382c2a0d89d7a4206e8b1d9a1f5d67349d335c30d5160cefc42080563a0725d3873faa7b2619628e2435e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/da/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/da/firefox-60.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ed8199b9ba53cc4fbec41ffb68296abe628853029fc2f0f2d5cf13e1262b99a212070cc1ccbef67598d33bbfe94b5254fe4eb14d980ca0d13b4f6282bbd96b71";
+      sha512 = "78ece52df0d26e588f3d446892c4cbbaac4f5269c423b73ee820908dcebe7be465ecfcfb83bf926fb2f3f8e428b479b3bc36f3380ba8cdb8116700ba034f4d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/de/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/de/firefox-60.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "69daa139c5e88da0dff1690140876a19f3fae674f5a9b5c77bf74ff93179cf14a5ff17fcd2288f2d1bebe0e6bb8ee78f379e6afa564f7984c0ec5b05dba46318";
+      sha512 = "c2452881f0d58779f0269608d548e7630861ffc99e91e6520d04b5644714cae8cb75995b3e5f6aade4aa0e85fa636d5bea81415e9c541a67a81237ea37450951";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/dsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/dsb/firefox-60.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "dc8d69e8b01a2e6166acd15620d3c4a794160ba079fe0c618be31fb1df1bad320a692fa61f2f924a3e377ae36359ea732e02fa2090eba61ca6385f72759e02d7";
+      sha512 = "8cb6ba55405a481386d0085fe51ff7bdc401fea280dd7f30f8a9a1644f75d404eade352547e2d74887c236f4ec4f1d8644c029dc786115bcca6dc8c359c2a0ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/el/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/el/firefox-60.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "1b265db34eaac4c303805f585e147aaae408854c83bcf41c8e2c6934084f971fecdc32c1c33cd113f5e19a821db54e7c91fa2fb8ab9521987d2ab3ed8141a8a1";
+      sha512 = "11460b2f813f06fb8c5e142e0d586559e4cbd852a5226fd4d505265136d79667dbf52a6ce26b33adbff3558dd40529af2b5386bed21c5060146d76e8c5eeaf1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-GB/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/en-GB/firefox-60.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "3306b84daa72d3d70918f40310121c0baaa87ae967441083f5fae628435b75e85dccf941f6c30562bb45afb15ae4b5db5d4f28cfcfeaf8919bc153227f26b804";
+      sha512 = "957649ac1888b086509ad006da7b4502cd72172d0bf47da173232043378025bfba7fc5a5ce5ace30a852958a73a426611e33abd119e11b9e8136fd4828ec79b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-US/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/en-US/firefox-60.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "49c9f5883495e6cf68754c71b4b14d6ae5d7c508805c0ee610d9fe2603d15accaec8e4083fb4c7a76b5b26fe76d3d23c1071ef7dd267a318898a67df5fc96870";
+      sha512 = "72c69909ea8cd9999effa62b8fa42b5c10760e03100a4d6ba2c40322935edeb986f02b43bc2520acf1b7a89a55bb1edc0618df97e5d46e3fef1bea3c81ef3456";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/en-ZA/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/en-ZA/firefox-60.0b7.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "bfe04cd934fc5af29d6d823c77ca1f0a7171ce143d4797c203fa5cff5e33652d8c71783dfb933afdf6980bab97b7c889167a2614ce7b3199dbe265441cd078da";
+      sha512 = "7bef71a8f24e9878509c74ba54afcebd8a18bbc79a4508b5168d943b6c021d3055a5f2e92cb26382c678c389c44eaa592305489fa9d7d82cadcf2fee83aeee6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eo/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/eo/firefox-60.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "b4a193e681322e104980710dae82fefca4c6f2b007ac035439dc95aab28046e2193de94656682af0f18a63c91f7bd724ec69fc2b239c7e633a93440f4ef5a0e5";
+      sha512 = "6f46633155624cf94b44131e03912f708045783bfd2a69a14767f1c0a78136ec9ebb8056cab7a5c6eb674c0db93d4446858a744479b54c05d9367bedf5440a64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-AR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-AR/firefox-60.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "ef041d3cff46f7ed02192db781193bca9a9f903f68c880f7546f49fbc30d9a01ae77d31f3717ea27f4617ad70ca838a89af1a10722e0c20976590eaa596c44de";
+      sha512 = "14134389090a1ec88ee91160c5c888df8a8799cd2a146341585c2080591a0fb69bf2a0c2c6c753bf38d29c6457eda7b3b862de406ea0a46f511ec1ba26a8aa17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-CL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-CL/firefox-60.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b621992d02150a1aced53e0298277944aae6463d06eedc6a18c8cef3995fd9d8c68f149d81b0d1261bbb1e0199697e8f169a73ea2db0be5bf25233649a175442";
+      sha512 = "afcf3141907a289d47d2460df6689bbc38b0715ec75df57b0b874e1c9f2591921cf268490340d754db7f2666d8eff94650a4f2f291e4308b61f64d4935d42bab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-ES/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-ES/firefox-60.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7236f8075a63316244b8c398996c486cc8a592e3be85029e6050cb1d01d037882e892a31b3e61f8554007d6c653497df244e95e57d59bee13610a36bad2eeb26";
+      sha512 = "37ba6326fd0f572ab0bfc6667f026f5f5787500bdd62ed0123da31884304b18926759f92b8352c445e6ca04bcbd30dc6ec2859071c30786f97a218ac211c4dc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/es-MX/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/es-MX/firefox-60.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "9288f03925476f2baadde3ad176763883b365dddca71290a51396f8bc5367d19cdceedccf7b9a3264dbc36fb9f49b443b6d1761a87b0f2c7d5c74dfd469d6a86";
+      sha512 = "f0855d26bdcaea247db6b3649a7d93d0d96dc75119ee9bdba84412829a67b8f4c853a16eedcb9a550d53183f54098515cb2b09531053923d57ed7d0efa4d80a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/et/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/et/firefox-60.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "a75c0f644828cb6a2feb33774af2ff3374070693267983f7d9f92b94a1e4e40dbc75eb818c86e8c8682e76f90903b094efd4a0146da2f2594fe34df7e3d0fcb0";
+      sha512 = "912da96f4101232c59d64641c093a5bbed63af9b2424232f7e71c1a37156e34ea59ddc0945dcee8d7706d0f70e0246c9c8ec8eb5dba1b205c901c438c544d660";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/eu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/eu/firefox-60.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "1f640beaed898e8c62170699ce997ef6b186a776cc2b54121c796521f7da3bfa89e40213b21d15fcd96bb0c7f526bec00e87e519a262c205b7696970382b7467";
+      sha512 = "ec7c5658848fb5350a08a48c5d8886cb17799bacb4ad521544a2a720c0dd6a5f78c09f93a066c081d09c6e52ef943aabfdfe8c33a17e628ea8b77de49b2f6d2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fa/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fa/firefox-60.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "6a70dc133122dcda74a2d78c350ed405c3ae7362cf8ded43493d8d5062e310d1501539407c9ba4ce871f99022ccd5336f4c0e1a2537ac27aa947fdad2dccc71d";
+      sha512 = "328417ba8209fdb1a48aeebd7f90fdbeea2f3ca409a7300e8097a020cfa83cf468289f709f62633039d841504bc4bccde5de5acc68dde6c625033aa16bc3c1fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ff/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ff/firefox-60.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "a5e03e293d293e219d6ed3216091544f3dea363c7d745fbe603829fa10390ae285ffeac9103c046f81a89acd53403b0c0a372050c1b8a5fc591303c7d27462d1";
+      sha512 = "961005b2b0cf5c16cbbbf63d7d1b4d191aaa90263556328ad0da3076859ac3e6daf522828315da4d0d052b9698c310d46b8859f1ef4faf0929e3b7095a39f052";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fi/firefox-60.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "7f88b803609ddc1bf173ac6c7b4ba7f2f748a44451a1bee857ab2f6000d3cdb5d0ba7518d00faaec64c5f162ad7ceb771272569efba5e20a66b581be9e1fabc8";
+      sha512 = "deb6a8044a816f6f4bd2464c570f3679fed5248f0868712136b0eac67728dcd2a5dfc894642369af1edd503d6b882235d2fec0c5878256126263eb7715bf146a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fr/firefox-60.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "9190155e48bcdd5497dee82307146bf4caa4dd1ff4b1e198daf9a6cd5bc7ee9f53ebb08420fc896af8087904705591d36b578a24ffcafc0d7cd4267bb8e0e795";
+      sha512 = "bb165fc18e0e1913745a6c20230c2c8af495b8ae5453f689230d78a1401c66e05ef124f22c6f302cafe6247d21eaa20fe9802891d7eb99b5492a2b9a153d04e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/fy-NL/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/fy-NL/firefox-60.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "bb91135bea41bfdea6b2c47a8982ab43f6cbc07b1cfe4f01ddff85f745416f52207783c7253fa231294e1ef3406624b55d01bbc3d08704be303730a6b72271c7";
+      sha512 = "fc5d5b08f230bda12033e737843f9df099514fb3a86e937b08308755f996db1bd639b55db659b7fd14fd21ffb46d45abbf92ae7b9c909d94eb4b9d31a5a4730c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ga-IE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ga-IE/firefox-60.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "beed763be6cdd4eed7a2dd6ba5ccd56c9747905e331d11f2a849b161c7dbb16fb08c32a73574e1e127f07688e75261462e90f78853a9f68bd240ae68c20823d5";
+      sha512 = "f006a764693de3200e8925f03da886b59def39fdcdf412375900e2206606d91a1a972d74be3dd186005205e1b400a95a4b9259b82a2fc167df94fd9cded2b959";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gd/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gd/firefox-60.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "2ea035192a894496887dcf71b01834027be7f4744621f4eddaaf93d374399a03564aebcc747fc79d6a4feb3f28ee4f45c3e3fb2d3b849194856ecd7e8e8b89c0";
+      sha512 = "401967304b43bf57d6013c972edded392f6dd696ef6d633cf24253d407eb731ed9547d3ba7023114e25e3cf4546dd2136e79ae0a0df8378d5fb069fcd84fb623";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gl/firefox-60.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "364f07c66765a125f7c2d46784d3dc65b46881719131da2966ab59dc208e4e28d5abeb2e5e22ee8b31014e09b60199e2f78ba3b2d8a051ca93affc26cf5bd92e";
+      sha512 = "8a639cd9fd5cd5de3eb82341e9ecf04833f79b3efde86843918e793e6c26118b9b2f51f26400d0714bf2e6f2a795e4d5af7219d4529d7ff6a413a51b74b98aee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gn/firefox-60.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "4452a40b3f15e8ad7515fa8df963d4723b892b2fa2ed06c9a75b24ccf8d7d7dee01fd550ec75dd106f3e839d7639ccabeabe7113a59f920a848e946e07ab40d3";
+      sha512 = "5293d81dbf117183f5316429486b8cd192e3468a139e530e53197d34199409b62089df7021ee8937fc3c3ec89112762ac0a996455f47c08598d1c7f9cef79f80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/gu-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/gu-IN/firefox-60.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "a93b16147be352b2cdf4c5ddcdb92bbaa611e43b051e54032803158850a28c8a66970ba56c07d538a68a7ce703cc9fa449e8e0cf89ba4c2dc3aaed3adfa8a4e6";
+      sha512 = "34d896688ebe205c37785b9274bfeeef5afdad4ed33a3da23e6164db4ad46618abbc915eb57de23b9b0357e0db9988377b12c956df165468d387cfc861c94ebb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/he/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/he/firefox-60.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "4d47dda173e0c8ffe8dd94b803aa7340de3dc24757dbfde6e18ba652c90a241c0c031d0e1d4002703ed2d5a046db73440eb20c56a8de36c35890b4455cd7a092";
+      sha512 = "37f10b8b932b218ad17d302859f8b67b2438673b4dac6651d1a5844fd659b0fc639caeb99d07f46afbbb1b99c194afbf62088b50df5ab3ed0a902ee469eeb1c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hi-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hi-IN/firefox-60.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "9f6e75b7dacfc1fbf1f713948954101cde55866d9f17e802c295e459abe076cf379848231580a2cd240a12acbceecea2d9d5085d7077d9f5401a8310bab94f2b";
+      sha512 = "848419a3528beac1d0035a90c1b1a5067251a52fffed3492a8211101dd2d23581edad844f803c7fbe0e5142d7f5e9bb463f0cfe5a048b2632e7529beb06c7eb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hr/firefox-60.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "b84e51deedbfe48d381eecbc43383e8c9db95b9444d6ab418a9ad03336164bfd9e46f62a2b8dc676f524a148b53d37cfb1dbda8f53fdc20b0ecf4c8d67073e16";
+      sha512 = "8fdac24f76ed898c8885f38b630e725e73602d9559c56afee4d171586591fcdd40419114a46c8ddd8028ef0a129d47e50bdacdbcf14f8f3fcfd42656f74f8763";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hsb/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hsb/firefox-60.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "ff9cd81e57a54e123f06399168847d7cb41ffb36618002353140eb83d38d3d8bd78304c022f011ad703ec8e54b19310810f3c9e6951e853da4dbf6fc5ef4b990";
+      sha512 = "5416420355d3dcd44186eeb3c2d32ef88f557de1a59568d2fac33696998cc87aeb84ef0f1669e677451361f38088d93a4655f007b5e5cf3e7f5553671ab93c59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hu/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hu/firefox-60.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "ebf41ea935a6cbf3858aa8874518b345574b6d32a8e16159da2b5c219766d38aeb0207f4cbf90dee1ebc758676e65275a885d932dd148eba1757682195683bdb";
+      sha512 = "af6d83073b99e33be15ce32fe1269a0c447b503b7898f3a115ddbd22f8eb27475742c8a3ba083d83c9780aad989096f9b6e89129173c30f66cf2fdf3395c199a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/hy-AM/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/hy-AM/firefox-60.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "770c9df8b2b8f317720d06e4b33ec13368f47da4e5d1344f676dfdddfb17a18036d2ab69f8954037d779bc64d4263b49d629d1c4c81652faef50aac90ffbb7f1";
+      sha512 = "4d052f2333b28681fc141b104729fe74e7750b6e6eb6e359e7eb721b17e7fd93163eb9fca860311a0b2f183a3bae107d4fcbb39e3208495b4cb343953c17e29f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ia/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ia/firefox-60.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "1a1f0706b37cc94980a592efb50b321bdec04594577d5e39f45274f76d68b4af44a84c2976f91e6992cfd2b29f7ef1bc2a8c3eecd06f49a846f36e3b588238e7";
+      sha512 = "23381ecbb86926f88b4e7e98db0bb3633193979688f30d2828cd676206e155d9c3ed7c9a0bd5de25d1b065e7fcdb2df97205863a1444151151a8e0fa622df557";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/id/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/id/firefox-60.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "8d300560c54e99420aafcf3752e157d256b215abc6894d7d84ac84056b1537addaecc628dcab1e3bbcc0533abdf6d66d34afeb63cdd680d87cf2f0bbf2d98018";
+      sha512 = "f38dfbc8db02c16be7e111a1dcf53f0fe5e6ff1f52f84562ddfa07a994bb89179d78b43cafb4de07a9a2872edf0a5f7b27c5a1445e0603197daf6d2b4ff83bd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/is/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/is/firefox-60.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "3037344bf8c3c349089ddaab17bb5087cc6ff08d037426dfef379fa446ce9352b05ece1fb38c78c3f91eb130cec4055d448d8c8c95df035d2289872bec3c2019";
+      sha512 = "b92ad03428560f30b3fdba23d9ae979ab96d26ffbefd45f392169d5743dc50d04faba5e9607b0740df94366458d9870cb83661558e760f6ad89fd97f363abb7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/it/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/it/firefox-60.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "0f1c97b9424024d06bd2e55e9b19a6aa1a864bbacdf1d3472ca49154d7b0076e672166a50152e9a79081fcb43482195696ce2461a6f2460f089306bcf8010c4f";
+      sha512 = "3c47fb41d7dbcd9b14b6b294a6e807c76b9973476fd8ff8c4d5e4da14db40bb15aade489155cac8e33584f15d841fd9caecc338556879063c3d0124b6eef70b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ja/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ja/firefox-60.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "63e3258ea9d03222922fca33f490539ddcb4665d681fc3cc1c8ee9c7aa19497eccca0e112994d51256b8dd674487aa47a907511fe1b1c0880aac42030fc8cf5d";
+      sha512 = "30736ccd9684e851ddd5ed7ee227c36a8248c1d400fe123a1866d2f090c8536fff494e168f17014f4f6df651b8215e30c31badfb4457c5b70f238ecd42a7738d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ka/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ka/firefox-60.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "dd3f7edee883324c2794a5753111f051efec6c1b406166e2a7952b57e29436a3cacfa959cf20e22940cceda73a6450be4f41da0c0d40b234f2260ec0aa7a2690";
+      sha512 = "28a686b3e721f60284154bf21f0919841db7240764b23a77ad5bdff4b6ea0ab1ab0a8195b8f347e7caf17c43ef3f87401d896e9cc3f176033def1c81be76a61b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kab/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/kab/firefox-60.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "405580d9f71e674122c034efd130597e4c8be01dcaed041bc12539343ae4a7ca3ed3dc0199c246559fe44bed48a1445e913a39a7bf0a9888df590295a6d0fe1d";
+      sha512 = "0c174ab063858acb4cb70a2d97b0359266d334d80a4cf0fb1d0a31cfe0bed03bd72e8cb8a80a8736193d494fffc84427b8780e633715dcdea50c4ed86c4ab6bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/kk/firefox-60.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "a2d67dd6cbe543f6baf46441fcdab2b4282a2a3d42d91bdcdf14ef4f6e513ac22c6d8a019f40b4e7080f17ac4ce83e1479b05d8f07d19f7e770c8ef691c3171c";
+      sha512 = "7ca54b7240de10b0c91fefdee717b472a7b583021e1ba072a44b4d9b5dce35a931e91c983f21ff346cd4b8330640b7fd8a9034bd2806578f7e0e6aea809c7cf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/km/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/km/firefox-60.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "186bc96ab6d55812c366048ceb1e05ebf4044401d6b67d7e8aa81c306a4bed26ef72a5ca25d3a0dc468645b3fa5b0016c02ed223ca5c2efd05656bb6519767ea";
+      sha512 = "e785b2403fa2627fe75c94a3d5af2d639a7b7c9c213f4a58fc15b80085279b7ca39ff1e31e4abdc6427dc9b99955e51f44ccd027075244795383d6777d4ce79c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/kn/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/kn/firefox-60.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "538a8092f3e8c6d684d0de7f909cab7732b8c5bc3da722ee8c1cba4ef85f814ebac964db9803c245ee6065cd7bc6549cb2cbfb397df81e0d990a427bee9e9d32";
+      sha512 = "cda35867160bd4ef2d1f96e2588a8bb3ee44c2c3f8b15daad16da56e637cec97336dd023204349ad36a4b11fb5c6dfee3fbcf85434ac321a2b55bc4b34b88b71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ko/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ko/firefox-60.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "f16f1fbf447ed9e026c924f68d5d3c04ca68320f0e23cd5ef1eb288ff2d50bd95332ba3759410a48d0a36fbeaf390cf8fe5537a58aea58aac64ca2f04e870c78";
+      sha512 = "3291c2789d0d34346c8a5e8b6cdb324d96a89883dc5c5c68bf7ec6419da99b0ecab1039e09e70a38bb64ed7721e518d21c380fa117fc7d22f612c440e2d7361e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lij/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/lij/firefox-60.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "62ef181fbe71d0b91fec36eb90cfdb0c76a3b0eda2a6a3288528b1414a18a73c8beb0428e5cec0bdf80a3136541e92d9b302b0a880a4f72c568f7ca7c2d069f5";
+      sha512 = "d911a6053241a42ba092cfaa64b4b52c60d10fea33bb3e1d5c9826a3f0b8ed0070ab6905b8f801c34d537cf110a8b33abba7e251039ec82fdc6dcf1fe44ebf47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lt/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/lt/firefox-60.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "bde5365d7d77145f0ec0d1256496f303d78f1dd2f7459ec8bd376c4417f71f585239dc85b7c0752cff9121ba6190ee831163fe8db4cd6e5f4c8282a25fc736bd";
+      sha512 = "0589d36886d66cb5f29a9f17f4f2fb2249d6d88fe1a2c98c7e70ca60d8ec0cf2a5d93d9beb0bd25af91b20fd4d34a292a80b91c619c1b08ea07a143ef8874271";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/lv/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/lv/firefox-60.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "dc7167af19c73d430389aa5ebf7d2a3b52193f195dbdd2a5f82709771fab4c8180fde202ea35268b62400aef869d6ef0cdbbcfe8e1d45ff07052dafd58dfb78c";
+      sha512 = "98f12874a37d09f05635f70589d410c59c5719e9dbc6cded8b673d28558f79566a94975a596e121497a9352bc96d3f646b74244a0fa36c48690fc60945bc462d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mai/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/mai/firefox-60.0b7.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "3c853df6b14641f94ffcf20f972c82dfbe883c176fbe4e20a530d811ddafddddd935acebfe68a4857f8d33c58c858ec31c4a0ca6f8d58d717a51f506ae880d87";
+      sha512 = "f8316f566941ebadb77d11c365249cbf16cde1856b97753f057ab67d1bf5fb2a13aa18e2d5a3f0be1e5a856cf37feac91b4f629b1ef210a97040f15bcf2316ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/mk/firefox-60.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "03de4d0db15191e601eb73543f2794053eb0d25ec1161e668d80446d54e664b442e19f121bcb2a09e1626c01ca6a44f62cb85f95fa71474b394647d1e07d63c9";
+      sha512 = "1744b771f83ef60159dd073c73f2fec6b3213fc3e9cdea8ba1367e50f2a8555ecd4cedea1c8813f8a9196528339928fef60b94c67d7fca9f118348165bc49213";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ml/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ml/firefox-60.0b7.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "bd11447447f93dc062ebf121578c068e36892a0594470a3bd03b16054012fe5af66f3ac376c694f7f175f52e6066608de78a4724ff79a13b39138bf94b49c963";
+      sha512 = "6e25ba8aca1add8829e6b3982f2b3d394b8342b74ded519dd86b877e8e9405bfa2133894044bba9071b734046e03e87e649f94dfdc50af5310fd236c39429aa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/mr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/mr/firefox-60.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "45f5f39edf86ce562026ca86f4749536c1f7a4e22381a67885bf0ccf1e1471048fb16e1601b9292d3d38e6d40412d40b86f53092b24ca51a5c99d4be4bcb4a6f";
+      sha512 = "48a818e9e6f71381cfdc2f330dee0fbbdf7d8f403f2fef3dbe8ea5aed8f51f07fd18943cb94a6aacb032a02cc3eaea9c45e09ea383945765ed14f355661b21e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ms/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ms/firefox-60.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "41c2dbcaf152a75ab1b6e5ecfcf1214a1dd7de6bd9d80ec4a88fb70123a24d8f147f75aa02b292cc468ae7f8a86a127756b45a0aadb7ad81dc182b24ae63b9dd";
+      sha512 = "7b96ae68a111f133343ae4b56864e86edce3c50a88a18cd9d7e7406b1ee49645ceac89c870687a18020e9e382d707b26f5a34d3141c69459c599396605d74d68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/my/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/my/firefox-60.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "ad14e5b1f262373757f0b3d3285a6efefaeb4fc75cf07ee41fd5baee24854b0838b994f57734188cf79a109415bdf738852d703b6704c4fa9d3fd3446204d3b6";
+      sha512 = "a58596fcaf9cdcac330c2559d5e2225a47187fce8cb3d4d633e263a1370b0ef99ac214d8ccb3993da22c895333d511e8ae60ae88b92d59f3c137345531bf2762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nb-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/nb-NO/firefox-60.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "25ba4e079a9e74a972a9ad37a2555c5c42d71015ddf461575d12ebd7c2304166df4a1806a073c8a56f07b7d824a6231d3bb5ff00eff58eccc293457d93b3307d";
+      sha512 = "e139fd7712e7ad97ab14d75e7764618bb8af2590085322dd6309191e4e9dcfeb383c2ecab4664b682ee07c1fdb60280ab6a58d683e6a809664221534dd2b555e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ne-NP/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ne-NP/firefox-60.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "01ab6ae58d1057247759aea87521a607561a55b0e11f8cf01272bbd06070f9aa5c3ca728c2f2041674c90f038d8b5399c8cff25e199d1da4501bd616eaf8970a";
+      sha512 = "af50e838b7f0c9c85bd19d0ad0f40852e5260fd7c757a346a7fe2345713a6a12f679c5b9aa8a5fb430521c72aba84a9b61cd131c61d13ee5abea2f3cf3227cc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/nl/firefox-60.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "1c2df86fcf9efa649bd22c0863898cd91319e05ec2930e7c4cecfc46da3a47449fc7cf86a0fb41e1813ffa05fd7c8d11aef23a0bd2d2cb8a5ed0df93c71e860d";
+      sha512 = "deaa920c77e9cbf73637451f4539a0e68f87e05997cad3501a34a7a864aef5e71fcf4cbaac1dc262fbe30ac3785583ac12baf5983449c9afebfb39fa6d372d16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/nn-NO/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/nn-NO/firefox-60.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "523db80c388f657cea7f69ae787637d1349c42874c9a3fb6b726ff6553c789dbd428c2e8b2d207fbc57903e6ff5fbf7493582b91f98b7c497ec96e77b299baed";
+      sha512 = "7ae0b550ae2bc3f1100eaf9e7de0afa15a61bc2e50936ec0b93d6da9c53768e2c73c1a31854dab9d564344abaf22155c62b3b430b07367b47b61a79a8a58a662";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/oc/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/oc/firefox-60.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "52d78064592ebea903b5a05669ab73fa3e86d2c0ba014a6b4199138a8e0cf7271da513c254fb25a23b98e93d16348e47c2bd1f32f4644257744f9a3fcaa47648";
+      sha512 = "b97664f85fdbc301496d77efc95ab17892104a72558909399f7ceeee5427dc643aaed0e1ed48c392f2c3da47b221557f9f99522779c2a21cbc5baf08af66749b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/or/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/or/firefox-60.0b7.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "8eaabd96695c083e3d744b72ae5ce318f63887a7e70681b9f6269cbee2db60309ca5e2dbe35e612d48014ec815266b1e3dfac6884a1a38a08d6a04f802a10a8a";
+      sha512 = "52fcfb51c723085a6d24c2a8993aaa7d2146071689dae71f8dd6a7fd561741fe8e4a23e5ea2f6525ee0a4b970d63cf7751bd8fa5a771dc0b1463039bb17828fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pa-IN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pa-IN/firefox-60.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c03118fc5530133cdb0298bbe6e041b3edbeb7cb9ab74680410d9dca4440d9d4beb44bf792683bf556effbe24a28d7d31be7c23fc160f5dab27c76e8ef4c7154";
+      sha512 = "feb2a04fc6dbe4efb0e1937173bf7d06670e04f7dee56fbfe6983a81ee1862b89dd9eaec9bf7efec29e388efeb17a30c24bc276caa4e430fc2eeb87c84882ef9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pl/firefox-60.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "410c12bb9ab8258e3d6c01c68272228a17116e9f3531296bceb1947091eb97d0e077b8749c206a767c7d18782a4cd2b7a5146fae1195c481e6b17265c1b9f4c5";
+      sha512 = "41722381775abb0ff845cb8b38bf7fa2782f7af0cd8c12b5a86bdaec797d4aa6a2ee2ce35c234a1a17b9e4f69aefb244e3e8531c1d151a002a81b562ee24179f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-BR/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pt-BR/firefox-60.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d998dbfb46c4bce19d926b746d45b7ee4d9b4353a8c2e8472ea29f51cb41df1b7384508d8d2c51e6090a31cf3349b557511efad9fff48fdb680efec3fa82c535";
+      sha512 = "63b9385ccba72f5c2ba3bc735685d6d35363b0d523e508cdb603f59209b750fdff050fad791a0c01abeb7385c1c94fd24d4df00b2177ab47d3da53a7d0f74175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/pt-PT/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/pt-PT/firefox-60.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "eb712a2a1065316711582423d3f930154075654a35d552c46a1efd95c56840329b07c03e4d2587594793d8dbe70e77f40b08a26aff33fe4d6a7f81f9144b8037";
+      sha512 = "b39a4bf8465e4690b06c1372ca2a3e6355e00e466865a4a764cf6fa75965c94b6b887259c3020c8423cfc0b1eb7c5cda8aa3574e5eead4d9363f6f048cfc1e19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/rm/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/rm/firefox-60.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e358146e4380d68dcde78c06aabd27edf025a946d8aced77da8ae5f553db485abd44e79d56dcf4a247935dc37e012d20a85ebcaa7653240ac4a137362af1508d";
+      sha512 = "0b943f1da58ff29cd95dd18db809d660ef452dc18ca047d1d7cfcac388cae09a123d52e096676cd0dd3be3bda12fee2df69337064acf7994ba6672664684fc24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ro/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ro/firefox-60.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "fc0ba49c238c9eed79c56213f2a3eafe0239db392105c8d9163c8c6bec0e96b2d0eca89cdddf89fcb3e1265e66dd15ab44bd126841a2ffde566a2aad87754992";
+      sha512 = "d2eea20f4d10198f3cf0969478e19b2ae6b4b359c67afb850d56a9d23c6affd3550848074f72bb79063aee1678a5ac0a0e176f41553dad1eb59eb7f8cf3fa4cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ru/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ru/firefox-60.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "2f87f1b962bf5c0bbb9d23b56a63cd097c9fd772c42dfb470bc3b8696f59ec42b314ecf93f041ea8e34aea0a82da946086b8aef1c7de68cde1a75266423aefc8";
+      sha512 = "485df58d959663023689c4bac2866b8b67e935570b04cfa8dedf52d104555a5da18faf0e3567e699d677ed1456daf144d1b3baa943b5b8c8c056c46a6a403299";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/si/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/si/firefox-60.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "71eaa7ea7d7efa95de76c9c838e41bd5a925f7c0736fe60b54e3d38480b58957ac6e48bb64e4ec3c661bd78238f72b94c3d823a59d532c372866b4eff0d4c700";
+      sha512 = "23bfaab1a790092acb452939ca4523a23d70315c163ef85e2b902c5aff8128a237a9458f1cd44a5a40f8f9c3d432ec0f61af92e9bdea5069876026b9868e9651";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sk/firefox-60.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a84953aa555aa29a8ac55fec57179b773348f4347b944436053bc54a025c40411c08b0ca318df03b759393793870f7de69cc9c63a2f7bfc51695e9e2dab426ae";
+      sha512 = "3e2688847c4088a08bf5c1e2b14508edd0206ded8ccb0316fe9fa21851f27628389e0f332906c2293b5122e38baa31701ffce830e763959d330fac43a4d8a2da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sl/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sl/firefox-60.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c99e242d473f004c614797c36cbf86b0781639133101838d6745eba4d83651d41ae7559928ac7db5f34bdc74f2e9ad144255aea7cf267026f51c15b2201a4786";
+      sha512 = "370f10422839661f17b762ed88b9b4edec93c324393a9abd0e757ba047c49b246c04dec2872eca4bd23af8578ebbaee07d2ec2d2a11e3c4f12998d2de0f21b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/son/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/son/firefox-60.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7fd406b95fd4aea4df73a1804260e7be85e7b30d92a4ab5f912b519aa9a26b42f5c0fbb41ec6046b5f4654fb146747cd582be214bfc167a34c151cd1ff5ec421";
+      sha512 = "4d5903bff1a3aec38246037ce21dd0f14e69e11b9a39befc76b9298e1f3ee4ff1e686d186b9e3d2a80d39619ab6eaf65c9cefe3f3c0efd3064aa092485a2940c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sq/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sq/firefox-60.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "966404ba6670fa614bb63337de97ad5a3ea25b1850f95c8a79ec965c318aa073fd818cf2299e1469a0e25953a60d1b1ab6bd3ff8dd6475f98e0c84de769c2369";
+      sha512 = "a4507b52028c4ff4d79734ae8b5e93d79d1c70b89e91fd6aff13df4587be94b35e0c4cce2670d1c709c86bc80bbda14f976095aa8445ba8c59c5fbd5a23955d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sr/firefox-60.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "c36f8ba24429d0eb7e28b10c3e8fe0bb6ce45c2e82eeaf635fac441a9168ce1c7fbce2acac1f4ee631f2cc772aed509669390b673f8acc2aeb7f778a3de160c9";
+      sha512 = "b3b633360df42b85a6f2b7ab34ee69c572d0be444ce32e03b76ad799933a1b2fe1afff5de62c9040bb0fbbaec74db47837d0d813f73ce248f82dd6418d171795";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/sv-SE/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/sv-SE/firefox-60.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "afd4b06ad27716c389e612e7dcf37b2551dc66bf7bc6c63c7cb06886c082e9e4f4745591a4915ec924aa8bd0820994f3dd2eb88cedc7e053b29066d6b502e08a";
+      sha512 = "8ec8b7299eb0e147f5a53b59cb4c3ce3098d94c81e73e3aa4ab60047dd7aa7de2d430598fcf319d8e85b7247d1631172f4bd52a7817d61f7a1cb6e6667993bca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ta/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ta/firefox-60.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "8cf82519981879d5f3fa77e51a39532a60759be78713acae27207928eb88a7494f14dc4ca1bb0c8acd2e5e4c667bb6a1f6738d1ab13b32c45daa707c90095abd";
+      sha512 = "0f25570fbc9647ec04f7ec6a9447d0e70757c42355293e8ec5130e2a84f92db7178ac319dd8a871e03c3e0780cee8d33df1b1e99ddce515d20cc1833cec02183";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/te/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/te/firefox-60.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "953ffc804424233cc81886f2913a4a9a1f49a16e1e5748c2a7696a7e8305e0e0c6fd99b5b1b235ed864cb36ff1ae59a8e30242c226c17609e8e7b5572eed871c";
+      sha512 = "2c7e18368e33296b70a2be416b47b8cf96dfccdfc24286b7a7bf9ea13607b10f05a615a7509d40853613161bb17949a3051b98bc1e92a85d5117250a9c448f53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/th/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/th/firefox-60.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f9287905756218ed481cc9154da2b48cfeeef00ffcac349b3f33e83348ddc4d3f43a9bbcb44a178fa63a3a39d9570159ac39244b9e5749999904a6053562ec20";
+      sha512 = "27b1f9768659c884eb612cae804466d7b3d589f5dc21b1edf11fb30354755854cffa337e05cc27edf22c9e393462c7a0a7d47f7fcc2d25a166112aab9b6817da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/tr/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/tr/firefox-60.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8092158575953a8294cc1072c586615c9355da4601c6ee40db589e23656d61abf6c71e36fdacbc412c24a7b1af1fcfded5d7cc257d633e90b1ca9d6bc077b007";
+      sha512 = "19afb81413abb2f9cb1d3d6680a5e541ca9104574e019560933c43769839e7c72062e8ad3a60717ff9d198de239cfa8a5a5aea05bb09ae3f3de027798f00cfca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uk/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/uk/firefox-60.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "8d7c63622d81912d37229373635eabc8c9005b5287be1b49a1c2e6dbcbc104ede51f5c56e98058c403f5b745292816eecee582d8efa80dcbcc968a578f606ac2";
+      sha512 = "50139c75f33b56cdaa21c42356e2021a06ad584238635044ead82b614d5f41d5d07c3733d506b35039b6ad06d1f4075d64d34ebe454a8d16a041fdc69d1857cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/ur/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/ur/firefox-60.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "648b7c95ed6ae65e7d5bbf2f18228a8f22725f517599e97c71701d8c2ea0cb2e4bad23ece3730553b45a95b0c9ab3f92674717420a43cc8bb571ec5f960554a1";
+      sha512 = "0a22c2ee0a64603d70bfcb4b88d3784ca24a832548702861874c46e84ea343af02b0d38920fb08b9c4e97ad7b7316d302804044bf11919ed0466b310798d4bb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/uz/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/uz/firefox-60.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "dfbb2039de2ca8b3338418f29368a98020bb3d810eb1a31ef10ef5e82ce097afe5dd167859a9b3c097ff2f99b8127ce5adb0b354389fade5a0635953897bed15";
+      sha512 = "00fd8f528becb07d26e1af065797704f2611967e95e01dccaa62862eb21f86f448a0768157257de529c7323541ea3373cd3169e3907a2c7afd8da0fc26b1dd87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/vi/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/vi/firefox-60.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "3d5e0adf9c89aca8e7eee5771aabb095ef1cbdab84a73f7d44c2b4419746095d25d239d728ffd143c5a57683578892627d20943fdad3aa2bf2459082a6c38c0e";
+      sha512 = "3f17f4df5c9237b2d3bb649063b88eea597c5aadf04f376cb903f4da0a0afa9b0a60c46387222091dee3be53993fd7b2ff0153946d4baae1e65288f7564e0fe0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/xh/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/xh/firefox-60.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "38220ba22a453adab180f968d9f5227034d39e4cc56ada7d38a333d4d19dfd2b16af52937449c7a013c6b42c9238068aaa16ddc2899b53edad980d7467f7edaa";
+      sha512 = "828535de7fd12a8066354049383d6ab6cedc2bd442a6b4d4b878e04de6b182dda28d79765f523bdb691914c807f805cad5796273f470f8a55a461adac8776cee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-CN/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/zh-CN/firefox-60.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "eb793c434240a3b17975ea860b9aca6a695e4c51eb19c15c16fb320475f8a2e91631d1f8e74c8caac9ad5d34d4f2e522fd97608591f5d33f00401c68b0cb6e05";
+      sha512 = "5f810768fd9a138634763119eb1000f4a68e9cf0202afd3ef0511efc23864f34f3c168a81cd8b22333f16c7a613cd0c0125c49c14320a4755c9bf156f26a593c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b6/linux-i686/zh-TW/firefox-60.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b7/linux-i686/zh-TW/firefox-60.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "e2c16a1faeb1caf05f5d826a6d3e5a0fa5a18884518d70db25a3a92dde9776541e1ce4e2931885b4cbe3d168957e867d446aca1d88c50526ff35349f5545d48f";
+      sha512 = "ccfd807a6033d00e2c9781b40d14ebb075c66f333338e4f167992923ffe564d2939a459515a36435e1c882c1dfe9c523ed225b1672756bd83d5b4db183a7c985";
     }
     ];
 }

From 67adb994bcbd3d0b160bb3589fb1e436beda0a0c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 27 Mar 2018 17:16:18 +0300
Subject: [PATCH 125/170] linuxPackages.nvidia_x11_legacy173: drop mentions

Thanks to pbogdan for noticing this. I'd like to have a "no direct commit"
policy implemented for my own good ^_^".

Tested with ofborg's outpaths.nix
---
 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 831fc8344cb..1e2175f875d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13470,7 +13470,6 @@ with pkgs;
 
     nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };
 
-    nvidia_x11_legacy173 = nvidiaPackages.legacy_173;
     nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
     nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
     nvidia_x11_beta      = nvidiaPackages.beta;

From aacd7d6d58fd2cc6108e914a87c6aa419c5361dd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Mar 2018 17:00:59 +0200
Subject: [PATCH 126/170] androidStudioPackages.{dev,canary}: 3.2.0.6 ->
 3.2.0.7

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 4583066842a..fa929d714b7 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   latestVersion = {
-    version = "3.2.0.6"; # "Android Studio 3.2 Canary 7"
-    build = "173.4658582";
-    sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38";
+    version = "3.2.0.7"; # "Android Studio 3.2 Canary 8"
+    build = "173.4670218";
+    sha256Hash = "0p1lls1pkhji8x0p32clsiq3ng64jhqv2vxkhdkmsbh5p4dc1g21";
   };
 in rec {
   # Old alias

From c515f7036ecd42456c01411bfd79bfc99c6cfbc4 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Tue, 27 Mar 2018 16:35:54 +0100
Subject: [PATCH 127/170] Address @yegortimoshenko review

---
 nixos/modules/services/backup/tarsnap.nix | 48 ++++++++++-------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 88c847ed92c..4fc7c24813a 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -304,7 +304,7 @@ in
         requires    = [ "network-online.target" ];
         after       = [ "network-online.target" ];
 
-        path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
+        path = with pkgs; [ iputils tarsnap utillinux ];
 
         # In order for the persistent tarsnap timer to work reliably, we have to
         # make sure that the tarsnap server is reachable after systemd starts up
@@ -314,9 +314,9 @@ in
           while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
         '';
 
-        script =
-          let run = ''tarsnap --configfile "/etc/tarsnap/${name}.conf" \
-                        -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
+        script = let
+          tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
+          run = ''${tarsnap} -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \
                         ${optionalString cfg.verbose "-v"} \
                         ${optionalString cfg.explicitSymlinks "-H"} \
                         ${optionalString cfg.followSymlinks "-L"} \
@@ -329,7 +329,7 @@ in
               if [ ! -e ${cfg.cachedir}/firstrun ]; then
                 ( flock 10
                   flock -u 9
-                  tarsnap --configfile "/etc/tarsnap/${name}.conf" --fsck
+                  ${tarsnap} --fsck
                   flock 9
                 ) 10>${cfg.cachedir}/firstrun
               fi
@@ -351,35 +351,29 @@ in
         description = "Tarsnap restore '${name}'";
         requires    = [ "network-online.target" ];
 
-        path = [ pkgs.iputils pkgs.tarsnap pkgs.utillinux ];
+        path = with pkgs; [ iputils tarsnap utillinux ];
 
-        ##
-        preStart = ''
-          while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done
-        '';
-
-        script =
-        let
+        script = let
           tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"'';
           lastArchive = ''$(${tarsnap} --list-archives | sort | tail -1)'';
           run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}'';
 
-          in if (cfg.cachedir != null) then ''
-            mkdir -p ${cfg.cachedir}
-            chmod 0700 ${cfg.cachedir}
+        in if (cfg.cachedir != null) then ''
+          mkdir -p ${cfg.cachedir}
+          chmod 0700 ${cfg.cachedir}
 
-            ( flock 9
-              if [ ! -e ${cfg.cachedir}/firstrun ]; then
-                ( flock 10
-                  flock -u 9
-                  ${tarsnap} --fsck
-                  flock 9
-                ) 10>${cfg.cachedir}/firstrun
-              fi
-            ) 9>${cfg.cachedir}/lockf
+          ( flock 9
+            if [ ! -e ${cfg.cachedir}/firstrun ]; then
+              ( flock 10
+                flock -u 9
+                ${tarsnap} --fsck
+                flock 9
+              ) 10>${cfg.cachedir}/firstrun
+            fi
+          ) 9>${cfg.cachedir}/lockf
 
-             exec flock ${cfg.cachedir}/firstrun ${run}
-          '' else "exec ${run}";
+           exec flock ${cfg.cachedir}/firstrun ${run}
+        '' else "exec ${run}";
 
         serviceConfig = {
           Type = "oneshot";

From bc7df1734f88dfe7e55f56f52d593ff129ec2282 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Mar 2018 11:03:03 -0500
Subject: [PATCH 128/170] gitattributes: disable merge=union in all-packages

This would lead to some merge issues occasionally.
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 14bee08e381..4862e0eab93 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,4 +13,4 @@ nixos/doc/** linguist-documentation
 nixos/doc/default.nix linguist-documentation=false
 
 nixos/modules/module-list.nix merge=union
-pkgs/top-level/all-packages.nix merge=union
+# pkgs/top-level/all-packages.nix merge=union

From f5a48fe3c9cf2bca2b59e19a41c4ea5ad6469949 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 27 Mar 2018 18:07:13 +0200
Subject: [PATCH 129/170] electrum: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 47dfa30436f..425203be01c 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "1hc0ylkq89459wy3av42hp73p34pmh7grsa3qm8fb1k0qg17zy78";
+    sha256 = "0ds3p7cjbavsbizm04rhzl8s59czynynpx1jvg367mwbi6gng59i";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 707a1ce0da3a5226410ad4e39f1ad433c1cb024c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 27 Mar 2018 18:07:27 +0200
Subject: [PATCH 130/170] tor-browser-bundle-bin: 7.5.2 -> 7.5.3

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

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 8f935f93379..8a8abb42f55 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.2";
+  version = "7.5.3";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0fzfn1azkz6n82mz4vy5nnvx0xsd16cxa69wnvq33gcdw1jvjb2l";
+      sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "04yhny7nnrq3ahrax0ql002r7i3fsji8j3j9x2b6sr3g6lq91753";
+      sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr";
     };
   };
 in

From f3c8036a709e30b615c2b6de33b621798110011e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Mar 2018 10:43:16 +0000
Subject: [PATCH 131/170] coqPackages.bignums: make it available for Coq 8.8

---
 pkgs/development/coq-modules/bignums/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index 45786c5a955..474ce05c1d4 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, coq }:
 
-let param =
+let params =
   {
     "8.6" = {
       rev = "v8.6.0";
@@ -14,7 +14,8 @@ let param =
       rev = "V8.8+beta1";
       sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
     };
-  }."${coq.coq-version}"
+  };
+  param = params."${coq.coq-version}"
 ; in
 
 stdenv.mkDerivation rec {
@@ -37,6 +38,6 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+    compatibleCoqVersions = v: builtins.hasAttr v params;
   };
 }

From c91c50367e8bb267e6c0659f0ddd88038f76c93e Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 28 Mar 2018 00:22:40 +0800
Subject: [PATCH 132/170] plasma: 5.12.3 -> 5.12.4

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 352 ++++++++++++++++----------------
 2 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 20fdddfe46c..117401b0eab 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 14b5f3a39ad..df031ba0627 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/bluedevil-5.12.3.tar.xz";
-      sha256 = "1vzdj2byxrsnxg1hkw8fhjnmxazypb8x6nplfi2wpjbm0inpv0gk";
-      name = "bluedevil-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz";
+      sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x";
+      name = "bluedevil-5.12.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-5.12.3.tar.xz";
-      sha256 = "0mknaxcgr51wbv43hhlplxmvi8k7xk73ns3ld86djj3mpa9cxfhw";
-      name = "breeze-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz";
+      sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7";
+      name = "breeze-5.12.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-grub-5.12.3.tar.xz";
-      sha256 = "1fh26sywr9cawywndw16zhdhs6pz9bfx0i9j0x1v7nbbnz0qam2b";
-      name = "breeze-grub-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz";
+      sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs";
+      name = "breeze-grub-5.12.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-gtk-5.12.3.tar.xz";
-      sha256 = "0nw1d62fd74m9dsvnvy25bcd1y08fv3c51jnp06b3p1yljx8gw8x";
-      name = "breeze-gtk-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz";
+      sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c";
+      name = "breeze-gtk-5.12.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/breeze-plymouth-5.12.3.tar.xz";
-      sha256 = "15px5iw237lb27ms70w8vcm1kqf5k5wmyqkxqdd70x8aqrqzf9zn";
-      name = "breeze-plymouth-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz";
+      sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr";
+      name = "breeze-plymouth-5.12.4.tar.xz";
     };
   };
   discover = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/discover-5.12.3.tar.xz";
-      sha256 = "132hbrnpr416yyzl8yh1d66j6j8h7paxw1lx2dm6fpyd0nf8zkdd";
-      name = "discover-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz";
+      sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq";
+      name = "discover-5.12.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/drkonqi-5.12.3.tar.xz";
-      sha256 = "0vc5q9g9chwsbbg98mg0mnxcfva7dm9qgcpwxv5v0qdlddzm6m7m";
-      name = "drkonqi-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz";
+      sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6";
+      name = "drkonqi-5.12.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kactivitymanagerd-5.12.3.tar.xz";
-      sha256 = "0fmr8n4s4qbfvrg0nmxl0rdl07rsy4l76idramn85rfbplv4nqr1";
-      name = "kactivitymanagerd-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz";
+      sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg";
+      name = "kactivitymanagerd-5.12.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kde-cli-tools-5.12.3.tar.xz";
-      sha256 = "0d2mkrpy2pib0za75m2mg6pvkklbwizh14cqi3zabqi384fys1j3";
-      name = "kde-cli-tools-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz";
+      sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb";
+      name = "kde-cli-tools-5.12.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kdecoration-5.12.3.tar.xz";
-      sha256 = "1xsjq8aw8r4yl5wpr0alihfaf6r146x4rz7p8k635n771b25ilsy";
-      name = "kdecoration-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz";
+      sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj";
+      name = "kdecoration-5.12.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kde-gtk-config-5.12.3.tar.xz";
-      sha256 = "0wsxz5v585srkn8qbb4b82ci1wgrpzg87krixzsxzd3k0wc0c71q";
-      name = "kde-gtk-config-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz";
+      sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6";
+      name = "kde-gtk-config-5.12.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kdeplasma-addons-5.12.3.tar.xz";
-      sha256 = "06g61flgszaks5p9xrlnyjkdyfddyxrgv0vyf85h78wvydxca18p";
-      name = "kdeplasma-addons-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz";
+      sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5";
+      name = "kdeplasma-addons-5.12.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kgamma5-5.12.3.tar.xz";
-      sha256 = "0nvv4fg2hjxxmkjr1yrwsywgcm2y8w7xng928kisgaarf55dfmvm";
-      name = "kgamma5-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz";
+      sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h";
+      name = "kgamma5-5.12.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/khotkeys-5.12.3.tar.xz";
-      sha256 = "1sx3g6pk23lwpc7x2a90vakb4vlmr3lzmhy86iq07r0kbp6fz3wa";
-      name = "khotkeys-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz";
+      sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f";
+      name = "khotkeys-5.12.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kinfocenter-5.12.3.tar.xz";
-      sha256 = "0l9mfxylcf9rmq3yih7gp43vxy8j9rfgniml831prax5kcqgk3yr";
-      name = "kinfocenter-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz";
+      sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3";
+      name = "kinfocenter-5.12.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kmenuedit-5.12.3.tar.xz";
-      sha256 = "1x60z8g1lphsjmsrf6j3br0nx5ip6rk8f8g4r1xmbczgpnyzsqr4";
-      name = "kmenuedit-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz";
+      sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099";
+      name = "kmenuedit-5.12.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kscreen-5.12.3.tar.xz";
-      sha256 = "1azgvl7zx98a4jlqdb3w2h3951kg05l5lgz2bqfss5npm2kddis9";
-      name = "kscreen-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz";
+      sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315";
+      name = "kscreen-5.12.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kscreenlocker-5.12.3.tar.xz";
-      sha256 = "1incnja96342wdyqyayn4kyk5fhmyvg7r13pszcc9a5gx937n2dm";
-      name = "kscreenlocker-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz";
+      sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m";
+      name = "kscreenlocker-5.12.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/ksshaskpass-5.12.3.tar.xz";
-      sha256 = "11wgb311pi1mxhy1xiylg5y3blyl234gcyfdn0xivmrgjn1kzg7h";
-      name = "ksshaskpass-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz";
+      sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5";
+      name = "ksshaskpass-5.12.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/ksysguard-5.12.3.tar.xz";
-      sha256 = "0w7yz7qwfz3hy0vg95rv09c4yzw7g90hm9a0jzz3prdm1sicsvbc";
-      name = "ksysguard-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz";
+      sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk";
+      name = "ksysguard-5.12.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwallet-pam-5.12.3.tar.xz";
-      sha256 = "106dyl7w1b29351kzmgh5fjvy06yf6ab26x5p0aj7di2ymai9cqz";
-      name = "kwallet-pam-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz";
+      sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q";
+      name = "kwallet-pam-5.12.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwayland-integration-5.12.3.tar.xz";
-      sha256 = "0cx1dnds4wr5fm2kbc7mlkpq82pzhq59jgij273lr6y656drxxdi";
-      name = "kwayland-integration-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz";
+      sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla";
+      name = "kwayland-integration-5.12.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwin-5.12.3.tar.xz";
-      sha256 = "0xsqiqnvk1gxrgik2cpqmzyl3q3ncr58r5p0xbyzqsybqz1jys71";
-      name = "kwin-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz";
+      sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8";
+      name = "kwin-5.12.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/kwrited-5.12.3.tar.xz";
-      sha256 = "1yhx94wdf19k2qaym7d89xj03rs6br2mk6z64nkw70d8i01vlax1";
-      name = "kwrited-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz";
+      sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy";
+      name = "kwrited-5.12.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/libkscreen-5.12.3.tar.xz";
-      sha256 = "09pg4fnzyklhgkgqrwqpc0kb4siiyz67mq2lyk5h50gmys4l48b4";
-      name = "libkscreen-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz";
+      sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr";
+      name = "libkscreen-5.12.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/libksysguard-5.12.3.tar.xz";
-      sha256 = "06lg3sd8h3wya9ss3cii9fsn4r4al2vqa0m0zb68s2l5340mcy7l";
-      name = "libksysguard-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz";
+      sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd";
+      name = "libksysguard-5.12.4.tar.xz";
     };
   };
   milou = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/milou-5.12.3.tar.xz";
-      sha256 = "0ywa8yvblc07mzmrzhrmsgdygzxdq6c3nnd7ayw68iil8886r7wq";
-      name = "milou-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz";
+      sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7";
+      name = "milou-5.12.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/oxygen-5.12.3.tar.xz";
-      sha256 = "1fcp3swa7b8qk2zzvs9nxjp0100hgpxc4av39rvvw0d2m647k856";
-      name = "oxygen-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz";
+      sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa";
+      name = "oxygen-5.12.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-desktop-5.12.3.tar.xz";
-      sha256 = "1mz20r7cc7mn1ay7dkz6sikhadnk2dsxf5y6ijlpan7mp3ljlsq8";
-      name = "plasma-desktop-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz";
+      sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy";
+      name = "plasma-desktop-5.12.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-integration-5.12.3.tar.xz";
-      sha256 = "0q9kgfsa530qkjari4zw6bxrk7127v6gpirs76phw9lphpqbvgww";
-      name = "plasma-integration-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz";
+      sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb";
+      name = "plasma-integration-5.12.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-nm-5.12.3.tar.xz";
-      sha256 = "143xma5i5qpfzg727pixvjgwcczj6zi0jwyibd05qmpbcyy09c9w";
-      name = "plasma-nm-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz";
+      sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj";
+      name = "plasma-nm-5.12.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-pa-5.12.3.tar.xz";
-      sha256 = "0jlx07isw63nw2dfvn4sbv8j0az8bw62j7wp2mhxnwn5g6afci2l";
-      name = "plasma-pa-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz";
+      sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56";
+      name = "plasma-pa-5.12.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-sdk-5.12.3.tar.xz";
-      sha256 = "0hla9vi4yp79fmv06w89974fxzsfxnxfad4iyhpqpsrp3g004qli";
-      name = "plasma-sdk-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz";
+      sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2";
+      name = "plasma-sdk-5.12.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-tests-5.12.3.tar.xz";
-      sha256 = "1025prmvwlx5id14243m14hmz626nbpzn98q25i1nagmj2whw4w7";
-      name = "plasma-tests-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz";
+      sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9";
+      name = "plasma-tests-5.12.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-vault-5.12.3.tar.xz";
-      sha256 = "0a9cqfvxjzcgka786s9arz3zahl2qpj6qkh5vdxpf6akvcffw70h";
-      name = "plasma-vault-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz";
+      sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n";
+      name = "plasma-vault-5.12.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-5.12.3.tar.xz";
-      sha256 = "0br36qyd7w7cgd6fzw1iai06mfzyvsf94qyip008h68j92wznfcy";
-      name = "plasma-workspace-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz";
+      sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7";
+      name = "plasma-workspace-5.12.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plasma-workspace-wallpapers-5.12.3.tar.xz";
-      sha256 = "0gmpf0d7dzpnmm9lzgjqmr201mjkvjwbf0qlg5n87w7j9j4c580v";
-      name = "plasma-workspace-wallpapers-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz";
+      sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j";
+      name = "plasma-workspace-wallpapers-5.12.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/plymouth-kcm-5.12.3.tar.xz";
-      sha256 = "1zqmlmzrxmvm49mj33wj51q83j15rq8a6v3xmv7fr55gsfh9hmpk";
-      name = "plymouth-kcm-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz";
+      sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn";
+      name = "plymouth-kcm-5.12.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.3";
+    version = "1-5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/polkit-kde-agent-1-5.12.3.tar.xz";
-      sha256 = "0kb2ijjfqncrw02lrkh6jw2g2rps7aqs7v20gjdam9sacmnwy5j0";
-      name = "polkit-kde-agent-1-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz";
+      sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q";
+      name = "polkit-kde-agent-1-5.12.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/powerdevil-5.12.3.tar.xz";
-      sha256 = "1xj6d4b3iam0xpv27506k11qyh9bwafq4vlwah6bla944cvza484";
-      name = "powerdevil-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz";
+      sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx";
+      name = "powerdevil-5.12.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/sddm-kcm-5.12.3.tar.xz";
-      sha256 = "1fd3ski6pnz6lba2zwvwqnxrszsn5505gnxbs15wc7zk6avf2hp2";
-      name = "sddm-kcm-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz";
+      sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7";
+      name = "sddm-kcm-5.12.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/systemsettings-5.12.3.tar.xz";
-      sha256 = "05l3yl27577567apmbiw884qkbrlgjzwz93s26va76apqn71vali";
-      name = "systemsettings-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz";
+      sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a";
+      name = "systemsettings-5.12.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/user-manager-5.12.3.tar.xz";
-      sha256 = "11glncc24qna9v6mjz7rgv18nrx90bhmfamlf07n3fziz9fmxvkh";
-      name = "user-manager-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz";
+      sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm";
+      name = "user-manager-5.12.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.3";
+    version = "5.12.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.3/xdg-desktop-portal-kde-5.12.3.tar.xz";
-      sha256 = "0swy8kcczvs2ariyjrkln6mvc0xqrjznpkhw5gzyh61v3hpddgk9";
-      name = "xdg-desktop-portal-kde-5.12.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz";
+      sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c";
+      name = "xdg-desktop-portal-kde-5.12.4.tar.xz";
     };
   };
 }

From fb1f35424e7dc10d83830ec7a1177f413e7e622c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 27 Mar 2018 18:26:03 +0200
Subject: [PATCH 133/170] pythonPackages.scapy: 2.3.3 -> 2.4.0

---
 .../python-modules/scapy/default.nix          | 22 ++++++++++++-------
 .../python-modules/scapy/fix-version-1.patch  |  4 ++--
 .../python-modules/scapy/fix-version-2.patch  | 20 ++++++++++-------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 1f4a34d18a3..d7b2a827f7d 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -1,30 +1,36 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, isPyPy
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k, pythonOlder
 , matplotlib, pycrypto, ecdsa
-# Python3: pyx
+, enum34, mock
 }:
 
 buildPythonPackage rec {
   pname = "scapy";
-  version = "2.3.3";
+  version = "2.4.0";
   name = pname + "-" + version;
 
-  disabled = isPy3k || isPyPy;
+  disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "secdev";
     repo = "scapy";
     rev = "v${version}";
-    sha256 = "1c22407vhksnhc0rwrslnp9zy05qmk2zmdm2imm3iw7g6kx7gak1";
+    sha256 = "0dw6kl1qi9bf3rbm79gb1h40ms8y0b5dbmpip841p2905d5r2isj";
   };
 
-  # Temporary workaround, only needed for 2.3.3
+  # TODO: Temporary workaround
   patches = [ ./fix-version-1.patch ./fix-version-2.patch ];
 
-  propagatedBuildInputs = [ matplotlib pycrypto ecdsa ];
+  propagatedBuildInputs =
+    [ matplotlib pycrypto ecdsa ]
+    ++ lib.optional (isPy3k && pythonOlder "3.4") [ enum34 ]
+    ++ lib.optional doCheck [ mock ];
+
+  # Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate)
+  doCheck = if isPy3k then false else true;
 
   meta = with stdenv.lib; {
     description = "Powerful interactive network packet manipulation program";
-    homepage = http://www.secdev.org/projects/scapy/;
+    homepage = https://scapy.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos bjornfor ];
diff --git a/pkgs/development/python-modules/scapy/fix-version-1.patch b/pkgs/development/python-modules/scapy/fix-version-1.patch
index 3864a41964e..33d099e7a64 100644
--- a/pkgs/development/python-modules/scapy/fix-version-1.patch
+++ b/pkgs/development/python-modules/scapy/fix-version-1.patch
@@ -1,11 +1,11 @@
 --- a/setup.py	2018-02-15 22:14:08.531591678 +0100
-+++ b/setup.py	2018-02-15 22:14:57.947703737 +0100
++++ b/setup.py	2018-03-27 17:15:38.617315539 +0200
 @@ -47,7 +47,7 @@
  
  setup(
      name='scapy',
 -    version=__import__('scapy').VERSION,
-+    version='2.3.3',
++    version='2.4.0',
      packages=[
          'scapy',
          'scapy/arch',
diff --git a/pkgs/development/python-modules/scapy/fix-version-2.patch b/pkgs/development/python-modules/scapy/fix-version-2.patch
index 62d43b51fbb..41a195fb722 100644
--- a/pkgs/development/python-modules/scapy/fix-version-2.patch
+++ b/pkgs/development/python-modules/scapy/fix-version-2.patch
@@ -1,11 +1,15 @@
---- a/scapy/__init__.py	2017-12-29 18:57:35.315472160 +0100
-+++ b/scapy/__init__.py	2018-02-15 22:36:43.102132489 +0100
-@@ -73,7 +73,7 @@
-                 tag = f.read()
-             return tag
-         except:
--            return 'unknown.version'
-+            return '2.3.3'
+--- a/scapy/__init__.py	2018-03-27 17:38:52.706481269 +0200
++++ b/scapy/__init__.py	2018-03-27 17:39:56.576688890 +0200
+@@ -82,9 +82,10 @@
+             if match:
+                 return "git-archive.dev" + match.group(1)
+             elif sha1:
+-                return "git-archive.dev" + sha1
++                return '2.4.0'
+             else:
+-                return 'unknown.version'
++                return '2.4.0'
++
  
  VERSION = _version()
  

From 9df1ad5a2d8eb9a26e394530d3dbd16360de5633 Mon Sep 17 00:00:00 2001
From: Wilga <wilga@cat3.de>
Date: Tue, 27 Mar 2018 19:14:31 +0200
Subject: [PATCH 134/170] libsepol,libselinux: fix i686 build

---
 pkgs/os-specific/linux/libselinux/default.nix | 2 ++
 pkgs/os-specific/linux/libsepol/default.nix   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 4ddc3010221..8dc906b2993 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
   # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
   hardeningDisable = [ "fortify" ];
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
   postPatch = optionalString enablePython ''
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
   '';
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 59962e911d4..40872f7c1ac 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
 
   passthru = { inherit se_release se_url; };
 

From 95a819c0026a7a3c0dd2099e1c53fea95430c505 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 27 Mar 2018 19:18:49 +0200
Subject: [PATCH 135/170] libreoffice: wrap to set JAVA_HOME, SAL_USE_VCLPLUGIN
 and DBus session if not set

---
 .../office/libreoffice/default.nix            |  2 +-
 .../applications/office/libreoffice/still.nix |  2 +-
 .../office/libreoffice/wrapper.nix            | 16 ++++
 .../office/libreoffice/wrapper.sh             | 27 ++++++
 pkgs/top-level/all-packages.nix               | 89 ++++++++++---------
 5 files changed, 90 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/applications/office/libreoffice/wrapper.nix
 create mode 100644 pkgs/applications/office/libreoffice/wrapper.sh

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 7da7a6bf734..89af45814bf 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -269,7 +269,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapGAppsHook ];
 
   passthru = {
-    inherit srcs;
+    inherit srcs jdk;
   };
 
   requiredSystemFeatures = [ "big-parallel" ];
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 866b8e92337..d1e80724aaf 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -261,7 +261,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapGAppsHook ];
 
   passthru = {
-    inherit srcs;
+    inherit srcs jdk;
   };
 
   requiredSystemFeatures = [ "big-parallel" ];
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
new file mode 100644
index 00000000000..8566bd76e1e
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -0,0 +1,16 @@
+{ libreoffice, runCommand, dbus, bash }:
+let
+  jdk = libreoffice.jdk;
+in
+(runCommand "${libreoffice.name}" {
+  inherit dbus libreoffice jdk bash;
+} ''
+  mkdir -p "$out/bin"
+  ln -s "${libreoffice}/share" "$out/share"
+  substituteAll "${./wrapper.sh}" "$out/bin/soffice"
+  chmod a+x "$out/bin/soffice"
+
+  for i in $(ls "${libreoffice}/bin/"); do
+    test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
+  done
+'') // { inherit libreoffice dbus; }
diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh
new file mode 100644
index 00000000000..591b4251506
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/wrapper.sh
@@ -0,0 +1,27 @@
+#!@bash@/bin/bash
+export JAVA_HOME="${JAVA_HOME:-@jdk@}"
+export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
+
+if uname | grep Linux > /dev/null && 
+       ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" && 
+         test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then
+    dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
+    mkdir "$dbus_tmp_dir"
+    dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
+    cat "@dbus@/share/dbus-1/system.conf" |
+        grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf"
+    if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+        "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session"  >&2 &
+        export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
+    fi
+    if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then
+        "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 &
+        export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system"
+    fi
+fi
+
+"@libreoffice@/bin/$(basename "$0")" "$@"
+code="$?"
+
+test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir"
+exit "$code"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 546e4514a17..0b4215a31ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16458,51 +16458,52 @@ with pkgs;
 
   libreoffice = hiPrio libreoffice-still;
 
-  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome2) GConf ORBit2 gnome_vfs;
-    inherit (gnome3) defaultIconTheme;
-    zip = zip.override { enableNLS = false; };
-    bluez5 = bluez5_28;
-    fontsConf = makeFontsConf {
-      fontDirectories = [
-        carlito dejavu_fonts
-        freefont_ttf xorg.fontmiscmisc
-        liberation_ttf_v1_binary
-        liberation_ttf_v2_binary
-      ];
-    };
-    clucene_core = clucene_core_2;
-    lcms = lcms2;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-    # checking whether g++ supports C++14 or C++11... configure: error: no
-    stdenv = overrideCC stdenv gcc5;
-  });
-
-  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome2) GConf ORBit2 gnome_vfs;
-    inherit (gnome3) defaultIconTheme;
-    zip = zip.override { enableNLS = false; };
-    bluez5 = bluez5_28;
-    poppler = poppler_0_61;
-    fontsConf = makeFontsConf {
-      fontDirectories = [
-        freefont_ttf xorg.fontmiscmisc
-      ];
-    };
-    clucene_core = clucene_core_2;
-    lcms = lcms2;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-    icu = icu58;
-    # checking whether g++ supports C++14 or C++11... configure: error: no
-    stdenv = overrideCC stdenv gcc5;
-  });
+  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
+    { libreoffice = callPackage ../applications/office/libreoffice {
+      inherit (perlPackages) ArchiveZip CompressZlib;
+      inherit (gnome2) GConf ORBit2 gnome_vfs;
+      inherit (gnome3) defaultIconTheme;
+      zip = zip.override { enableNLS = false; };
+      bluez5 = bluez5_28;
+      fontsConf = makeFontsConf {
+        fontDirectories = [
+          carlito dejavu_fonts
+          freefont_ttf xorg.fontmiscmisc
+          liberation_ttf_v1_binary
+          liberation_ttf_v2_binary
+        ];
+      };
+      clucene_core = clucene_core_2;
+      lcms = lcms2;
+      harfbuzz = harfbuzz.override {
+        withIcu = true; withGraphite2 = true;
+      };
+      # checking whether g++ supports C++14 or C++11... configure: error: no
+      stdenv = overrideCC stdenv gcc5;
+  };});
 
+  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
+    { libreoffice = callPackage ../applications/office/libreoffice/still.nix {
+      inherit (perlPackages) ArchiveZip CompressZlib;
+      inherit (gnome2) GConf ORBit2 gnome_vfs;
+      inherit (gnome3) defaultIconTheme;
+      zip = zip.override { enableNLS = false; };
+      bluez5 = bluez5_28;
+      poppler = poppler_0_61;
+      fontsConf = makeFontsConf {
+        fontDirectories = [
+          freefont_ttf xorg.fontmiscmisc
+        ];
+      };
+      clucene_core = clucene_core_2;
+      lcms = lcms2;
+      harfbuzz = harfbuzz.override {
+        withIcu = true; withGraphite2 = true;
+      };
+      icu = icu58;
+      # checking whether g++ supports C++14 or C++11... configure: error: no
+      stdenv = overrideCC stdenv gcc5;
+  };});
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
     inherit (gnome3) libpeas gsettings-desktop-schemas dconf;

From b71ffc1b25b46297f1e52fd0c0ac491d296160f2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 23 Mar 2018 23:56:45 +0100
Subject: [PATCH 136/170] qpid-cpp: fix build

The compilation broke due to the flag `-Werror=int-in-bool-context`
which caused several compilation errors with GCC v7. Disabling this
warning manually with `-Wno-error` in `NIX_CFLAGS_COMPILE` should be
fine.

This package experienced several radical changes as the entire python
build in `$src/management/python` was broken since the given Python
interpreter missed several needed modules (including
`pythonPackages.qpid-python`). As the CMake build tried to invoke the
affected `setup.py` manually and patched the shebangs with `disutil` and
caused non-functional executables, I split the package up into two
parts, the actual `qpid-cpp` lib and the Python module that will be
composed using `buildEnv`.

Furthermore I added myself as maintainer for the package as the diff
became quite huge and we should have more folks available to maintain
this.

See https://hydra.nixos.org/build/71519082/log
See tickets #36453 and #31747
---
 pkgs/servers/amqp/qpid-cpp/default.nix | 56 +++++++++++++++++---------
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index ea2c0325148..a838fa3b904 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }:
+{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
 
-stdenv.mkDerivation rec {
+let
   name = "qpid-cpp-${version}";
-
   version = "1.37.0";
 
   src = fetchurl {
@@ -10,24 +9,45 @@ stdenv.mkDerivation rec {
     sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb";
   };
 
-  buildInputs = [ cmake python2 boost libuuid ruby ];
-
-  # the subdir managementgen wants to install python stuff in ${python} and
-  # the installation tries to create some folders in /var
-  patchPhase = ''
-    sed -i '/managementgen/d' CMakeLists.txt
-    sed -i '/ENV/d' src/CMakeLists.txt
-  '';
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=unused-function";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://qpid.apache.org;
     repositories.git = git://git.apache.org/qpid.git;
     repositories.svn = http://svn.apache.org/repos/asf/qpid;
     description = "An AMQP message broker and a C++ messaging API";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.cpages ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cpages ma27 ];
   };
+
+  qpid-cpp = stdenv.mkDerivation {
+    inherit src meta name;
+
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ boost libuuid ruby python2 ];
+
+    # the subdir managementgen wants to install python stuff in ${python} and
+    # the installation tries to create some folders in /var
+    postPatch = ''
+      sed -i '/managementgen/d' CMakeLists.txt
+      sed -i '/ENV/d' src/CMakeLists.txt
+      sed -i '/management/d' CMakeLists.txt
+    '';
+
+    NIX_CFLAGS_COMPILE = [
+      "-Wno-error=deprecated-declarations"
+      "-Wno-error=unused-function"
+      "-Wno-error=int-in-bool-context"
+    ];
+  };
+
+  python-frontend = buildPythonPackage {
+    inherit name meta src;
+
+    sourceRoot = "${name}/management/python";
+
+    propagatedBuildInputs = [ qpid-python ];
+  };
+in buildEnv {
+  name = "${name}-env";
+  paths = [ qpid-cpp python-frontend ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b4215a31ff..be6957c7a57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12716,6 +12716,7 @@ with pkgs;
 
   qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
     boost = boost155;
+    inherit (pythonPackages) buildPythonPackage qpid-python;
   };
 
   quagga = callPackage ../servers/quagga { };

From c787555b94329ded65ef274e6763b616a59c77fc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Mar 2018 13:05:40 -0500
Subject: [PATCH 137/170] firmwareLinuxNonfree: 2018-01-04 -> 2018-03-20

---
 .../linux/firmware/firmware-linux-nonfree/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index acdba5987bb..dc2a5278fdc 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2018-01-04-${src.iwlRev}";
+  version = "2018-03-20-${src.iwlRev}";
 
   # The src runCommand automates the process of building a merged repository of both
   #
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
 
   src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
     shallowSince = "2017-10-01";
-    baseRev = "65b1c68c63f974d72610db38dfae49861117cae2";
-    iwlRev = "iwlwifi-fw-2017-11-15";
+    baseRev = "44476f2465dac9c22bce90da66e86b2b56ba34f0";
+    iwlRev = "iwlwifi-fw-2018-03-02";
 
     # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
     # randomly mutate the hash to break out of fixed hash, when updating
-    outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz";
+    outputHash = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma";
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";

From 82f626702314928c9c8f4ea309430e3aa0680d57 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 26 Mar 2018 14:03:18 +0200
Subject: [PATCH 138/170] treewide: remove placeholder usage

see https://github.com/NixOS/nixpkgs/commit/2abac54c033778104533a269aaa08a1e75f677ad
---
 pkgs/applications/backup/deja-dup/default.nix       |  2 +-
 pkgs/desktops/gnome-3/apps/file-roller/default.nix  |  2 +-
 .../gnome-3/apps/gnome-characters/default.nix       |  2 +-
 .../gnome-3/core/evolution-data-server/default.nix  |  1 -
 .../gnome-3/core/gnome-settings-daemon/default.nix  |  2 +-
 pkgs/desktops/gnome-3/core/libgee/default.nix       |  7 ++-----
 .../core/libgee/fix_introspection_paths.patch       | 13 +++++++++++++
 pkgs/desktops/gnome-3/core/totem/default.nix        |  2 +-
 .../libraries/glib-networking/default.nix           |  2 +-
 pkgs/development/libraries/gvfs/default.nix         |  6 +++---
 pkgs/development/libraries/libwnck/3.x.nix          |  4 ++--
 pkgs/development/libraries/spice-gtk/default.nix    |  2 +-
 pkgs/os-specific/linux/dbus-broker/default.nix      |  4 ++--
 pkgs/tools/misc/colord/default.nix                  | 10 +++++-----
 14 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index 1ea4b4d2750..ef7aa96beb0 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ duplicity ];
 
-  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
 
   postInstall = ''
     glib-compile-schemas $out/share/glib-2.0/schemas
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index a9148fa52db..80f2a825c12 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
 
-  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+  PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0";
 
   postPatch = ''
     chmod +x postinstall.py # patchShebangs requires executable file
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 7ca25848374..1587fec2c69 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
 
   mesonFlags = [
-    "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+    "-Ddbus_service_dir=share/dbus-1/services"
   ];
 
   meta = with stdenv.lib; {
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 350c29fa907..8abb51b56e7 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     "-DENABLE_VALA_BINDINGS=ON"
     "-DENABLE_INTROSPECTION=ON"
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
-    "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
   ];
 
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index 99b66fc1fe7..2a59d39e8cf 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dudev_dir=${placeholder "out"}/lib/udev"
+    "-Dudev_dir=lib/udev"
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index a65d0f401f0..a5ce9ee5e10 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -6,8 +6,6 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  outputs = [ "out" "dev" ];
-
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
@@ -15,12 +13,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  patches = [ ./fix_introspection_paths.patch ];
+
   nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
   buildInputs = [ glib ];
 
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
new file mode 100644
index 00000000000..67003f45164
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
@@ -0,0 +1,13 @@
+--- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
++++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
+@@ -12085,8 +12085,8 @@
+        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
++       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 49bd43e6195..b4c15b5dce2 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ];
+  mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 2e0e8cbb910..51ee5487f5f 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
+  PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules";
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index b0b2d21e2bd..436cf56dc13 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
     ]);
 
   mesonFlags = [
-    "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
-    "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
-    "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+    "-Dgio_module_dir=lib/gio/modules"
+    "-Dsystemduserunitdir=lib/systemd/user"
+    "-Ddbus_service_dir=share/dbus-1/services"
     "-Dtmpfilesdir=no"
   ] ++ stdenv.lib.optionals (!gnomeSupport) [
     "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index f2d05d14d69..937fa28b902 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{
   nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
   propagatedBuildInputs = [ libX11 gtk3 ];
 
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
-  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "lib/girepository-1.0";
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f9b3de36b2c..4fae3696c63 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
 
-  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
+  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions";
 
   configureFlags = [
     "--with-gtk3"
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 5d0728b7e24..67e4df3d6f9 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ dbus glib linuxHeaders systemd ];
 
-  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
-  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
 
   postInstall = ''
     install -Dm644 ../README $out/share/doc/dbus-broker/README
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 043ea44bb8c..9b633014009 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
-  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
-  PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
-  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";
-  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system";
+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
+  PKG_CONFIG_SYSTEMD_TMPFILESDIR = "lib/tmpfiles.d";
+  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "share/bash-completion/completions";
+  PKG_CONFIG_UDEV_UDEVDIR = "lib/udev";
 
   postFixup = ''
     wrapProgram "$out/libexec/colord-session" \

From fc58ab2ff23939ae9fbc99b11ea3a758e95ae003 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Mar 2018 11:29:24 +0200
Subject: [PATCH 139/170] LTS Haskell 11.2

This update was generated by hackage2nix v2.9.2-2-gebc40be from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/0200fecf27c208e0b66af88ea86728fdb295499d.
---
 .../configuration-hackage2nix.yaml            |  180 +-
 .../haskell-modules/hackage-packages.nix      | 2264 +++--------------
 2 files changed, 496 insertions(+), 1948 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2f4587a6593..ae79162e29b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,22 +38,22 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.1
+  # LTS Haskell 11.2
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
   - accelerate ==1.1.1.0
-  - accelerate-arithmetic ==1.0
+  - accelerate-arithmetic ==1.0.0.1
   - accelerate-bignum ==0.1.0.0
   - accelerate-blas ==0.1.0.1
   - accelerate-fft ==1.1.0.0
-  - accelerate-fftw ==1.0
-  - accelerate-fourier ==1.0.0.4
+  - accelerate-fftw ==1.0.0.1
+  - accelerate-fourier ==1.0.0.5
   - accelerate-io ==1.0.0.1
   - accelerate-llvm ==1.1.0.0
   - accelerate-llvm-native ==1.1.0.1
   - accelerate-llvm-ptx ==1.1.0.1
-  - accelerate-utility ==1.0
+  - accelerate-utility ==1.0.0.1
   - accuerr ==0.2.0.2
   - ace ==0.6
   - action-permutations ==0.0.0.1
@@ -235,7 +235,7 @@ default-package-overrides:
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
   - buchhaltung ==0.0.7
-  - buffer-builder ==0.2.4.4
+  - buffer-builder ==0.2.4.5
   - buffer-pipe ==0.0
   - butcher ==1.3.0.0
   - bv ==0.5
@@ -252,7 +252,7 @@ default-package-overrides:
   - bytestring-tree-builder ==0.2.7.1
   - bytestring-trie ==0.2.4.1
   - bzlib ==0.5.0.5
-  - bzlib-conduit ==0.3.0
+  - bzlib-conduit ==0.3.0.1
   - c2hs ==0.28.3
   - Cabal ==2.0.1.1
   - cabal-doctest ==1.0.6
@@ -275,7 +275,7 @@ default-package-overrides:
   - cassava-records ==0.1.0.4
   - cassette ==0.1.0
   - cast ==0.1.0.2
-  - cayley-client ==0.4.4
+  - cayley-client ==0.4.5
   - cereal ==0.5.5.0
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
@@ -303,6 +303,7 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
+  - cisco-spark-api ==0.1.0.2
   - clang-compilation-database ==0.1.0.1
   - classyplate ==0.3.0.2
   - classy-prelude ==1.4.0
@@ -351,7 +352,7 @@ default-package-overrides:
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.0.1
+  - conduit ==1.3.0.2
   - conduit-algorithms ==0.0.8.0
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
@@ -429,12 +430,12 @@ default-package-overrides:
   - czipwith ==1.0.0.0
   - data-accessor ==0.2.2.7
   - data-accessor-mtl ==0.2.0.4
-  - data-accessor-template ==0.2.1.14
+  - data-accessor-template ==0.2.1.15
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
   - data-checked ==0.3
-  - data-clist ==0.1.2.0
+  - data-clist ==0.1.2.1
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
   - data-default-instances-containers ==0.0.1
@@ -442,7 +443,7 @@ default-package-overrides:
   - data-default-instances-old-locale ==0.0.1
   - data-diverse ==2.0.1.0
   - data-diverse-lens ==2.1.0.0
-  - datadog ==0.2.0.0
+  - datadog ==0.2.2.0
   - data-dword ==0.3.1.2
   - data-endian ==0.1.1
   - data-fix ==0.2.0
@@ -467,8 +468,9 @@ default-package-overrides:
   - dbcleaner ==0.1.3
   - dbus ==0.10.15
   - debian-build ==0.10.1.0
-  - debug ==0.1
+  - debug ==0.1.1
   - Decimal ==0.5.1
+  - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
   - dejafu ==1.3.2.0
   - dependent-map ==0.2.4.0
@@ -478,6 +480,7 @@ default-package-overrides:
   - deriving-compat ==0.4.1
   - descriptive ==0.9.4
   - dhall ==1.11.1
+  - dhall-json ==1.0.13
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
@@ -487,7 +490,7 @@ default-package-overrides:
   - dimensional ==1.1
   - directory-tree ==0.12.1
   - direct-rocksdb ==0.0.3
-  - direct-sqlite ==2.3.22
+  - direct-sqlite ==2.3.23
   - discount ==0.1.1
   - discrimination ==0.3
   - disk-free-space ==0.1.0.1
@@ -516,7 +519,7 @@ default-package-overrides:
   - doctemplates ==0.2.2.1
   - doctest ==0.13.0
   - doctest-discover ==0.1.0.7
-  - doctest-driver-gen ==0.2.0.0
+  - doctest-driver-gen ==0.2.0.1
   - do-list ==1.0.1
   - dom-parser ==3.0.0
   - dotenv ==0.5.2.4
@@ -544,7 +547,7 @@ default-package-overrides:
   - editor-open ==0.6.0.0
   - either ==5
   - either-unwrap ==1.1
-  - ekg ==0.4.0.14
+  - ekg ==0.4.0.15
   - ekg-core ==0.1.1.4
   - ekg-json ==0.1.0.6
   - ekg-statsd ==0.2.2.0
@@ -558,7 +561,7 @@ default-package-overrides:
   - email-validate ==2.3.2.5
   - enclosed-exceptions ==1.0.2
   - entropy ==0.3.8
-  - enummapset ==0.5.2.1
+  - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
   - envelope ==0.2.2.0
   - envparse ==0.4
@@ -603,7 +606,7 @@ default-package-overrides:
   - extensible ==0.4.8
   - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.4
+  - extra ==1.6.5
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
   - fail ==4.9.0.0
@@ -643,7 +646,7 @@ default-package-overrides:
   - flexible-defaults ==0.0.1.2
   - FloatingHex ==0.4
   - floatshow ==0.2.4
-  - flow ==1.0.11
+  - flow ==1.0.12
   - fmlist ==0.9.2
   - fmt ==0.5.0.0
   - fn ==0.3.0.2
@@ -659,7 +662,7 @@ default-package-overrides:
   - ForestStructures ==0.0.0.2
   - forma ==0.2.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.3.1
+  - formatting ==6.3.2
   - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
@@ -714,7 +717,7 @@ default-package-overrides:
   - genvalidity-unordered-containers ==0.1.0.0
   - genvalidity-uuid ==0.0.0.0
   - genvalidity-vector ==0.1.0.0
-  - getopt-generics ==0.13.0.1
+  - getopt-generics ==0.13.0.2
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
   - ghc-events ==0.7.2
@@ -725,7 +728,7 @@ default-package-overrides:
   - ghcjs-perch ==0.3.3.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1
+  - ghc-prof ==1.4.1.1
   - ghc-syb-utils ==0.2.3.3
   - ghc-tcplugins-extra ==0.2.4
   - ghc-typelits-extra ==0.2.4
@@ -740,14 +743,14 @@ default-package-overrides:
   - ginger ==0.7.3.0
   - git ==0.2.1
   - github ==0.19
-  - github-release ==1.1.5
+  - github-release ==1.1.6
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
   - github-webhooks ==0.9.1
   - gitrev ==1.3.1
   - gl ==0.8.0
-  - glabrous ==0.3.4
+  - glabrous ==0.3.5
   - glaze ==0.3.0.1
   - glazier ==0.11.0.1
   - glazier-pipes ==0.1.5.1
@@ -761,8 +764,8 @@ default-package-overrides:
   - gloss-raster ==1.11.1.1
   - gloss-raster-accelerate ==2.0.0.0
   - gloss-rendering ==1.11.1.1
-  - GLURaw ==2.0.0.3
-  - GLUT ==2.7.0.12
+  - GLURaw ==2.0.0.4
+  - GLUT ==2.7.0.13
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.5.1
   - goggles ==0.3.2
@@ -793,6 +796,7 @@ default-package-overrides:
   - haddock-library ==1.4.5
   - hailgun ==0.4.1.6
   - hailgun-simple ==0.1.0.0
+  - hakyll ==4.12.0.1
   - half ==0.2.2.3
   - hamilton ==0.1.0.2
   - HandsomeSoup ==0.4.2
@@ -807,7 +811,7 @@ default-package-overrides:
   - hashable-time ==0.2.0.1
   - hashids ==1.0.2.4
   - hashmap ==1.3.3
-  - hashtables ==1.2.2.1
+  - hashtables ==1.2.3.0
   - haskeline ==0.7.4.2
   - haskell-gi ==0.21.0
   - haskell-gi-base ==0.21.0
@@ -837,6 +841,7 @@ default-package-overrides:
   - hasql-pool ==0.4.3
   - hasql-transaction ==0.6
   - hastache ==0.6.1
+  - hasty-hamiltonian ==1.3.2
   - HaTeX ==3.18.0.0
   - haxl ==0.5.1.0
   - HaXml ==1.25.4
@@ -910,7 +915,7 @@ default-package-overrides:
   - HPDF ==1.4.10
   - hpio ==0.9.0.5
   - hpp ==0.5.1
-  - hpqtypes ==1.5.1.1
+  - hpqtypes ==1.5.2.0
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
@@ -958,7 +963,7 @@ default-package-overrides:
   - hsshellscript ==3.4.5
   - hstatistics ==0.3
   - hstatsd ==0.1
-  - HStringTemplate ==0.8.6
+  - HStringTemplate ==0.8.7
   - HSvm ==0.1.0.3.22
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
@@ -987,7 +992,7 @@ default-package-overrides:
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
-  - hunit-dejafu ==1.1.0.2
+  - hunit-dejafu ==1.1.0.3
   - hvect ==0.4.0.0
   - hw-balancedparens ==0.2.0.1
   - hw-bits ==0.7.0.2
@@ -995,8 +1000,8 @@ default-package-overrides:
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
-  - hw-fingertree ==0.1.0.0
-  - hw-fingertree-strict ==0.1.0.1
+  - hw-fingertree ==0.1.0.1
+  - hw-fingertree-strict ==0.1.0.2
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.2
   - hw-int ==0.0.0.3
@@ -1074,8 +1079,8 @@ default-package-overrides:
   - ip ==1.1.2
   - ip6addr ==0.5.3
   - iproute ==1.7.3
-  - IPv6Addr ==1.0.1
-  - IPv6DB ==0.2.5
+  - IPv6Addr ==1.0.2
+  - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
   - irc-client ==1.1.0.2
@@ -1101,7 +1106,7 @@ default-package-overrides:
   - jose-jwt ==0.7.8
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
-  - json ==0.9.1
+  - json ==0.9.2
   - json-autotype ==1.0.18
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.3
@@ -1128,7 +1133,7 @@ default-package-overrides:
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.1
+  - lackey ==1.0.2
   - lambdabot-core ==5.1.0.1
   - lambdabot-irc-plugins ==5.1.0.1
   - lame ==0.1.1
@@ -1143,7 +1148,7 @@ default-package-overrides:
   - language-javascript ==0.6.0.11
   - lapack-carray ==0.0.1
   - lapack-ffi ==0.0.1
-  - lapack-ffi-tools ==0.1
+  - lapack-ffi-tools ==0.1.0.1
   - large-hashable ==0.1.0.4
   - largeword ==1.2.5
   - latex ==0.1.0.3
@@ -1152,7 +1157,7 @@ default-package-overrides:
   - lca ==0.3.1
   - leancheck ==0.7.0
   - leapseconds-announced ==2017.1.0.1
-  - lens ==4.16
+  - lens ==4.16.1
   - lens-accelerate ==0.1.0.0
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
@@ -1189,7 +1194,7 @@ default-package-overrides:
   - List ==0.6.2
   - ListLike ==4.6
   - listsafe ==0.1.0.1
-  - list-t ==1.0.0.1
+  - list-t ==1.0.1
   - llvm-hs ==5.1.3
   - llvm-hs-pure ==5.1.2
   - lmdb ==0.2.5
@@ -1202,10 +1207,10 @@ default-package-overrides:
   - log-elasticsearch ==0.9.1.0
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.2.4
+  - logging-effect ==1.2.5
   - logging-effect-extra ==1.2.2
   - logging-effect-extra-file ==1.1.2
-  - logging-effect-extra-handler ==1.1.3
+  - logging-effect-extra-handler ==1.1.4
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
@@ -1234,7 +1239,7 @@ default-package-overrides:
   - markov-chain ==0.0.3.4
   - markup ==4.0.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.1.2.0
+  - massiv ==0.1.4.0
   - massiv-io ==0.1.1.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1287,7 +1292,7 @@ default-package-overrides:
   - mmark ==0.0.5.6
   - mmark-cli ==0.0.3.0
   - mmark-ext ==0.2.0.0
-  - mmorph ==1.1.1
+  - mmorph ==1.1.2
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
   - model ==0.4.4
@@ -1319,7 +1324,7 @@ default-package-overrides:
   - monad-products ==4.0.1
   - MonadPrompt ==1.0.0.5
   - MonadRandom ==0.5.1
-  - monad-recorder ==0.1.0
+  - monad-recorder ==0.1.1
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
   - monads-tf ==0.1.0.3
@@ -1333,7 +1338,7 @@ default-package-overrides:
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.8.1
   - mono-traversable-instances ==0.1.0.0
-  - morte ==1.6.16
+  - morte ==1.6.18
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.2
@@ -1350,11 +1355,11 @@ default-package-overrides:
   - mwc-probability ==2.0.2
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
-  - mysql ==0.1.4
+  - mysql ==0.1.5
   - mysql-haskell ==0.8.3.0
   - mysql-haskell-nem ==0.1.0.0
   - mysql-haskell-openssl ==0.8.3.0
-  - mysql-simple ==0.4.4
+  - mysql-simple ==0.4.5
   - nagios-check ==0.3.2
   - names-th ==0.2.0.3
   - nano-erl ==0.1.0.1
@@ -1391,7 +1396,7 @@ default-package-overrides:
   - network-transport-tests ==0.2.4.2
   - network-uri ==2.6.1.0
   - newtype ==0.2
-  - newtype-generics ==0.5.2.2
+  - newtype-generics ==0.5.3
   - next-ref ==0.1.0.2
   - nfc ==0.1.0
   - nicify-lib ==1.0.1
@@ -1431,11 +1436,11 @@ default-package-overrides:
   - online ==0.2.1.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.0.0
+  - opaleye ==0.6.1.0
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.1
-  - OpenGL ==3.0.2.0
+  - OpenGL ==3.0.2.1
   - OpenGLRaw ==3.2.7.0
   - openpgp-asciiarmor ==0.1
   - opensource ==0.1.0.0
@@ -1458,7 +1463,7 @@ default-package-overrides:
   - pagination ==0.2.1
   - palette ==0.1.0.5
   - pandoc ==2.1.2
-  - pandoc-citeproc ==0.14.1.5
+  - pandoc-citeproc ==0.14.3
   - pandoc-types ==1.17.3.1
   - pango ==0.13.4.0
   - papillon ==0.1.0.5
@@ -1521,7 +1526,7 @@ default-package-overrides:
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.6
   - pipes-category ==0.3.0.0
-  - pipes-concurrency ==2.0.9
+  - pipes-concurrency ==2.0.10
   - pipes-csv ==1.4.3
   - pipes-extras ==1.0.13
   - pipes-fastx ==0.3.0.0
@@ -1557,7 +1562,7 @@ default-package-overrides:
   - postgresql-simple ==0.5.3.0
   - postgresql-simple-migration ==0.1.11.0
   - postgresql-simple-queue ==1.0.1
-  - postgresql-simple-url ==0.2.0.0
+  - postgresql-simple-url ==0.2.1.0
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.2
   - post-mess-age ==0.2.1.0
@@ -1582,7 +1587,7 @@ default-package-overrides:
   - pretty-show ==1.6.16
   - pretty-simple ==2.1.0.0
   - pretty-types ==0.2.3.1
-  - prim-array ==0.2.1
+  - prim-array ==0.2.2
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
   - prim-uniq ==0.1.0.1
@@ -1607,7 +1612,7 @@ default-package-overrides:
   - proto-lens ==0.2.2.0
   - proto-lens-arbitrary ==0.1.1.1
   - proto-lens-descriptors ==0.2.2.0
-  - proto-lens-optparse ==0.1.0.4
+  - proto-lens-optparse ==0.1.1.0
   - protolude ==0.2.1
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
@@ -1655,8 +1660,8 @@ default-package-overrides:
   - rank-product ==0.2.0.1
   - Rasterific ==0.7.2.3
   - rasterific-svg ==0.3.3.1
-  - ratel ==1.0.2
-  - ratel-wai ==1.0.1
+  - ratel ==1.0.3
+  - ratel-wai ==1.0.2
   - ratio-int ==0.1.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
@@ -1715,7 +1720,7 @@ default-package-overrides:
   - rest-types ==1.14.1.1
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.6.1
+  - retry ==0.7.6.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.4
@@ -1741,10 +1746,10 @@ default-package-overrides:
   - sampling ==0.3.2
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbp ==2.3.9
+  - sbp ==2.3.13
   - sbv ==7.5
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1782,7 +1787,7 @@ default-package-overrides:
   - servant-docs ==0.11.2
   - servant-elm ==0.4.0.1
   - servant-exceptions ==0.1.1
-  - servant-foreign ==0.11
+  - servant-foreign ==0.11.1
   - servant-generic ==0.1.0.1
   - servant-github-webhook ==0.4.0.0
   - servant-js ==0.9.3.2
@@ -1816,7 +1821,7 @@ default-package-overrides:
   - shake-language-c ==0.11.0
   - shakespeare ==2.0.15
   - shelltestrunner ==1.9
-  - shelly ==1.7.1
+  - shelly ==1.7.2
   - shikensu ==0.3.8
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
@@ -1830,7 +1835,7 @@ default-package-overrides:
   - simple-sendfile ==0.2.27
   - simple-session ==0.10.1.1
   - simple-templates ==0.8.0.1
-  - singleton-bool ==0.1.3
+  - singleton-bool ==0.1.4
   - singleton-nats ==0.4.0.4
   - singletons ==2.3.1
   - siphash ==1.0.3
@@ -1845,7 +1850,7 @@ default-package-overrides:
   - smtp-mail ==0.1.4.6
   - snap ==1.1.0.0
   - snap-blaze ==0.2.1.5
-  - snap-core ==1.0.3.1
+  - snap-core ==1.0.3.2
   - snap-server ==1.0.3.3
   - snowflake ==0.1.1.1
   - soap ==0.2.3.6
@@ -1917,7 +1922,7 @@ default-package-overrides:
   - streaming ==0.2.1.0
   - streaming-bytestring ==0.1.5
   - streaming-commons ==0.1.19
-  - streamly ==0.1.0
+  - streamly ==0.1.1
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
@@ -1934,7 +1939,7 @@ default-package-overrides:
   - stringsearch ==0.3.6.6
   - string-transform ==1.0.0
   - stripe-core ==2.3.0
-  - strive ==5.0.3
+  - strive ==5.0.4
   - structs ==0.1.1
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
@@ -1942,8 +1947,8 @@ default-package-overrides:
   - svg-builder ==0.1.0.2
   - svg-tree ==0.6.2.2
   - swagger ==0.3.0
-  - swagger2 ==2.2
-  - swish ==0.9.2.0
+  - swagger2 ==2.2.1
+  - swish ==0.9.2.1
   - syb ==0.7
   - syb-with-class ==0.6.1.8
   - symbol ==0.2.4
@@ -1966,12 +1971,12 @@ default-package-overrides:
   - tasty ==1.0.1.1
   - tasty-ant-xml ==1.1.3
   - tasty-auto ==0.2.0.0
-  - tasty-dejafu ==1.1.0.1
+  - tasty-dejafu ==1.1.0.2
   - tasty-discover ==4.2.0
   - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.1.3
   - tasty-hedgehog ==0.1.0.2
-  - tasty-hspec ==1.1.3.3
+  - tasty-hspec ==1.1.4
   - tasty-html ==0.4.1.1
   - tasty-hunit ==0.10.0.1
   - tasty-kat ==0.0.3
@@ -2037,7 +2042,7 @@ default-package-overrides:
   - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
   - threepenny-editors ==0.5.6
-  - threepenny-gui ==0.8.2.2
+  - threepenny-gui ==0.8.2.3
   - threepenny-gui-flexbox ==0.4.2
   - th-reify-compat ==0.0.1.3
   - th-reify-many ==0.1.8
@@ -2095,13 +2100,13 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.6
+  - turtle ==1.5.7
   - turtle-options ==0.1.0.4
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
   - type-combinators-singletons ==0.2.1.0
   - TypeCompose ==0.9.12
-  - typed-process ==0.2.1.0
+  - typed-process ==0.2.2.0
   - type-fun ==0.1.1
   - type-hint ==0.1
   - type-level-integers ==0.0.1
@@ -2112,7 +2117,7 @@ default-package-overrides:
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
   - typography-geometry ==1.0.0.1
-  - tz ==0.1.3.0
+  - tz ==0.1.3.1
   - tzdata ==0.1.20180122.0
   - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
@@ -2131,8 +2136,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - unique ==0
   - Unique ==0.4.7.2
+  - unique ==0
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2145,7 +2150,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.5.0
+  - unliftio ==0.2.6.0
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2156,7 +2161,7 @@ default-package-overrides:
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
   - urlpath ==8.0.1
-  - userid ==0.1.3.1
+  - userid ==0.1.3.2
   - users ==0.5.0.0
   - users-postgresql-simple ==0.5.0.2
   - users-test ==0.5.0.1
@@ -2196,7 +2201,7 @@ default-package-overrides:
   - vector-th-unbox ==0.2.1.6
   - vectortiles ==1.3.0
   - verbosity ==0.2.3.0
-  - versions ==3.3.1
+  - versions ==3.3.2
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.3
   - vinyl ==0.7.0
@@ -2205,10 +2210,10 @@ default-package-overrides:
   - vivid-supercollider ==0.3.0.0
   - void ==0.7.2
   - vty ==5.20
-  - wai ==3.2.1.1
-  - wai-app-static ==3.1.6.1
+  - wai ==3.2.1.2
+  - wai-app-static ==3.1.6.2
   - wai-cli ==0.1.1
-  - wai-conduit ==3.0.0.3
+  - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.22.0
@@ -2231,8 +2236,8 @@ default-package-overrides:
   - wai-session-postgresql ==0.2.1.2
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
-  - wai-websockets ==3.0.1.1
-  - warp ==3.2.18.1
+  - wai-websockets ==3.0.1.2
+  - warp ==3.2.18.2
   - warp-tls ==3.2.4.2
   - wave ==0.1.5
   - wavefront ==0.7.1.2
@@ -2240,7 +2245,7 @@ default-package-overrides:
   - webdriver-angular ==0.1.11
   - webpage ==0.0.5
   - web-plugins ==0.2.9
-  - web-routes ==0.27.14
+  - web-routes ==0.27.14.2
   - web-routes-boomerang ==0.28.4.2
   - web-routes-happstack ==0.23.11
   - web-routes-hsp ==0.24.6.1
@@ -2285,7 +2290,7 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
-  - wuss ==1.1.6
+  - wuss ==1.1.8
   - X11 ==1.8
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2305,7 +2310,7 @@ default-package-overrides:
   - xml-basic ==0.1.3
   - xml-conduit ==1.8.0
   - xml-conduit-writer ==0.1.1.2
-  - xmlgen ==0.6.2.1
+  - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0
   - xmlhtml ==0.2.5.2
   - xml-html-qq ==0.1.0.1
@@ -2340,6 +2345,7 @@ default-package-overrides:
   - yesod-form ==1.6.1
   - yesod-form-bootstrap4 ==0.1.0.2
   - yesod-gitrepo ==0.3.0
+  - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
   - yesod-paginator ==0.11.0
   - yesod-persistent ==1.6.0
@@ -2377,7 +2383,7 @@ default-package-overrides:
   - zlib-lens ==0.1.2.1
   - zot ==0.0.3
   - zstd ==0.1.0.0
-  - ztail ==1.2
+  - ztail ==1.2.0.1
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cfe1a0cca17..57840713aba 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6166,19 +6166,6 @@ self: {
      }) {};
 
   "GLURaw" = callPackage
-    ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }:
-     mkDerivation {
-       pname = "GLURaw";
-       version = "2.0.0.3";
-       sha256 = "1vncyxaqyc7apw42wkpyxinyvzgzcnx6x858x4z15h5qq70ghb2q";
-       libraryHaskellDepends = [ base OpenGLRaw transformers ];
-       librarySystemDepends = [ libGL libGLU ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A raw binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
-
-  "GLURaw_2_0_0_4" = callPackage
     ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
@@ -6189,28 +6176,9 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, OpenGL, StateVar
-     , transformers
-     }:
-     mkDerivation {
-       pname = "GLUT";
-       version = "2.7.0.12";
-       sha256 = "1dgix79r8jdp0b2ncx14v6abaqcanr3y91h1zr954vl3kyyidxb6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base containers OpenGL StateVar transformers
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A binding for the OpenGL Utility Toolkit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "GLUT_2_7_0_13" = callPackage
     ({ mkDerivation, array, base, containers, OpenGL, StateVar
      , transformers
      }:
@@ -6226,7 +6194,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLUtil" = callPackage
@@ -8667,26 +8634,6 @@ self: {
      }) {};
 
   "HStringTemplate" = callPackage
-    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
-     , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
-     , syb, template-haskell, text, time, void
-     }:
-     mkDerivation {
-       pname = "HStringTemplate";
-       version = "0.8.6";
-       sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh";
-       revision = "1";
-       editedCabalFile = "05j23rsll9xxj92gk1qvaksd9z985fpdmbp8mv73ywwjl29kfwyb";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring containers deepseq directory
-         filepath mtl old-locale parsec pretty syb template-haskell text
-         time void
-       ];
-       description = "StringTemplate implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HStringTemplate_0_8_7" = callPackage
     ({ mkDerivation, array, base, blaze-builder, bytestring, containers
      , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
      , semigroups, syb, template-haskell, text, time, void
@@ -8702,7 +8649,6 @@ self: {
        ];
        description = "StringTemplate implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HStringTemplateHelpers" = callPackage
@@ -10431,25 +10377,6 @@ self: {
      }) {};
 
   "IPv6Addr" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
-     , network-info, random, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "IPv6Addr";
-       version = "1.0.1";
-       sha256 = "01s2lml150mcb9qfaq0i19fx8ri19c0dba3rzl0q9w30kv8ykxyz";
-       libraryHaskellDepends = [
-         aeson attoparsec base iproute network network-info random text
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       homepage = "https://github.com/MichelBoucey/IPv6Addr";
-       description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IPv6Addr_1_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
@@ -10466,40 +10393,9 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IPv6DB" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
-     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
-     , optparse-applicative, text, unordered-containers, vector, wai
-     , wai-logger, warp
-     }:
-     mkDerivation {
-       pname = "IPv6DB";
-       version = "0.2.5";
-       sha256 = "0n8998fkdp6p1gr5j7kg0xfkh88cxmqiwxzh75q0xmkasphx4yfq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
-         optparse-applicative text unordered-containers vector wai
-         wai-logger warp
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-client http-types vector
-       ];
-       homepage = "http://ipv6db.cybervisible.com";
-       description = "A RESTful Web Service for IPv6-related data";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "IPv6DB_0_2_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
      , optparse-applicative, text, unordered-containers, vector, wai
@@ -14015,23 +13911,6 @@ self: {
      }) {};
 
   "OpenGL" = callPackage
-    ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
-     , OpenGLRaw, StateVar, text, transformers
-     }:
-     mkDerivation {
-       pname = "OpenGL";
-       version = "3.0.2.0";
-       sha256 = "1yqf8li6h2cwd7s3n99afmqyx628v9xkrf6jy8n4sqadf9cr9ags";
-       libraryHaskellDepends = [
-         base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
-         text transformers
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
-       description = "A binding for the OpenGL graphics system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "OpenGL_3_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
      , OpenGLRaw, StateVar, text, transformers
      }:
@@ -14046,7 +13925,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -20434,25 +20312,6 @@ self: {
      }) {};
 
   "accelerate-arithmetic" = callPackage
-    ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "accelerate-arithmetic";
-       version = "1.0";
-       sha256 = "0gqclqxsa3vbv34h3sgbmhfnx646ipanhnf8xhq160w5ha0ng932";
-       libraryHaskellDepends = [
-         accelerate accelerate-utility base QuickCheck utility-ht
-       ];
-       testHaskellDepends = [
-         accelerate accelerate-utility base QuickCheck
-       ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/";
-       description = "Linear algebra and interpolation using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-arithmetic_1_0_0_1" = callPackage
     ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
      , utility-ht
      }:
@@ -20469,7 +20328,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-bignum" = callPackage
@@ -20482,8 +20340,8 @@ self: {
        pname = "accelerate-bignum";
        version = "0.1.0.0";
        sha256 = "199h9vq62hxs7pdwch8xh8zcx9kz9x6195yi389k1va6srkw863w";
-       revision = "1";
-       editedCabalFile = "0gwfw6bzy00spi0nm82p63fjc7sigk733ysnla64znqilca8nrmv";
+       revision = "2";
+       editedCabalFile = "00s0n5jqahn15m8x81chavv8blzjjb8z6368pl3diaadd8bi8hsv";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell
@@ -20671,22 +20529,6 @@ self: {
      }) {};
 
   "accelerate-fftw" = callPackage
-    ({ mkDerivation, accelerate, accelerate-io, base, carray, fft
-     , storable-complex
-     }:
-     mkDerivation {
-       pname = "accelerate-fftw";
-       version = "1.0";
-       sha256 = "0b4jr7v3jllvlis0f554l9289zm07ddjgp5q2rp5l47rmsmaak7z";
-       libraryHaskellDepends = [
-         accelerate accelerate-io base carray fft storable-complex
-       ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fftw/";
-       description = "Accelerate frontend to the FFTW library (Fourier transform)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-fftw_1_0_0_1" = callPackage
     ({ mkDerivation, accelerate, accelerate-io, base, carray, fft
      , storable-complex
      }:
@@ -20700,36 +20542,9 @@ self: {
        homepage = "http://hub.darcs.net/thielema/accelerate-fftw/";
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier" = callPackage
-    ({ mkDerivation, accelerate, accelerate-arithmetic
-     , accelerate-llvm-native, accelerate-utility, base, containers
-     , criterion, QuickCheck, transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "accelerate-fourier";
-       version = "1.0.0.4";
-       sha256 = "1263ximbciszb6cij232vxsxfj5rj7n77l88fd7vh6ayx7rrr45m";
-       libraryHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-utility base containers
-         QuickCheck transformers utility-ht
-       ];
-       testHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-utility base QuickCheck
-         utility-ht
-       ];
-       benchmarkHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-llvm-native
-         accelerate-utility base criterion utility-ht
-       ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
-       description = "Fast Fourier transform and convolution using the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-fourier_1_0_0_5" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic
      , accelerate-llvm-native, accelerate-utility, base, containers
      , criterion, QuickCheck, transformers, utility-ht
@@ -20753,7 +20568,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -20784,6 +20598,8 @@ self: {
        pname = "accelerate-io";
        version = "1.0.0.1";
        sha256 = "1q3l4k4h6p8y9w6qzxjanm5ww3ncz236fna2kqdqndyv18b8v9pm";
+       revision = "1";
+       editedCabalFile = "1qf7f1swy5h1fqaciw1swvwrvmqrcmi03v0vqsx6ccxf2zxcjlal";
        libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
@@ -20894,18 +20710,6 @@ self: {
      }) {};
 
   "accelerate-utility" = callPackage
-    ({ mkDerivation, accelerate, base, utility-ht }:
-     mkDerivation {
-       pname = "accelerate-utility";
-       version = "1.0";
-       sha256 = "16ir7ra99dhk04sg7ap7wwsbazdnadsnkd0ggq60j5cr2jp7x6lk";
-       libraryHaskellDepends = [ accelerate base utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-utility/";
-       description = "Utility functions for the Accelerate framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "accelerate-utility_1_0_0_1" = callPackage
     ({ mkDerivation, accelerate, base, utility-ht }:
      mkDerivation {
        pname = "accelerate-utility";
@@ -20915,7 +20719,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accentuateus" = callPackage
@@ -30208,8 +30011,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.7.1.2";
-       sha256 = "0v519jzz8sh851jp3rcbzgh5ylr8ggk993svh4w6y4224y6wfi28";
+       version = "2.8.0.0";
+       sha256 = "0wkfx3nk2v1wzmg3d6ghq0zkj85f6vr74vvvhc6mvwd5x0nya645";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -32236,6 +32039,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "backprop_0_1_4_0" = callPackage
+    ({ mkDerivation, base, bifunctors, criterion, deepseq, directory
+     , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive
+     , reflection, time, transformers, type-combinators, vector
+     }:
+     mkDerivation {
+       pname = "backprop";
+       version = "0.1.4.0";
+       sha256 = "0gshjm0xgzsgd3q0a5ahg3xyk50jfgq7c4rqs1jxq9nmd9m1pq5h";
+       libraryHaskellDepends = [
+         base deepseq microlens primitive reflection transformers
+         type-combinators vector
+       ];
+       benchmarkHaskellDepends = [
+         base bifunctors criterion deepseq directory hmatrix lens mnist-idx
+         mwc-random time transformers vector
+       ];
+       homepage = "https://github.com/mstksg/backprop#readme";
+       description = "Heterogeneous automatic differentation (backpropagation)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "backtracking-exceptions" = callPackage
     ({ mkDerivation, base, either, free, kan-extensions, mtl
      , semigroupoids, semigroups, transformers
@@ -32995,6 +32821,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "basen-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck }:
+     mkDerivation {
+       pname = "basen-bytestring";
+       version = "0.1.0.0";
+       sha256 = "0v2839zc5n58na1kb1q9qalcnjwriq5w9hk9qs7b9xh2jmwwldcz";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
+       homepage = "https://github.com/FilWisher/basen-bytestring#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "basex-client" = callPackage
     ({ mkDerivation, base, network, pureMD5, utf8-string }:
      mkDerivation {
@@ -35695,10 +35533,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, rank1dynamic }:
      mkDerivation {
        pname = "bindynamic";
-       version = "1.0.0.0";
-       sha256 = "0vi4wyxx4qvfrhir8p66h5laqq2m1q3dh3i0syjfd6vaxa9c7sgi";
-       revision = "1";
-       editedCabalFile = "1rd7l106zka0hndbixmr3wzdj8gx6vwhlaaxkn170kprf4xs3p6j";
+       version = "1.0.0.1";
+       sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        homepage = "https://github.com/lspitzner/bindynamic";
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
@@ -39300,31 +39136,6 @@ self: {
      }) {};
 
   "buffer-builder" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
-     , text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "buffer-builder";
-       version = "0.2.4.4";
-       sha256 = "1n1dvd1xqxi6aklrhnsmymmj7qxf7sfcigqs0j6a1137fzxvmh01";
-       libraryHaskellDepends = [
-         base bytestring mtl text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base bytestring criterion deepseq HTF
-         quickcheck-instances text vector
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring criterion deepseq http-types json-builder
-         text vector
-       ];
-       homepage = "https://github.com/chadaustin/buffer-builder";
-       description = "Library for efficiently building up buffers, one piece at a time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "buffer-builder_0_2_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
      , text, unordered-containers, vector
@@ -39347,7 +39158,6 @@ self: {
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -39398,8 +39208,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffon";
-       version = "0.1.0.0";
-       sha256 = "073a2gzazihqyki175xhb97szqyvv2ijjrh7byik25z1xlkn599d";
+       version = "0.1.0.1";
+       sha256 = "1v9kxm3yrw871567j8qza7gayllhsb77pxqriin4akvg77llz7l9";
        libraryHaskellDepends = [
          base monad-primitive mwc-random mwc-random-monad primitive
          transformers
@@ -40421,31 +40231,6 @@ self: {
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
-    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
-     , data-default, hspec, mtl, random, resourcet
-     }:
-     mkDerivation {
-       pname = "bzlib-conduit";
-       version = "0.3.0";
-       sha256 = "11nz2lkrv39rb7ayhnqlpjrxsprnv92ygwwvgmp3i32l9fakwhpw";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bindings-DSL bytestring conduit data-default mtl resourcet
-       ];
-       librarySystemDepends = [ bzip2 ];
-       testHaskellDepends = [
-         base bindings-DSL bytestring conduit data-default hspec mtl random
-         resourcet
-       ];
-       benchmarkHaskellDepends = [
-         base bindings-DSL bytestring conduit data-default mtl resourcet
-       ];
-       homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
-       description = "Streaming compression/decompression via conduits";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) bzip2;};
-
-  "bzlib-conduit_0_3_0_1" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
      , data-default-class, hspec, mtl, random, resourcet
      }:
@@ -40470,7 +40255,6 @@ self: {
        homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
@@ -43551,27 +43335,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.4";
-       sha256 = "17463g65cylkjxpih414wfg0vqvxj81ylzp2hg04sa1h75zhdjkv";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -46198,17 +45961,18 @@ self: {
      }) {};
 
   "classy-miso" = callPackage
-    ({ mkDerivation, base, containers, lens, megaparsec, miso
-     , network-uri, rfc, url
+    ({ mkDerivation, base, containers, data-default, lens, megaparsec
+     , miso, network-uri, rfc, transformers, url
      }:
      mkDerivation {
        pname = "classy-miso";
-       version = "0.0.0.1";
-       sha256 = "07mcxpp0brh3yh7qhzmg7vvv0kgy2gwms8mzlgvbfb608ggwh32b";
+       version = "0.0.0.2";
+       sha256 = "12qz2s5qhmjryp5x06jcv2gl3ipjhw0knsn1qawl1kn278hpyvp9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers lens megaparsec miso network-uri rfc url
+         base containers data-default lens megaparsec miso network-uri rfc
+         transformers url
        ];
        executableHaskellDepends = [ base miso rfc ];
        testHaskellDepends = [ base miso rfc ];
@@ -50351,35 +50115,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hspec, kan-extensions
-     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
-     , resourcet, safe, silently, split, text, transformers, unix
-     , unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.3.0.1";
-       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
-       libraryHaskellDepends = [
-         base bytestring directory exceptions filepath mono-traversable mtl
-         primitive resourcet text transformers unix unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         mono-traversable mtl QuickCheck resourcet safe silently split text
-         transformers unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers deepseq gauge hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       homepage = "http://github.com/snoyberg/conduit";
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_3_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -50406,7 +50141,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -56619,21 +56353,6 @@ self: {
      }) {};
 
   "data-accessor-template" = callPackage
-    ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
-     }:
-     mkDerivation {
-       pname = "data-accessor-template";
-       version = "0.2.1.14";
-       sha256 = "0r8vb3z40172jy17w131ydg5v1pvi121rgwxyq0cgxx0zwzhnvy4";
-       libraryHaskellDepends = [
-         base data-accessor template-haskell utility-ht
-       ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
-       description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-accessor-template_0_2_1_15" = callPackage
     ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
      }:
      mkDerivation {
@@ -56646,7 +56365,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-accessor-transformers" = callPackage
@@ -56798,18 +56516,6 @@ self: {
      }) {};
 
   "data-clist" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "data-clist";
-       version = "0.1.2.0";
-       sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f";
-       libraryHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/sw17ch/data-clist";
-       description = "Simple functional ring type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-clist_0_1_2_1" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "data-clist";
@@ -56819,7 +56525,6 @@ self: {
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-concurrent-queue" = callPackage
@@ -58310,34 +58015,6 @@ self: {
      }) {};
 
   "datadog" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, buffer-builder
-     , bytestring, Cabal, dlist, exceptions, hspec, http-client
-     , http-client-tls, http-types, lens, lifted-base, monad-control
-     , network, old-locale, random, text, time, transformers-base
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "datadog";
-       version = "0.2.0.0";
-       sha256 = "0zk4dkd6q2rv0fbylp2fprizahfx2imczhrj08n0qd5h3mnck3c9";
-       libraryHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring dlist http-client
-         http-client-tls http-types lens lifted-base monad-control network
-         old-locale text time transformers-base unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring Cabal dlist
-         exceptions hspec http-client http-client-tls http-types lens
-         lifted-base monad-control network old-locale random text time
-         transformers-base unordered-containers vector
-       ];
-       homepage = "https://github.com/iand675/datadog";
-       description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "datadog_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, auto-update, base, buffer-builder
      , bytestring, Cabal, dlist, exceptions, hspec, http-client
      , http-client-tls, http-types, lens, lifted-base, monad-control
@@ -59413,37 +59090,6 @@ self: {
      }) {};
 
   "debug" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, clock, containers
-     , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
-     , js-jquery, libgraph, monoidal-containers, open-browser
-     , prettyprinter, prettyprinter-compat-ansi-wl-pprint
-     , template-haskell, text, uniplate, unordered-containers, vector
-     , yaml
-     }:
-     mkDerivation {
-       pname = "debug";
-       version = "0.1";
-       sha256 = "05wnaz5p5szba0r6sqz5c0db63wpscmip635v1x35nv3crb2j1r0";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring clock containers deepseq directory extra
-         ghc-prim hashable Hoed js-jquery libgraph monoidal-containers
-         open-browser prettyprinter prettyprinter-compat-ansi-wl-pprint
-         template-haskell text uniplate unordered-containers vector
-       ];
-       executableHaskellDepends = [ aeson base directory filepath yaml ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory extra filepath text
-       ];
-       homepage = "https://github.com/ndmitchell/debug";
-       description = "Simple trace-based debugger";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "debug_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, clock, containers
      , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
      , libgraph, open-browser, prettyprinter
@@ -60988,14 +60634,16 @@ self: {
 
   "dhall-lex" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
-     , hspec, hspec-dirstream
+     , hspec, hspec-dirstream, scientific
      }:
      mkDerivation {
        pname = "dhall-lex";
-       version = "0.1.0.1";
-       sha256 = "02g8si9cfhwqsr6c507yw7sydyg8ma645z9c3n0cap1wj8fa0r8p";
+       version = "0.2.0.0";
+       sha256 = "0yxffkmpkab7apvxj5i8a3x233smb5wps5j39h38d91v6kqf5yy2";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ array base bytestring deepseq ];
+       libraryHaskellDepends = [
+         array base bytestring deepseq scientific
+       ];
        libraryToolDepends = [ alex ];
        testHaskellDepends = [ base bytestring hspec hspec-dirstream ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
@@ -61039,6 +60687,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-to-cabal" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, contravariant
+     , dhall, Diff, filepath, formatting, hashable
+     , insert-ordered-containers, optparse-applicative, prettyprinter
+     , tasty, tasty-golden, text, transformers, trifecta, vector
+     }:
+     mkDerivation {
+       pname = "dhall-to-cabal";
+       version = "1.0.0.1";
+       sha256 = "0qs00xhsk09azm7sqfihnwmapilmkybmcim1wzlw3h6y4jj6nmq9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers dhall formatting hashable
+         insert-ordered-containers text transformers trifecta vector
+       ];
+       executableHaskellDepends = [
+         base Cabal contravariant dhall hashable insert-ordered-containers
+         optparse-applicative prettyprinter text
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal Diff filepath tasty tasty-golden text
+       ];
+       homepage = "https://github.com/ocharles/dhall-to-cabal";
+       description = "Compile Dhall expressions to Cabal files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dhcp-lease-parser" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty
      , tasty-hunit, text
@@ -62542,25 +62218,6 @@ self: {
      }) {};
 
   "direct-sqlite" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, directory
-     , HUnit, temporary, text
-     }:
-     mkDerivation {
-       pname = "direct-sqlite";
-       version = "2.3.22";
-       sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a";
-       revision = "1";
-       editedCabalFile = "0cfg6fjdl1p9lgsnc2b2lys9mcc30dvxr8a92q5nxpgc4mdkk5db";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [
-         base base16-bytestring bytestring directory HUnit temporary text
-       ];
-       homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "direct-sqlite_2_3_23" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, directory
      , HUnit, semigroups, temporary, text
      }:
@@ -62575,7 +62232,6 @@ self: {
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "directed-cubical" = callPackage
@@ -64418,8 +64074,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
-       version = "0.2.0.0";
-       sha256 = "02irp8bwr8172m5ix6jgpbhz3nks5khq31v03b5xlrh58nk5hqaf";
+       version = "0.2.0.1";
+       sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base doctest ];
@@ -64431,12 +64087,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-driver-gen_0_2_0_1" = callPackage
+  "doctest-driver-gen_0_2_0_2" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
-       version = "0.2.0.1";
-       sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld";
+       version = "0.2.0.2";
+       sha256 = "0yil9va8l4q1wp6zz6w699103ym54fw03vsigzj12iql6y06cxxl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base doctest ];
@@ -65281,8 +64937,8 @@ self: {
      }:
      mkDerivation {
        pname = "drinkery";
-       version = "0.2.2";
-       sha256 = "1cw8jq1j2yirrk80rk2n1m17avxf3xqln96gnih8xzip248q9bjj";
+       version = "0.3";
+       sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        benchmarkHaskellDepends = [
          base conduit conduit-combinators exceptions gauge list-t ListT
@@ -66451,13 +66107,15 @@ self: {
      }) {};
 
   "easytest" = callPackage
-    ({ mkDerivation, async, base, containers, mtl, random, stm, text }:
+    ({ mkDerivation, async, base, call-stack, containers, mtl, random
+     , stm, text, transformers
+     }:
      mkDerivation {
        pname = "easytest";
-       version = "0.1";
-       sha256 = "0wjimph83n5fvqgh85ng255qgw3yvagvv7ky1a9lz2blhzb02hh7";
+       version = "0.1.1";
+       sha256 = "11pbc26s908vms9ldsm0wfa171g79b24kg9knaip0v7vdspcj74v";
        libraryHaskellDepends = [
-         async base containers mtl random stm text
+         async base call-stack containers mtl random stm text transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/joelburget/easytest";
@@ -67242,27 +66900,6 @@ self: {
      }) {};
 
   "ekg" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
-     , filepath, network, snap-core, snap-server, text, time
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ekg";
-       version = "0.4.0.14";
-       sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd";
-       revision = "3";
-       editedCabalFile = "1llpsbki0v9p0c820qwv6m4433wfrxfhv8yxrg2xyrrxr8g0p42a";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring ekg-core ekg-json filepath network snap-core
-         snap-server text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/tibbe/ekg";
-       description = "Remote monitoring of processes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ekg_0_4_0_15" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, network, snap-core, snap-server, text, time
      , transformers, unordered-containers
@@ -67281,7 +66918,6 @@ self: {
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-bosun" = callPackage
@@ -68822,18 +68458,6 @@ self: {
      }) {};
 
   "enummapset" = callPackage
-    ({ mkDerivation, base, containers, deepseq }:
-     mkDerivation {
-       pname = "enummapset";
-       version = "0.5.2.1";
-       sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg";
-       libraryHaskellDepends = [ base containers deepseq ];
-       homepage = "https://github.com/michalt/enummapset";
-       description = "IntMap and IntSet with Enum keys/elements";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "enummapset_0_5_2_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, semigroups }:
      mkDerivation {
        pname = "enummapset";
@@ -68843,7 +68467,6 @@ self: {
        homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enummapset-th" = callPackage
@@ -71567,23 +71190,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.4";
-       sha256 = "02i4wjp9wgnp2f89d7fj3jnc2pkkcnw068qh85sim3pfabz0a9hw";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       homepage = "https://github.com/ndmitchell/extra#readme";
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_5" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -71598,7 +71204,6 @@ self: {
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -72028,8 +71633,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.3.3.2";
-       sha256 = "08szj3rli8vnzl34j4x6xcydhk3k1nm12ziwqrxffbnsrvzjslvi";
+       version = "0.3.3.3";
+       sha256 = "1wm4s2xx3r3bjrkby4dddkc274pqvaa3q94j14pj8hayja6hd6ci";
        setupHaskellDepends = [ ats-pkg base Cabal ];
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        librarySystemDepends = [ numbertheory ];
@@ -75166,21 +74771,6 @@ self: {
      }) {};
 
   "flow" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
-     mkDerivation {
-       pname = "flow";
-       version = "1.0.11";
-       sha256 = "11cgab1wyqdjzyx6ygh91yl03w70aivspmlavl4if6p9yr5z9rw7";
-       revision = "2";
-       editedCabalFile = "13gyzkk29qkq8pnfnxvq2ymag2r3f6h1hpxk7yhy1r3k9hmp5469";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       homepage = "https://github.com/tfausak/flow#readme";
-       description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flow_1_0_12" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
@@ -75191,7 +74781,6 @@ self: {
        homepage = "https://github.com/tfausak/flow#readme";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow-er" = callPackage
@@ -76335,23 +75924,6 @@ self: {
      }) {};
 
   "formatting" = callPackage
-    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
-     , integer-gmp, old-locale, scientific, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "formatting";
-       version = "6.3.1";
-       sha256 = "0yfl3xb0dyig8imzxxaq2lh6gy3rn07c6zxncvmzjzlpzy6kqc2n";
-       libraryHaskellDepends = [
-         array base bytestring clock ghc-prim integer-gmp old-locale
-         scientific text time transformers
-       ];
-       testHaskellDepends = [ base hspec ];
-       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "formatting_6_3_2" = callPackage
     ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
      , integer-gmp, old-locale, scientific, semigroups, text, time
      , transformers
@@ -76367,7 +75939,6 @@ self: {
        testHaskellDepends = [ base hspec semigroups ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forml" = callPackage
@@ -77580,8 +77151,8 @@ self: {
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "frp-arduino";
-       version = "0.1.0.3";
-       sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5";
+       version = "0.1.1.0";
+       sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
@@ -80718,26 +80289,6 @@ self: {
      }) {};
 
   "getopt-generics" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, filepath
-     , generics-sop, hspec, QuickCheck, safe, silently, tagged
-     }:
-     mkDerivation {
-       pname = "getopt-generics";
-       version = "0.13.0.1";
-       sha256 = "10sfab5frm53bll8kh6bkwg0y0cv47740sxy6gsnd9fycvixf0k9";
-       libraryHaskellDepends = [
-         base base-compat base-orphans generics-sop tagged
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans filepath generics-sop hspec
-         QuickCheck safe silently tagged
-       ];
-       homepage = "https://github.com/soenkehahn/getopt-generics#readme";
-       description = "Create command line interfaces with ease";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "getopt-generics_0_13_0_2" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, filepath
      , generics-sop, hspec, QuickCheck, safe, silently, tagged
      }:
@@ -80755,7 +80306,6 @@ self: {
        homepage = "https://github.com/soenkehahn/getopt-generics#readme";
        description = "Create command line interfaces with ease";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getopt-simple" = callPackage
@@ -81488,28 +81038,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.4.1";
-       sha256 = "1jpf2pn37vgwqcnsm799g9s9d7qbxk9d305b6i2k12573cv1x8r4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       homepage = "https://github.com/maoe/ghc-prof";
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -81529,7 +81057,6 @@ self: {
        homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -83850,27 +83377,6 @@ self: {
      }) {};
 
   "github-release" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
-       version = "1.1.5";
-       sha256 = "04248cgs4wi348c9v6qdn6yhyrg8mmdq75nib4rpr795sk1gvdfb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_1_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, mime-types, optparse-generic, text
      , unordered-containers, uri-templater
@@ -83892,7 +83398,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -84401,27 +83906,6 @@ self: {
      }) {};
 
   "glabrous" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
-       version = "0.3.4";
-       sha256 = "00dwlxl05g2s6br0nya2ayp24yjmf8rg6y3yi6bnqs0a2fyyzq42";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       homepage = "https://github.com/MichelBoucey/glabrous";
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_0_3_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
@@ -84440,7 +83924,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/glabrous";
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -88444,8 +87927,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphite";
-       version = "0.9.6.0";
-       sha256 = "0qryrwsj4pwvk804hv0cqglk197y895xlhgf5mq9azsp7ll39w3v";
+       version = "0.9.8.0";
+       sha256 = "1ylpa2kkbdhfgiq7g1kdlvjzs2ln3ag8pssp0widzz1p0is8ldm1";
        libraryHaskellDepends = [
          base bytestring cassava containers deepseq graphviz hashable
          process QuickCheck random semigroups text unordered-containers
@@ -91273,22 +90756,20 @@ self: {
 
   "hackage-repo-tool" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , hackage-security, network, network-uri, optparse-applicative, tar
-     , time, unix, zlib
+     , hackage-security, network, network-uri, old-time
+     , optparse-applicative, tar, time, unix, zlib
      }:
      mkDerivation {
        pname = "hackage-repo-tool";
-       version = "0.1.1";
-       sha256 = "1x34f28wqa1v935d90fzhra2d1c5kj6nrp79iyp53kj2kmqw5xi3";
-       revision = "2";
-       editedCabalFile = "04mlgliz33sb9dwzayd858b42pa30a7wpcd9jgmk1kc59dlv1y38";
+       version = "0.1.1.1";
+       sha256 = "05r4i7zhwbsv9ci4yid57fnb5lkx254pch9arq5a11dvwsvdzvzw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring Cabal directory filepath hackage-security network
-         network-uri optparse-applicative tar time unix zlib
+         network-uri old-time optparse-applicative tar time unix zlib
        ];
-       homepage = "https://github.com/well-typed/hackage-security";
+       homepage = "https://github.com/haskell/hackage-security";
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91323,6 +90804,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hackage-security_0_5_3_0" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, Cabal, containers, cryptohash-sha256, directory
+     , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec
+     , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, temporary, time, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-security";
+       version = "0.5.3.0";
+       sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring Cabal
+         containers cryptohash-sha256 directory ed25519 filepath ghc-prim
+         mtl network network-uri parsec pretty tar template-haskell time
+         transformers zlib
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal containers network-uri QuickCheck tar tasty
+         tasty-hunit tasty-quickcheck temporary time zlib
+       ];
+       homepage = "https://github.com/haskell/hackage-security";
+       description = "Hackage security library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hackage-security-HTTP" = callPackage
     ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl
      , network, network-uri, zlib
@@ -92380,6 +91888,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
+  "hakyll_4_12_1_0" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , containers, cryptohash, data-default, deepseq, directory
+     , file-embed, filepath, fsnotify, http-conduit, http-types
+     , lrucache, mtl, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
+     , resourcet, scientific, tagsoup, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, time-locale-compat
+     , unordered-containers, utillinux, vector, wai, wai-app-static
+     , warp, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.12.1.0";
+       sha256 = "0hw6j6kq7g9sg03ihw0q1f4d96kkr6dnfg7f2bj4skpwfsslb2cg";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory file-embed filepath
+         fsnotify http-conduit http-types lrucache mtl network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-tdfa resourcet scientific tagsoup text time
+         time-locale-compat unordered-containers vector wai wai-app-static
+         warp yaml
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base bytestring containers filepath QuickCheck tasty tasty-hunit
+         tasty-quickcheck text unordered-containers yaml
+       ];
+       testToolDepends = [ utillinux ];
+       homepage = "http://jaspervdj.be/hakyll";
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
+
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -94847,22 +94394,6 @@ self: {
      }) {};
 
   "hashtables" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
-     mkDerivation {
-       pname = "hashtables";
-       version = "1.2.2.1";
-       sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs";
-       revision = "1";
-       editedCabalFile = "0wcjkd8imgx3j4ygj3r2cdfzknk1bbq0745axy7kbm2sckz1xqcz";
-       libraryHaskellDepends = [
-         base ghc-prim hashable primitive vector
-       ];
-       homepage = "http://github.com/gregorycollins/hashtables";
-       description = "Mutable hash tables in the ST monad";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashtables_1_2_3_0" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
      mkDerivation {
        pname = "hashtables";
@@ -94874,7 +94405,6 @@ self: {
        homepage = "http://github.com/gregorycollins/hashtables";
        description = "Mutable hash tables in the ST monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashtables-plus" = callPackage
@@ -104298,16 +103828,16 @@ self: {
 
   "hlrdb" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite
-     , hashable, hedis, hlrdb-core, memory, random, store, time-exts
+     , hashable, hedis, hlrdb-core, memory, random, store, time
      , unordered-containers
      }:
      mkDerivation {
        pname = "hlrdb";
-       version = "0.1.0.0";
-       sha256 = "1kqm14kd5app34438b3w9h1nxr6fp1dvrf58xrbv2xn2y65jb5jc";
+       version = "0.2.0.0";
+       sha256 = "1x7vw2mcwd703dr5mjghsjd04yxwl6z7wzdysgk75i4l7f0lcqfq";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptonite hashable hedis
-         hlrdb-core memory random store time-exts unordered-containers
+         hlrdb-core memory random store time unordered-containers
        ];
        homepage = "https://github.com/identicalsnowflake/hlrdb";
        description = "High-level Redis Database";
@@ -104317,14 +103847,14 @@ self: {
 
   "hlrdb-core" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hedis, lens, mtl
-     , profunctors, random, unordered-containers
+     , profunctors, random, time, unordered-containers
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.0.0";
-       sha256 = "1gy5sycr4han0i0lk8m3rl99pagd9slfry0b94c05cj6kai6c9ss";
+       version = "0.1.1.0";
+       sha256 = "0jxpzbwlcf8ix08sbxppcbvlvq2hhs8ya0mkk9b262zb2bfv3m4i";
        libraryHaskellDepends = [
-         base bytestring hashable hedis lens mtl profunctors random
+         base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
        ];
        homepage = "https://github.com/identicalsnowflake/hlrdb-core";
@@ -104457,6 +103987,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-backprop_0_1_1_0" = callPackage
+    ({ mkDerivation, ANum, backprop, base, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
+     , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
+     , vector, vector-sized
+     }:
+     mkDerivation {
+       pname = "hmatrix-backprop";
+       version = "0.1.1.0";
+       sha256 = "1q9vgyy8qiilsw5qix1c6489jyjiqgz2yf1ad0n4qqwm32dfqcz2";
+       libraryHaskellDepends = [
+         ANum backprop base finite-typelits ghc-typelits-knownnat
+         ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens
+         vector vector-sized
+       ];
+       testHaskellDepends = [
+         backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
+         microlens microlens-platform vector-sized
+       ];
+       homepage = "https://github.com/mstksg/hmatrix-backprop#readme";
+       description = "hmatrix operations lifted for backprop";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
@@ -107234,37 +106789,6 @@ self: {
      }) {};
 
   "hpqtypes" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , data-default-class, exceptions, HUnit, lifted-base, monad-control
-     , mtl, postgresql, QuickCheck, random, resource-pool, scientific
-     , test-framework, test-framework-hunit, text, text-show, time
-     , transformers, transformers-base, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hpqtypes";
-       version = "1.5.1.1";
-       sha256 = "0nkrah6ny24qayr03dyar5yhb90k5as3fn19pzsp6df8gi6j375r";
-       revision = "1";
-       editedCabalFile = "0k255rbvzinwrav3k7f3n2hssiv9p3bb51fg4vp2mhnm9igfy5b9";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default-class exceptions
-         lifted-base monad-control mtl resource-pool text text-show time
-         transformers transformers-base vector
-       ];
-       librarySystemDepends = [ postgresql ];
-       testHaskellDepends = [
-         aeson base bytestring exceptions HUnit lifted-base monad-control
-         mtl QuickCheck random scientific test-framework
-         test-framework-hunit text text-show time transformers-base
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/scrive/hpqtypes";
-       description = "Haskell bindings to libpqtypes";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) postgresql;};
-
-  "hpqtypes_1_5_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default-class, directory, exceptions, filepath, HUnit
      , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
@@ -113769,18 +113293,6 @@ self: {
      }) {};
 
   "hunit-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
-     mkDerivation {
-       pname = "hunit-dejafu";
-       version = "1.1.0.2";
-       sha256 = "1r6i135dj3kn2sx49asy2k0i88vfb13z7giyzj1qs8m8cfx2pi89";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hunit-dejafu_1_1_0_3" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
@@ -113790,7 +113302,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-gui" = callPackage
@@ -114242,23 +113753,6 @@ self: {
      }) {};
 
   "hw-fingertree" = callPackage
-    ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "hw-fingertree";
-       version = "0.1.0.0";
-       sha256 = "0hh1f9m92s53254a2bk3h4i77girf8nni8rmyrd0ljramn4hiz55";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [
-         base deepseq HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       description = "Generic finger-tree structure, with example instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-fingertree_0_1_0_1" = callPackage
     ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
      , hw-hspec-hedgehog, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -114275,7 +113769,6 @@ self: {
        homepage = "https://github.com/haskell-works/hw-fingertree#readme";
        description = "Generic finger-tree structure, with example instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-fingertree-strict" = callPackage
@@ -114285,28 +113778,28 @@ self: {
      }:
      mkDerivation {
        pname = "hw-fingertree-strict";
-       version = "0.1.0.1";
-       sha256 = "18ki65cmbvbqj97y1v25sh2bvilkkg6q6pzzyprmgv24yscqkrp3";
+       version = "0.1.0.2";
+       sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/githubuser/hw-fingertree-strict#readme";
+       homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme";
        description = "Generic strict finger-tree structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-fingertree-strict_0_1_0_2" = callPackage
-    ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+  "hw-fingertree-strict_0_1_0_3" = callPackage
+    ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
+     , hw-hspec-hedgehog, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "hw-fingertree-strict";
-       version = "0.1.0.2";
-       sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv";
-       libraryHaskellDepends = [ base ];
+       version = "0.1.0.3";
+       sha256 = "03njx1g23f8s8a9dcyanpfm8pzgcbyds4zwkmp7g8mshk1rljfcm";
+       libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -122281,21 +121774,6 @@ self: {
      }) {};
 
   "json" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
-     , pretty, syb, text
-     }:
-     mkDerivation {
-       pname = "json";
-       version = "0.9.1";
-       sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn";
-       libraryHaskellDepends = [
-         array base bytestring containers mtl parsec pretty syb text
-       ];
-       description = "Support for serialising Haskell to and from JSON";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json_0_9_2" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
      , pretty, syb, text
      }:
@@ -122308,7 +121786,6 @@ self: {
        ];
        description = "Support for serialising Haskell to and from JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-api" = callPackage
@@ -122436,6 +121913,39 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "json-autotype_1_1_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, GenericPretty, hashable, lens, mtl
+     , optparse-applicative, pretty, process, QuickCheck, scientific
+     , smallcheck, text, uniplate, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "json-autotype";
+       version = "1.1.2";
+       sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers filepath GenericPretty hashable lens mtl
+         pretty process scientific text uniplate unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         lens mtl optparse-applicative pretty process scientific text
+         uniplate unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath GenericPretty
+         hashable lens mtl optparse-applicative pretty process QuickCheck
+         scientific smallcheck text uniplate unordered-containers vector
+       ];
+       homepage = "https://github.com/mgajda/json-autotype";
+       description = "Automatic type declaration for JSON input data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "json-b" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-nums, bytestring-trie
      , bytestringparser-temporary, containers, utf8-string
@@ -124892,14 +124402,14 @@ self: {
      , exceptions, fast-logger, filepath, http-client, lifted-base
      , MonadRandom, network, optparse-applicative, process, raaz, random
      , random-shuffle, readline, SafeSemaphore, secret-sharing, servant
-     , servant-client, servant-server, socks, split, stm, text, time
-     , token-bucket, transformers, unbounded-delays, unix, unix-compat
-     , utf8-string, wai, warp, zxcvbn-c
+     , servant-client, servant-server, socks, split, stm, text
+     , text-short, time, token-bucket, transformers, unbounded-delays
+     , unix, unix-compat, utf8-string, wai, warp, zxcvbn-c
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20170811";
-       sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py";
+       version = "0.20180326";
+       sha256 = "01kagnpliw0qmhhrx1lcaxdg41sq76km3c1gzk3b9siyqkszhq08";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -124908,8 +124418,8 @@ self: {
          http-client lifted-base MonadRandom network optparse-applicative
          process raaz random random-shuffle readline SafeSemaphore
          secret-sharing servant servant-client servant-server socks split
-         stm text time token-bucket transformers unbounded-delays unix
-         unix-compat utf8-string wai warp zxcvbn-c
+         stm text text-short time token-bucket transformers unbounded-delays
+         unix unix-compat utf8-string wai warp zxcvbn-c
        ];
        homepage = "https://keysafe.branchable.com/";
        description = "back up a secret key securely to the cloud";
@@ -125688,19 +125198,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
-     mkDerivation {
-       pname = "lackey";
-       version = "1.0.1";
-       sha256 = "0vlic5ad1zdqhlg0jd3zgc65acq7270607blkf6qgm6bk2g3j1pr";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base hspec servant servant-foreign text ];
-       homepage = "https://github.com/tfausak/lackey#readme";
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_1_0_2" = callPackage
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
@@ -125711,7 +125208,6 @@ self: {
        homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lagrangian" = callPackage
@@ -127693,29 +127189,6 @@ self: {
      }) {inherit (pkgs) liblapack;};
 
   "lapack-ffi-tools" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, containers
-     , explicit-exception, filepath, non-empty, optparse-applicative
-     , parsec, pathtype, transformers, unordered-containers, utility-ht
-     , vector
-     }:
-     mkDerivation {
-       pname = "lapack-ffi-tools";
-       version = "0.1";
-       sha256 = "1x5sv2b4rkglqqgpl44mprwxkkycnv48d5s526m3wmvxzdgz7adz";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         base bytestring cassava containers explicit-exception filepath
-         non-empty optparse-applicative parsec pathtype transformers
-         unordered-containers utility-ht vector
-       ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
-       description = "Generator for Haskell interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lapack-ffi-tools_0_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers
      , explicit-exception, filepath, non-empty, optparse-applicative
      , parsec, pathtype, transformers, unordered-containers, utility-ht
@@ -127736,7 +127209,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
        description = "Generator for Haskell interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "large-hashable" = callPackage
@@ -128732,49 +128204,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , Cabal, cabal-doctest, call-stack, comonad, containers
-     , contravariant, criterion, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
-     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
-     , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.16";
-       sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z";
-       revision = "4";
-       editedCabalFile = "18nipajdyqz5vpqx0mrl5c1a97jb8wm2skq57jashgygq5h8y7g4";
-       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring call-stack comonad
-         containers contravariant distributive exceptions filepath free
-         ghc-prim hashable kan-extensions mtl parallel profunctors
-         reflection semigroupoids semigroups tagged template-haskell text
-         th-abstraction transformers transformers-compat
-         unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory doctest filepath
-         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
-         simple-reflect test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th text transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring comonad containers criterion deepseq
-         generic-deriving transformers unordered-containers vector
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "lens_4_16_1" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -128813,7 +128242,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-accelerate" = callPackage
@@ -129208,6 +128636,8 @@ self: {
        pname = "lenz-template";
        version = "0.2.0.0";
        sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn";
+       revision = "1";
+       editedCabalFile = "05rgdgqk2yb92wlfs13844bdh7a2k2rddnxf9fcnz1c3qq4wkyi5";
        libraryHaskellDepends = [
          base base-unicode-symbols containers lenz template-haskell
        ];
@@ -131624,24 +131054,6 @@ self: {
      }) {};
 
   "list-t" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
-     , mtl, mtl-prelude, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "list-t";
-       version = "1.0.0.1";
-       sha256 = "00gpz0fn91cj3chf13r1y83y5ifwj4b55j1c0zc2ss9yffrjjjaa";
-       libraryHaskellDepends = [
-         base base-prelude mmorph monad-control mtl transformers
-         transformers-base
-       ];
-       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
-       homepage = "https://github.com/nikita-volkov/list-t";
-       description = "ListT done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "list-t_1_0_1" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
      , mtl, mtl-prelude, transformers, transformers-base
      }:
@@ -131656,7 +131068,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -133176,29 +132587,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.2.4";
-       sha256 = "14j63172ml4yj7sqscjxdkxxg869w6hvnlysf9s79qzbjnw44h3h";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
-       ];
-       homepage = "https://github.com/ocharles/logging-effect";
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_2_5" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , semigroups, stm, stm-delay, text, time, transformers
@@ -133219,7 +132607,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -133262,25 +132649,6 @@ self: {
      }) {};
 
   "logging-effect-extra-handler" = callPackage
-    ({ mkDerivation, base, exceptions, logging-effect, time
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect-extra-handler";
-       version = "1.1.3";
-       sha256 = "0pxsnah1v2d0zk5x3w8whifb0f78shhn0kpg5iq00ggpwg6x686i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base exceptions logging-effect time wl-pprint-text
-       ];
-       executableHaskellDepends = [ base logging-effect wl-pprint-text ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
-       description = "Handy logging handler combinators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "logging-effect-extra-handler_1_1_4" = callPackage
     ({ mkDerivation, base, exceptions, logging-effect, time
      , wl-pprint-text
      }:
@@ -133297,7 +132665,6 @@ self: {
        homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -134716,8 +134083,8 @@ self: {
      }:
      mkDerivation {
        pname = "lz4-conduit";
-       version = "0.2";
-       sha256 = "18zl3cxa8f6n64p1iz9l834vkk93bjdb37h69jj5wdd4q6hc51km";
+       version = "0.3";
+       sha256 = "18yjrf9iw4bwq25x7fd95lf99qcqj9nm3hdq6lkgxc5plgy94nyf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136608,25 +135975,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, data-default, data-default-class, deepseq
-     , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.1.2.0";
-       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
-       libraryHaskellDepends = [
-         base data-default-class deepseq ghc-prim primitive vector
-       ];
-       testHaskellDepends = [
-         base data-default deepseq hspec QuickCheck safe-exceptions vector
-       ];
-       homepage = "https://github.com/lehins/massiv";
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_1_4_0" = callPackage
     ({ mkDerivation, base, data-default, data-default-class, deepseq
      , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
      }:
@@ -136643,7 +135991,6 @@ self: {
        homepage = "https://github.com/lehins/massiv";
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -139946,15 +139293,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_15_0_0" = callPackage
+  "miso_0_17_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.15.0.0";
-       sha256 = "1kkh71psj0acia9r1mzvp16lzmc6gsma81shp7bhfy35yhbvwsl4";
+       version = "0.17.0.0";
+       sha256 = "0vf6yd2yib2snxsvaw78c4nzk5pghi7mh8bkykgy8vpcllg204ym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140213,19 +139560,6 @@ self: {
      }) {};
 
   "mmorph" = callPackage
-    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
-     mkDerivation {
-       pname = "mmorph";
-       version = "1.1.1";
-       sha256 = "17hhfvdr2cclrhslsph3jaly7gfn7caajbzh7xr2prgvxmjhsdg3";
-       libraryHaskellDepends = [
-         base mtl transformers transformers-compat
-       ];
-       description = "Monad morphisms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmorph_1_1_2" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "mmorph";
@@ -140236,7 +139570,6 @@ self: {
        ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmtf" = callPackage
@@ -140856,6 +140189,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-control-aligned_0_0_1_1" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control-aligned";
+       version = "0.0.1.1";
+       sha256 = "1xhiw1g0p8zljhy8yz43ljnwhhqn6dwxqi06mdsfji365p9qzrs4";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/athanclark/monad-control#readme";
+       description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-coroutine" = callPackage
     ({ mkDerivation, base, monad-parallel, transformers
      , transformers-compat
@@ -141514,23 +140864,6 @@ self: {
      }) {};
 
   "monad-recorder" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, monad-control, mtl
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "monad-recorder";
-       version = "0.1.0";
-       sha256 = "1n3bp3vian88b6wq2r3qybbnvnflphf1815g1qd6kb9r7d4z2g9i";
-       libraryHaskellDepends = [
-         base exceptions monad-control mtl transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "http://github.com/harendra-kumar/monad-recorder";
-       description = "Record and replay the results of monadic actions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-recorder_0_1_1" = callPackage
     ({ mkDerivation, base, exceptions, hspec, monad-control, mtl
      , transformers, transformers-base
      }:
@@ -141545,7 +140878,6 @@ self: {
        homepage = "http://github.com/harendra-kumar/monad-recorder";
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-resumption" = callPackage
@@ -142714,38 +142046,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, http-client, http-client-tls
-     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
-     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
-     , tasty-quickcheck, text, text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.16";
-       sha256 = "1k7j9dvl3m8l77r9m8d02nm9dxkr17y57d58x49icvk7bq0ij29x";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page optparse-applicative text text-format
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_18" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
      , http-client-tls, microlens, microlens-mtl, mtl
@@ -142776,7 +142076,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -145046,22 +144345,6 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
-     }:
-     mkDerivation {
-       pname = "mysql";
-       version = "0.1.4";
-       sha256 = "13k6vdmkdbhjlgfsjw6r2smrxhkbiqkw9rdnfx554lc843dpb1lv";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring containers ];
-       librarySystemDepends = [ mysql ];
-       testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/paul-rouse/mysql";
-       description = "A low-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) mysql;};
-
-  "mysql_0_1_5" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
      }:
      mkDerivation {
@@ -145075,7 +144358,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -145160,25 +144442,6 @@ self: {
      }) {};
 
   "mysql-simple" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
-     , text, time
-     }:
-     mkDerivation {
-       pname = "mysql-simple";
-       version = "0.4.4";
-       sha256 = "1rrwhc9szdsn1wm5y510kyj0cfhavw01j61vywf96yw57132y75m";
-       libraryHaskellDepends = [
-         attoparsec base base16-bytestring blaze-builder blaze-textual
-         bytestring mysql old-locale pcre-light text time
-       ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/paul-rouse/mysql-simple";
-       description = "A mid-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mysql-simple_0_4_5" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , blaze-textual, bytestring, containers, hspec, mysql, old-locale
      , pcre-light, text, time
@@ -145195,7 +144458,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql-simple";
        description = "A mid-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple-quasi" = callPackage
@@ -148097,22 +147359,6 @@ self: {
      }) {};
 
   "newtype-generics" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit
-     , semigroups, transformers
-     }:
-     mkDerivation {
-       pname = "newtype-generics";
-       version = "0.5.2.2";
-       sha256 = "1hjw9w0hrjvf9akspgjcwidicviflf0ba3jg91dhg9n8cf9y82i9";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [ base hspec HUnit ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion semigroups ];
-       description = "A typeclass and set of functions for working with newtypes, with generics support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "newtype-generics_0_5_3" = callPackage
     ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups
      , transformers
      }:
@@ -148127,7 +147373,6 @@ self: {
        homepage = "http://github.com/sjakobi/bsb-http-chunked";
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype-th" = callPackage
@@ -151199,35 +150444,6 @@ self: {
      }) {};
 
   "opaleye" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , case-insensitive, containers, contravariant, dotenv, hspec
-     , hspec-discover, multiset, postgresql-simple, pretty
-     , product-profunctors, profunctors, QuickCheck, semigroups, text
-     , time, time-locale-compat, transformers, uuid, void
-     }:
-     mkDerivation {
-       pname = "opaleye";
-       version = "0.6.0.0";
-       sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q";
-       revision = "2";
-       editedCabalFile = "1zhb7i4za87ixxwwh792drvydr0ln9krwkml1mmdz38a9s0zyhn6";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring case-insensitive
-         contravariant postgresql-simple pretty product-profunctors
-         profunctors semigroups text time time-locale-compat transformers
-         uuid void
-       ];
-       testHaskellDepends = [
-         aeson base containers contravariant dotenv hspec hspec-discover
-         multiset postgresql-simple product-profunctors profunctors
-         QuickCheck semigroups text time transformers
-       ];
-       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
-       description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "opaleye_0_6_1_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
@@ -151252,7 +150468,6 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -153726,41 +152941,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, containers, data-default, directory, filepath, hs-bibutils
-     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.14.1.5";
-       sha256 = "1jp2pzx2avvcngg6krygsiwszq1nbns5p2bz1v1mlgm2mb6szqi9";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath mtl pandoc
-         pandoc-types process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_14_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat
      , bytestring, Cabal, containers, data-default, directory, filepath
      , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec
@@ -153793,7 +152973,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -159253,20 +158432,6 @@ self: {
      }) {};
 
   "pipes-concurrency" = callPackage
-    ({ mkDerivation, async, base, contravariant, pipes, stm, void }:
-     mkDerivation {
-       pname = "pipes-concurrency";
-       version = "2.0.9";
-       sha256 = "1br0cssp4rdfh6lhvjql9ppjvcn0v6kpg1h1f1hi8vqb0c87nvb4";
-       libraryHaskellDepends = [
-         async base contravariant pipes stm void
-       ];
-       testHaskellDepends = [ async base pipes stm ];
-       description = "Concurrency for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-concurrency_2_0_10" = callPackage
     ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
      , void
      }:
@@ -159280,7 +158445,6 @@ self: {
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-conduit" = callPackage
@@ -162509,28 +161673,6 @@ self: {
      }) {};
 
   "postgresql-simple-url" = callPackage
-    ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-url";
-       version = "0.2.0.0";
-       sha256 = "0k7anqkw9gn5mm3y93pzp8rqzlg1526pxikcllxcciyhgpz5mn7p";
-       revision = "1";
-       editedCabalFile = "1z9qk3kplc5y93h3xbb9gialhdmnblwrmf2943wkj70qg975hajb";
-       libraryHaskellDepends = [
-         base network-uri postgresql-simple split
-       ];
-       testHaskellDepends = [
-         base postgresql-simple tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/futurice/postgresql-simple-url";
-       description = "Parse postgres:// url into ConnectInfo";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "postgresql-simple-url_0_2_1_0" = callPackage
     ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
      , tasty-quickcheck
      }:
@@ -164064,18 +163206,6 @@ self: {
      }) {};
 
   "prim-array" = callPackage
-    ({ mkDerivation, base, ghc-prim, primitive }:
-     mkDerivation {
-       pname = "prim-array";
-       version = "0.2.1";
-       sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf";
-       libraryHaskellDepends = [ base ghc-prim primitive ];
-       homepage = "https://github.com/andrewthad/prim-array#readme";
-       description = "Primitive byte array with type variable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "prim-array_0_2_2" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, semigroups }:
      mkDerivation {
        pname = "prim-array";
@@ -164085,7 +163215,6 @@ self: {
        homepage = "https://github.com/andrewthad/prim-array#readme";
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prim-spoon" = callPackage
@@ -165639,20 +164768,6 @@ self: {
      }) {};
 
   "proto-lens-optparse" = callPackage
-    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
-     mkDerivation {
-       pname = "proto-lens-optparse";
-       version = "0.1.0.4";
-       sha256 = "1wywg2jzc35483qlqxy1a4ms6v6cb08d10z4pgwb50ljv5hqlwwb";
-       libraryHaskellDepends = [
-         base optparse-applicative proto-lens text
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-optparse_0_1_1_0" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
@@ -165664,7 +164779,6 @@ self: {
        homepage = "https://github.com/google/proto-lens#readme";
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-protobuf-types" = callPackage
@@ -168096,15 +167210,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_4_4" = callPackage
+  "quickcheck-classes_0_4_5" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
      , QuickCheck, semigroupoids, semigroups, tagged, transformers
      , vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.4";
-       sha256 = "0g4hjgjz1wpb8fwn70gd7di69mrn6z46q39g93z3w0cwydqlcgng";
+       version = "0.4.5";
+       sha256 = "0nbfizi0f7cacspv5w008gmmw0nvbjv6nafsxifiy7mqhdlv4qx5";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups tagged transformers
@@ -170080,25 +169194,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, hspec, http-client, http-client-tls
-     , http-types, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "1.0.2";
-       sha256 = "0mwgnz8s0xpyggdxpakij66fmkdhvc6ra00h451pwy3f3m3g6vpy";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base filepath hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_1_0_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, hspec, http-client, http-client-tls
      , http-types, text, uuid
@@ -170118,26 +169213,9 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-client, ratel, wai
-     }:
-     mkDerivation {
-       pname = "ratel-wai";
-       version = "1.0.1";
-       sha256 = "190kgqhvda3r5gqk0j8pzr6d123fl77dv3i1csglq22yzrwynkv3";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-client ratel wai
-       ];
-       homepage = "https://github.com/tfausak/ratel-wai#readme";
-       description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel-wai_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
      }:
@@ -170151,7 +169229,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel-wai#readme";
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rating-systems" = callPackage
@@ -174256,8 +173333,8 @@ self: {
        pname = "req-conduit";
        version = "1.0.0";
        sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx";
-       revision = "1";
-       editedCabalFile = "14m20b2i0kygminqw35y3wi1na7bfpkyg1yc03a48qy6rrdqgnc2";
+       revision = "2";
+       editedCabalFile = "1cbzvqfs8glr004viya4x3p08x8lmkrgwwxjy78s32xkf8b2xxpr";
        libraryHaskellDepends = [
          base bytestring conduit http-client req resourcet transformers
        ];
@@ -175059,27 +174136,6 @@ self: {
      }) {};
 
   "retry" = callPackage
-    ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
-     , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
-     , tasty-hunit, time, transformers
-     }:
-     mkDerivation {
-       pname = "retry";
-       version = "0.7.6.1";
-       sha256 = "052kfbfvadrp2m8l0hnwi4j1jhqcw5m93wl9868863p5bd4w7j82";
-       libraryHaskellDepends = [
-         base data-default-class exceptions ghc-prim random transformers
-       ];
-       testHaskellDepends = [
-         base data-default-class exceptions ghc-prim hedgehog HUnit mtl
-         random stm tasty tasty-hedgehog tasty-hunit time transformers
-       ];
-       homepage = "http://github.com/Soostone/retry";
-       description = "Retry combinators for monadic actions that may fail";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "retry_0_7_6_2" = callPackage
     ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
      , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
      , tasty-hunit, time, transformers
@@ -175098,7 +174154,6 @@ self: {
        homepage = "http://github.com/Soostone/retry";
        description = "Retry combinators for monadic actions that may fail";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "retryer" = callPackage
@@ -176207,6 +175262,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "roku-api" = callPackage
+    ({ mkDerivation, base, bytestring, http-client, network, text, xml
+     , xml-extractors
+     }:
+     mkDerivation {
+       pname = "roku-api";
+       version = "0.1.0.0";
+       sha256 = "01vqmzqpdj40qxym3iapn1csr10ld9a9imci1pyncdly6q3a343c";
+       libraryHaskellDepends = [
+         base bytestring http-client network text xml xml-extractors
+       ];
+       description = "Bindings to Roku's External Control API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "roles" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -177425,6 +176495,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "s3-signer_0_4_0_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable
+     , bytestring, case-insensitive, cryptohash, http-types, time
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "s3-signer";
+       version = "0.4.0.0";
+       sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder byteable bytestring
+         case-insensitive cryptohash http-types time utf8-string
+       ];
+       testHaskellDepends = [ base blaze-builder bytestring time ];
+       doHaddock = false;
+       homepage = "https://github.com/dmjio/s3-signer";
+       description = "Pre-signed Amazon S3 URLs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
@@ -178426,33 +177517,6 @@ self: {
      }) {};
 
   "sbp" = callPackage
-    ({ mkDerivation, aeson, array, base, base64-bytestring
-     , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , resourcet, tasty, tasty-hunit, template-haskell, text, yaml
-     }:
-     mkDerivation {
-       pname = "sbp";
-       version = "2.3.9";
-       sha256 = "180krzjl9p1apm54qnna9xkj9451kah1ndix7c7g0if492a75qd6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
-         text
-       ];
-       executableHaskellDepends = [
-         aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra resourcet yaml
-       ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
-       homepage = "https://github.com/swift-nav/libsbp";
-       description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
-     }) {};
-
-  "sbp_2_3_13" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
@@ -178477,7 +177541,6 @@ self: {
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbp2udp" = callPackage
@@ -182088,23 +181151,6 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, hspec-discover
-     , http-types, lens, servant, text
-     }:
-     mkDerivation {
-       pname = "servant-foreign";
-       version = "0.11";
-       sha256 = "1n8cjlk16m24wdxicyp0js1lsshqf27bk5a6qykc2f8kiriw5jcf";
-       libraryHaskellDepends = [
-         base base-compat http-types lens servant text
-       ];
-       testHaskellDepends = [ base hspec servant ];
-       testToolDepends = [ hspec-discover ];
-       description = "Helpers for generating clients for servant APIs in any programming language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-foreign_0_11_1" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , http-types, lens, servant, text
      }:
@@ -182119,7 +181165,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generate" = callPackage
@@ -184043,8 +183088,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.5.0.10";
-       sha256 = "07dkzhig0c0rrqz9x7k2zv2m5b46l9p914j7758r5zb6vhlni94c";
+       version = "1.5.0.11";
+       sha256 = "1i7ijgy5n0lqzmmggsbf4vf55y3yxz2anlhrw6n3a4jsb4ram3lx";
        libraryHaskellDepends = [
          base binary dependency directory hashable hs2ats language-ats
          microlens microlens-th shake shake-ext text
@@ -184078,8 +183123,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.7.0.4";
-       sha256 = "0pgqjbiijsl9jb5dzwrmayn5vz2wy4jckkmrikycnqhglz1q8six";
+       version = "2.7.0.5";
+       sha256 = "1s69gvxjjn1s8smlhbrc1dvq1saivpslp7150xwavmxkiynp54lc";
        libraryHaskellDepends = [
          base Cabal composition-prelude directory shake template-haskell
        ];
@@ -184692,36 +183737,6 @@ self: {
      }) {};
 
   "shelly" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , enclosed-exceptions, exceptions, filepath, hspec, HUnit
-     , lifted-async, lifted-base, monad-control, mtl, process
-     , system-fileio, system-filepath, text, time, transformers
-     , transformers-base, unix-compat
-     }:
-     mkDerivation {
-       pname = "shelly";
-       version = "1.7.1";
-       sha256 = "068gabny23r9qs2fnn5vjyy77zi59c323ypmnmd71w7qwyfa2pl8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions lifted-async lifted-base monad-control mtl process
-         system-fileio system-filepath text time transformers
-         transformers-base unix-compat
-       ];
-       testHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions filepath hspec HUnit lifted-async lifted-base
-         monad-control mtl process system-fileio system-filepath text time
-         transformers transformers-base unix-compat
-       ];
-       homepage = "https://github.com/yesodweb/Shelly.hs";
-       description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shelly_1_7_2" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
      , HUnit, lifted-async, lifted-base, monad-control, mtl, process
@@ -184749,7 +183764,6 @@ self: {
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly-extra" = callPackage
@@ -186425,20 +185439,6 @@ self: {
      }) {inherit (pkgs.xorg) libXft;};
 
   "singleton-bool" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "singleton-bool";
-       version = "0.1.3";
-       sha256 = "1i29dl0f45rk280qfrcjcfbkshb7h3y0s2ndw2d7drwlcbl4p2if";
-       revision = "1";
-       editedCabalFile = "0wpwwqgrfgzi6cf4j1jpxwi8b30s80zch2xzcgzcmjmaai7kgc1n";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/phadej/singleton-bool#readme";
-       description = "Type level booleans";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singleton-bool_0_1_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "singleton-bool";
@@ -186448,7 +185448,6 @@ self: {
        homepage = "https://github.com/phadej/singleton-bool#readme";
        description = "Type level booleans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singleton-dict" = callPackage
@@ -188037,43 +187036,6 @@ self: {
      }) {};
 
   "snap-core" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
-     , case-insensitive, containers, deepseq, directory, filepath
-     , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
-     , network, network-uri, old-locale, parallel, QuickCheck, random
-     , readable, regex-posix, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector
-     , zlib
-     }:
-     mkDerivation {
-       pname = "snap-core";
-       version = "1.0.3.1";
-       sha256 = "0m2pbz7r5dllk859r8bs3yjkmdh4xrw0vafz390jfmj15vaz0j87";
-       revision = "1";
-       editedCabalFile = "0yf3i0pb14zff083cnz4lszg5bkbbzg5r1v3yj9s66dchrszrjbd";
-       libraryHaskellDepends = [
-         attoparsec base bytestring bytestring-builder case-insensitive
-         containers directory filepath hashable HUnit io-streams lifted-base
-         monad-control mtl network network-uri old-locale random readable
-         regex-posix text time transformers transformers-base unix-compat
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring bytestring-builder case-insensitive
-         containers deepseq directory filepath hashable HUnit io-streams
-         lifted-base monad-control mtl network network-uri old-locale
-         parallel QuickCheck random readable regex-posix test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         transformers transformers-base unix-compat unordered-containers
-         vector zlib
-       ];
-       homepage = "http://snapframework.com/";
-       description = "Snap: A Haskell Web Framework (core interfaces and types)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "snap-core_1_0_3_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , case-insensitive, containers, deepseq, directory, filepath
      , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
@@ -188106,7 +187068,6 @@ self: {
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-cors" = callPackage
@@ -192113,8 +191074,8 @@ self: {
        pname = "stache";
        version = "1.2.1";
        sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb";
-       revision = "3";
-       editedCabalFile = "0r7qx7h3lz6v5fvfkky7crw5ms8vszx0d8xlkr94xa9n7mxbndh3";
+       revision = "4";
+       editedCabalFile = "03qy0mlyiwpv98aq74m3pyarg6v6w9vn8qlq6ljdlb40xi1p9s7z";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -193395,8 +192356,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.1.3";
-       sha256 = "1sd36j3f7s8dlz2g6w1yir19yys4pn28arw4nlpknpm7dzm6vs1g";
+       version = "0.2.1.4";
+       sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194904,10 +193865,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.1.0";
-       sha256 = "1apw961n69rix4vvb7bsdald0w1qnal1vawi66nw64cyn696sbzi";
-       revision = "1";
-       editedCabalFile = "0cx4s17r2nn6xwa9lpcn7scvbqqxi6ihxyb20axhj5rim8iz94hm";
+       version = "0.1.1";
+       sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195615,25 +194574,6 @@ self: {
      }) {};
 
   "strive" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
-       version = "5.0.3";
-       sha256 = "1ins8aqxknnz9a00lb074f79ifd1r9lkkwdbx4ksy9cnnd3rnyl1";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [ base bytestring markdown-unlit time ];
-       homepage = "https://github.com/tfausak/strive#readme";
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_5_0_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
      , http-client, http-client-tls, http-types, markdown-unlit
      , template-haskell, text, time, transformers
@@ -195654,7 +194594,6 @@ self: {
        homepage = "https://github.com/tfausak/strive#readme";
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -196974,38 +195913,6 @@ self: {
      }) {};
 
   "swagger2" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
-     , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
-     , hashable, hspec, hspec-discover, http-media, HUnit
-     , insert-ordered-containers, lens, mtl, network, QuickCheck
-     , scientific, template-haskell, text, time, transformers
-     , transformers-compat, unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
-       version = "2.2";
-       sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6";
-       revision = "1";
-       editedCabalFile = "0dhs44zhb2yh4yxw88yvlijcd255ppm1ch7dz7pn7sdv1wr6kxq5";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers generics-sop hashable
-         http-media insert-ordered-containers lens mtl network scientific
-         template-haskell text time transformers transformers-compat
-         unordered-containers uuid-types vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring containers doctest Glob
-         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
-         text time unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/GetShopTV/swagger2";
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "swagger2_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
      , hashable, hspec, hspec-discover, http-media, HUnit
@@ -197034,7 +195941,6 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -197108,32 +196014,6 @@ self: {
      }) {};
 
   "swish" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, hashable
-     , HUnit, intern, mtl, network-uri, old-locale, polyparse
-     , semigroups, test-framework, test-framework-hunit, text, time
-     }:
-     mkDerivation {
-       pname = "swish";
-       version = "0.9.2.0";
-       sha256 = "0lgd71qa4fs9zzrapi0mkgsdlip5kxjkhz1v1xj6ifaaq8f2f8jp";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base containers directory filepath hashable intern mtl network-uri
-         old-locale polyparse semigroups text time
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers hashable HUnit network-uri old-locale semigroups
-         test-framework test-framework-hunit text time
-       ];
-       homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
-       description = "A semantic web toolkit";
-       license = "LGPL";
-     }) {};
-
-  "swish_0_9_2_1" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hashable
      , HUnit, intern, mtl, network-uri, old-locale, polyparse
      , semigroups, test-framework, test-framework-hunit, text, time
@@ -197157,7 +196037,6 @@ self: {
        homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
        description = "A semantic web toolkit";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sws" = callPackage
@@ -199660,18 +198539,6 @@ self: {
      }) {};
 
   "tasty-dejafu" = callPackage
-    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
-       version = "1.1.0.1";
-       sha256 = "0yqaplhwdyfg2wddz0yhzy6c7akpkhi0nkm62171wxfapzpjbbrk";
-       libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       homepage = "https://github.com/barrucadu/dejafu";
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_1_1_0_2" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
@@ -199681,7 +198548,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
@@ -199821,23 +198687,6 @@ self: {
      }) {};
 
   "tasty-hspec" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
-     , tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-hspec";
-       version = "1.1.3.3";
-       sha256 = "00ym5jlh11smmg3aryfylnwjbmi62gsy5jl1pv85bc8gl0kqa85d";
-       libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck tasty tasty-quickcheck
-         tasty-smallcheck
-       ];
-       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
-       description = "Hspec support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-hspec_1_1_4" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
      , tasty-quickcheck, tasty-smallcheck
      }:
@@ -199852,7 +198701,6 @@ self: {
        homepage = "https://github.com/mitchellwrosen/tasty-hspec";
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-html" = callPackage
@@ -204040,31 +202888,6 @@ self: {
      }) {};
 
   "threepenny-gui" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, deepseq, exceptions, file-embed, filepath, hashable
-     , network-uri, safe, snap-core, snap-server, stm, template-haskell
-     , text, transformers, unordered-containers, vault, vector
-     , websockets, websockets-snap
-     }:
-     mkDerivation {
-       pname = "threepenny-gui";
-       version = "0.8.2.2";
-       sha256 = "13s6n7pxbmr0j2g5xiqpacfnshqg0jq91y161rmmp3wix4bav6am";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers data-default deepseq
-         exceptions file-embed filepath hashable network-uri safe snap-core
-         snap-server stm template-haskell text transformers
-         unordered-containers vault vector websockets websockets-snap
-       ];
-       homepage = "http://wiki.haskell.org/Threepenny-gui";
-       description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threepenny-gui_0_8_2_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, file-embed, filepath, hashable
      , network-uri, safe, snap-core, snap-server, stm, template-haskell
@@ -204087,7 +202910,6 @@ self: {
        homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -205516,6 +204338,25 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "tinylog_0_14_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , double-conversion, fast-logger, text, transformers, unix-time
+     }:
+     mkDerivation {
+       pname = "tinylog";
+       version = "0.14.1";
+       sha256 = "01yz41l45qmc878gzhbchzkvr4ha2cfmvvjv31hwivgwgl8rcgni";
+       libraryHaskellDepends = [
+         base bytestring containers double-conversion fast-logger text
+         transformers unix-time
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://gitlab.com/twittner/tinylog/";
+       description = "Simplistic logging using fast-logger";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tinytemplate" = callPackage
     ({ mkDerivation, base, QuickCheck, text }:
      mkDerivation {
@@ -208438,29 +207279,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , semigroups, stm, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.5.6";
-       sha256 = "1cx25845i4n00xjb5dg9jg1p229nra0j5r2jwpwarra5c092df2p";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm system-fileio
-         system-filepath temporary text time transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_7" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -208481,7 +207299,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -209649,15 +208466,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "type-of-html_1_3_3_1" = callPackage
+  "type-of-html_1_3_3_2" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
      , double-conversion, ghc-prim, hspec, QuickCheck, random, text
      , weigh
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.3.3.1";
-       sha256 = "03js8d0sv31a7m1q49l64vp4fhxlgxbgsjllrpmlahzjkcprlj70";
+       version = "1.3.3.2";
+       sha256 = "0ah3j0r1yrqyrsg9blg0yxffjrikrlvi77d1cq368qmx3rnn5rnh";
        libraryHaskellDepends = [
          base bytestring double-conversion ghc-prim text
        ];
@@ -209871,26 +208688,6 @@ self: {
      }) {};
 
   "typed-process" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
-     , process, stm, temporary, transformers
-     }:
-     mkDerivation {
-       pname = "typed-process";
-       version = "0.2.1.0";
-       sha256 = "1l6wpkwnz4lriq1n0hxv3mdvzmrf44ddkb1ys8cyj3ywfn2xh56j";
-       libraryHaskellDepends = [
-         async base bytestring process stm transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring bytestring hspec process stm temporary
-         transformers
-       ];
-       homepage = "https://haskell-lang.org/library/typed-process";
-       description = "Run external processes, with strong typing of streams";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "typed-process_0_2_2_0" = callPackage
     ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
      , process, stm, temporary, transformers
      }:
@@ -209908,7 +208705,6 @@ self: {
        homepage = "https://haskell-lang.org/library/typed-process";
        description = "Run external processes, with strong typing of streams";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -210236,34 +209032,6 @@ self: {
      }) {};
 
   "tz" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, thyme, time, timezone-olson, timezone-series
-     , tzdata, vector
-     }:
-     mkDerivation {
-       pname = "tz";
-       version = "0.1.3.0";
-       sha256 = "1h2w9pswfbnzpdm30xpgknhvfb1vs8ipyczpslrbsv6v6xhqh44p";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-default deepseq
-         template-haskell time tzdata vector
-       ];
-       testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th time tzdata
-       ];
-       benchmarkHaskellDepends = [
-         base criterion lens thyme time timezone-olson timezone-series
-       ];
-       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
-       homepage = "https://github.com/nilcons/haskell-tz";
-       description = "Efficient time zone handling";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tz_0_1_3_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -210289,7 +209057,6 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = callPackage
@@ -211369,6 +210136,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uniprot-kb" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, neat-interpolation
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "uniprot-kb";
+       version = "0.1.0.1";
+       sha256 = "037scgl1g4754vw5fnz7bqfwd24i9mrk2l87hkpd841ln5v7j0hi";
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
+         attoparsec base hspec neat-interpolation QuickCheck text
+       ];
+       homepage = "https://github.com/biocad/uniprot-kb#readme";
+       description = "UniProt-KB format parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "uniq-deep" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -211959,27 +210743,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
-     , process, stm, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.5.0";
-       sha256 = "0c08i5vnhjw28i321dpjap1a9jz3g85gq2zm39v8pl6w89ilcq81";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath process stm transformers unix
-         unliftio-core
-       ];
-       testHaskellDepends = [
-         async base deepseq directory filepath hspec process stm
-         transformers unix unliftio-core
-       ];
-       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_6_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, time, transformers, unix, unliftio-core
      }:
@@ -211998,7 +210761,6 @@ self: {
        homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -212943,22 +211705,6 @@ self: {
      }) {};
 
   "userid" = callPackage
-    ({ mkDerivation, aeson, base, boomerang, cereal, safecopy
-     , web-routes, web-routes-th
-     }:
-     mkDerivation {
-       pname = "userid";
-       version = "0.1.3.1";
-       sha256 = "12alrvzh1z15md5gbvci58xffw35g4626qr30v7cz6sz4pplfnb9";
-       libraryHaskellDepends = [
-         aeson base boomerang cereal safecopy web-routes web-routes-th
-       ];
-       homepage = "http://www.github.com/Happstack/userid";
-       description = "The UserId type and useful instances for web development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "userid_0_1_3_2" = callPackage
     ({ mkDerivation, aeson, base, boomerang, cereal, safecopy
      , web-routes, web-routes-th
      }:
@@ -212972,7 +211718,6 @@ self: {
        homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "users" = callPackage
@@ -215010,23 +213755,6 @@ self: {
      }) {};
 
   "versions" = callPackage
-    ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec
-     , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "versions";
-       version = "3.3.1";
-       sha256 = "0d94gkhx8b1w34mw05sidwvmysyb1z3p985nrrfaqzsp4xjqg0h4";
-       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
-       testHaskellDepends = [
-         base checkers microlens QuickCheck tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Types and parsers for software version numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "versions_3_3_2" = callPackage
     ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec
      , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
      }:
@@ -215041,7 +213769,6 @@ self: {
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vgrep" = callPackage
@@ -215999,25 +214726,6 @@ self: {
      }) {};
 
   "wai" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring
-     , bytestring-builder, hspec, http-types, network, text
-     , transformers, vault
-     }:
-     mkDerivation {
-       pname = "wai";
-       version = "3.2.1.1";
-       sha256 = "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring bytestring-builder http-types network
-         text transformers vault
-       ];
-       testHaskellDepends = [ base blaze-builder bytestring hspec ];
-       homepage = "https://github.com/yesodweb/wai";
-       description = "Web Application Interface";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai_3_2_1_2" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hspec-discover
      , http-types, network, text, transformers, vault
      }:
@@ -216033,7 +214741,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -216088,40 +214795,6 @@ self: {
      }) {};
 
   "wai-app-static" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
-     , bytestring, containers, cryptonite, directory, file-embed
-     , filepath, hspec, http-date, http-types, memory, mime-types
-     , mockery, network, old-locale, optparse-applicative
-     , template-haskell, temporary, text, time, transformers
-     , unix-compat, unordered-containers, wai, wai-extra, warp, zlib
-     }:
-     mkDerivation {
-       pname = "wai-app-static";
-       version = "3.1.6.1";
-       sha256 = "0s36i0ca440l78d35isaam98z9x0dc0llx0ry48r901f3vrsq65k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder blaze-html blaze-markup bytestring containers
-         cryptonite directory file-embed filepath http-date http-types
-         memory mime-types old-locale optparse-applicative template-haskell
-         text time transformers unix-compat unordered-containers wai
-         wai-extra warp zlib
-       ];
-       executableHaskellDepends = [
-         base bytestring containers directory mime-types text
-       ];
-       testHaskellDepends = [
-         base bytestring filepath hspec http-date http-types mime-types
-         mockery network old-locale temporary text time transformers
-         unix-compat wai wai-extra zlib
-       ];
-       homepage = "http://www.yesodweb.com/book/web-application-interface";
-       description = "WAI application for static serving";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-app-static_3_1_6_2" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, cryptonite, directory, file-embed, filepath, hspec
      , http-date, http-types, memory, mime-types, mockery, network
@@ -216153,7 +214826,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-cli" = callPackage
@@ -216176,22 +214848,6 @@ self: {
      }) {};
 
   "wai-conduit" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, conduit
-     , http-types, transformers, wai
-     }:
-     mkDerivation {
-       pname = "wai-conduit";
-       version = "3.0.0.3";
-       sha256 = "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring conduit http-types transformers wai
-       ];
-       homepage = "https://github.com/yesodweb/wai";
-       description = "conduit wrappers for WAI";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-conduit_3_0_0_4" = callPackage
     ({ mkDerivation, base, bytestring, conduit, http-types
      , transformers, wai
      }:
@@ -216205,7 +214861,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "conduit wrappers for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-cors" = callPackage
@@ -217712,31 +216367,6 @@ self: {
      }) {};
 
   "wai-websockets" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
-     , file-embed, http-types, network, text, transformers, wai
-     , wai-app-static, warp, websockets
-     }:
-     mkDerivation {
-       pname = "wai-websockets";
-       version = "3.0.1.1";
-       sha256 = "0ccasczm9x8sx6bpywd8ga3qji2rqkz1l2fy856qz7jdazmazgka";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring case-insensitive http-types network
-         transformers wai websockets
-       ];
-       executableHaskellDepends = [
-         base blaze-builder bytestring case-insensitive file-embed
-         http-types network text transformers wai wai-app-static warp
-         websockets
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "Provide a bridge between WAI and the websockets package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-websockets_3_0_1_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, file-embed
      , http-types, network, text, transformers, wai, wai-app-static
      , warp, websockets
@@ -217758,7 +216388,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wait-handle" = callPackage
@@ -217896,41 +216525,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
-       version = "3.2.18.1";
-       sha256 = "15narz2dawzqmc8sys9cigg2dnn4a681cn07cgnpbvlyadwi5bpn";
-       libraryHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base blaze-builder bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client http-date http-types http2 HUnit iproute
-         lifted-base network process QuickCheck silently simple-sendfile stm
-         streaming-commons text time transformers unix unix-compat vault wai
-         word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_18_2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -217963,7 +216557,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -218443,27 +217036,6 @@ self: {
      }) {};
 
   "web-routes" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, exceptions
-     , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
-     , split, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "web-routes";
-       version = "0.27.14";
-       sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak";
-       revision = "1";
-       editedCabalFile = "061kp8rpmbpr9f9n3kja8160z209hwz42yy3kikn6b446rdc4pdr";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring exceptions ghc-prim http-types mtl
-         parsec split text utf8-string
-       ];
-       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
-       homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
-       description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes_0_27_14_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, exceptions
      , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
      , split, text, utf8-string
@@ -218480,7 +217052,6 @@ self: {
        homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-boomerang" = callPackage
@@ -221201,21 +219772,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.6";
-       sha256 = "1g2k48mngg8fr6cvkimjr39jc83b87lva0320bwdnf19nyz1fy9y";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       homepage = "https://github.com/tfausak/wuss#readme";
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_8" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -221228,7 +219784,6 @@ self: {
        homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -222951,27 +221506,6 @@ self: {
      }) {};
 
   "xmlgen" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers
-     , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
-     , unix
-     }:
-     mkDerivation {
-       pname = "xmlgen";
-       version = "0.6.2.1";
-       sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers mtl text
-       ];
-       testHaskellDepends = [
-         base bytestring containers filepath HUnit hxt process QuickCheck
-         text unix
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion text ];
-       description = "Fast XML generation library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xmlgen_0_6_2_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
      , unix
@@ -222990,7 +221524,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Fast XML generation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmlhtml" = callPackage
@@ -223948,6 +222481,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_29" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
+     , mockery, resourcet, scientific, semigroups, template-haskell
+     , temporary, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.29";
+       sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring conduit directory hspec HUnit
+         mockery resourcet temporary text transformers unordered-containers
+         vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -228582,27 +227145,6 @@ self: {
      }) {};
 
   "ztail" = callPackage
-    ({ mkDerivation, array, base, bytestring, filepath, hinotify
-     , process, regex-posix, time, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ztail";
-       version = "1.2";
-       sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk";
-       revision = "4";
-       editedCabalFile = "1x8vaflxrmkwqig8wvbbkc761l52y5h45sclnidm5zmwxrv1j3zd";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         array base bytestring filepath hinotify process regex-posix time
-         unix unordered-containers
-       ];
-       description = "Multi-file, colored, filtered log tailer";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ztail_1_2_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, filepath, hinotify
      , process, regex-posix, time, unix, unordered-containers
      }:

From 5dd264af4201e06b86f75b9a2fa46ffffa1b2351 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Mar 2018 11:59:30 +0200
Subject: [PATCH 140/170] haskell-getopt-generics: drop obsolete override for
 GHC 8.4.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b2914766d16..9b9b1ca8e04 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -628,7 +628,6 @@ self: super: {
 
   # Older versions don't compile.
   brick = self.brick_0_35_1;
-  getopt-generics = self.getopt-generics_0_13_0_2;
   HaTeX = self.HaTeX_3_19_0_0;
   json = self.json_0_9_2;
   matrix = self.matrix_0_3_6_1;

From 234c42b8e6a705048765cf122fd858f7e35a82df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Mar 2018 12:00:10 +0200
Subject: [PATCH 141/170] haskell-json: drop obsolete override for GHC 8.4.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9b9b1ca8e04..11de2835422 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -629,7 +629,6 @@ self: super: {
   # Older versions don't compile.
   brick = self.brick_0_35_1;
   HaTeX = self.HaTeX_3_19_0_0;
-  json = self.json_0_9_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_1_3;
   pandoc-types = self.pandoc-types_1_17_4_2;

From dddf0314bc0b08e863628ab756ffe37c20f1985a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 25 Mar 2018 16:29:44 -0400
Subject: [PATCH 142/170] haskell-hnix: jailbreak deriving-compat dependency

Reported as https://github.com/jwiegley/hnix/issues/98
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 22e2e5cc722..71d7f96aa85 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -244,6 +244,8 @@ self: super: {
   # base bound
   digit = doJailbreak super.digit;
 
+  # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
+  hnix = doJailbreak super.hnix;
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;

From 8cc6897ae9fc80e0c3933ff13f15c2f240c00c6e Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 27 Mar 2018 20:08:48 +0100
Subject: [PATCH 143/170] buildRustCrate: fix equality testing

Use string equality instead of integer equality.
---
 pkgs/build-support/rust/build-rust-crate.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 8a9a07fd7a8..75563e34c38 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -19,7 +19,7 @@ let makeDeps = dependencies:
       echo_build_heading() {
        start=""
        end=""
-       if [[ x"${colors}" -eq x"always" ]]; then
+       if [[ x"${colors}" = x"always" ]]; then
          start="$(printf '\033[0;1;32m')" #set bold, and set green.
          end="$(printf '\033[0m')" #returns to "normal"
        fi
@@ -34,7 +34,7 @@ let makeDeps = dependencies:
       noisily() {
         start=""
         end=""
-        if [[ x"${colors}" -eq x"always" ]]; then
+        if [[ x"${colors}" = x"always" ]]; then
           start="$(printf '\033[0;1;32m')" #set bold, and set green.
           end="$(printf '\033[0m')" #returns to "normal"
         fi
@@ -194,7 +194,7 @@ let makeDeps = dependencies:
       bold=""
       green=""
       boldgreen=""
-      if [[ "${colors}" -eq "always" ]]; then
+      if [[ "${colors}" = "always" ]]; then
         norm="$(printf '\033[0m')" #returns to "normal"
         bold="$(printf '\033[0;1m')" #set bold
         green="$(printf '\033[0;32m')" #set green
@@ -230,7 +230,7 @@ let makeDeps = dependencies:
           ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
           $LINK ${deps}$EXTRA_LIB --cap-lints allow \
           $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
-        if [ "$crate_name_" -ne "$crate_name" ]; then
+        if [ "$crate_name_" != "$crate_name" ]; then
           mv target/bin/$crate_name_ target/bin/$crate_name
         fi
       }

From 4bf9b4a328e2f8e34be4da1732206a85a2900855 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 27 Mar 2018 19:36:12 +0200
Subject: [PATCH 144/170] openssl: 1.0.2n -> 1.0.2o (fixes CVE-2017-3738,
 CVE-2018-0739)

Announcement can be found at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index af6a540b97c..b029615d792 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -113,8 +113,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2n";
-    sha256 = "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp";
+    version = "1.0.2o";
+    sha256 = "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc";
   };
 
   openssl_1_1_0 = common {

From 72110322c089fc850347f86d7a45053e6b2de7b2 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 27 Mar 2018 19:40:12 +0200
Subject: [PATCH 145/170] openssl_1_1_0: 1.1.0g -> 1.1.0h (fixes CVE-2018-0739,
 CVE-2017-3738)

Also fixes CVE-2018-0733 but we do not support HP-UX to my knowledge :-)

Announcement at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt
---
 pkgs/development/libraries/openssl/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index b029615d792..5a9052222cb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -118,15 +118,8 @@ in {
   };
 
   openssl_1_1_0 = common {
-    version = "1.1.0g";
-    sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy";
-    patches = [
-      (fetchpatch {
-        name = "CVE-2017-3738.patch";
-        url = "https://github.com/openssl/openssl/commit/563066.patch";
-        sha256 = "0ni9fwpxf8raw8b58pfa15akbqmxx4q64v0ldsm4b9dqhbxf8mkz";
-      })
-    ];
+    version = "1.1.0h";
+    sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq";
   };
 
 }

From 73a7d67795654d35647d217d6d1d3cb0f9cf0899 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 27 Mar 2018 22:06:13 +0200
Subject: [PATCH 146/170] firefox: 59.0.1 -> 59.0.2

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 19a16dfe3a2..897575e4908 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -18,10 +18,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "59.0.1";
+    version = "59.0.2";
     src = fetchurl {
-      url = "https://hg.mozilla.org/releases/mozilla-release/archive/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2";
-      sha512 = "3da3gmfv2aalsbsx15csas4mwnvlliy1q081sd2riz3nvxr7qyrdx1qvxj4gdr97wlmvz7mig9djhh5gwx7ddah5hfhj23cvccmw6jw";
+      url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2";
+      sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv";
     };
 
     patches = nixpkgsPatches ++ [

From 5ed0ae686b7fca2718076ef7c5ad58c9a44aefcc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 27 Mar 2018 01:27:32 -0500
Subject: [PATCH 147/170] slim: musl patch

---
 pkgs/applications/display-managers/slim/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 5d06c2221b3..5160e02963f 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
+{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
 , fontconfig, freetype, pam, dbus_libs, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,10 @@ stdenv.mkDerivation rec {
       # Allow to set logfile to a special "/dev/stderr" in order to continue
       # logging to stderr and thus to the journal.
       ./no-logfile.patch
-    ];
+    ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+      url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch";
+      sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm";
+    });
 
   preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
 

From 0b53d63dad1ea50512dde126c3c3b46de59c4cce Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 25 Mar 2018 18:26:39 +0000
Subject: [PATCH 148/170] ocamlPackages.lwt3: 3.0.0 -> 3.3.0

---
 .../development/ocaml-modules/lwt/default.nix | 69 +++++++------------
 pkgs/development/ocaml-modules/lwt/legacy.nix | 57 +++++++++++++++
 pkgs/top-level/ocaml-packages.nix             | 10 +--
 3 files changed, 86 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/lwt/legacy.nix

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 53ba904f628..37bcff375ea 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,57 +1,36 @@
-{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
-, react, ssl, libev, pkgconfig, ncurses, glib
-, ppx_tools, result, cppo
-, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
-, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
+{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
+, ocaml, findlib, camlp4, cppo
+, ocaml-migrate-parsetree, ppx_tools_versioned, result
 }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4"
-then throw "lwt is not available for OCaml ${ocaml.version}"
-else
-
-let sha256 = {
-  "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
-  "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
-  "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
-}."${version}"; in
-
-let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in
-
-buildOcaml rec {
-  name = "lwt";
-  inherit version;
+stdenv.mkDerivation rec {
+  version = "3.3.0";
+  name = "ocaml${ocaml.version}-lwt-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
-    inherit sha256;
+    sha256 = "0n87hcyl4svy0risj439wyfq6bl77qxq3nraqgdr1qbz5lskbq2j";
   };
 
+  preConfigure = ''
+    ocaml src/util/configure.ml -use-libev true -use-camlp4 true
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
-  ++ stdenv.lib.optional ppxSupport ppx_tools;
+  buildInputs = [ ncurses ocaml findlib jbuilder camlp4 cppo
+    ocaml-migrate-parsetree ppx_tools_versioned ];
+  propagatedBuildInputs = [ libev result ];
 
-  propagatedBuildInputs = [ result ]
-  ++ optionals [ react ssl ]
-  ++ [ libev ];
+  installPhase = ''
+    ocaml src/util/install_filter.ml
+    ${jbuilder.installPhase}
+  '';
 
-  configureScript = "ocaml setup.ml -configure";
-  prefixKey = "--prefix ";
-  configureFlags =
-  optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ]
-  ++ [ "--enable-camlp4" ]
-  ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ];
-
-  createFindlibDestdir = true;
-
-  hasSharedObjects = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://ocsigen.org/lwt;
-    description = "Lightweight thread library for Objective Caml";
-    license = licenses.lgpl21;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = with maintainers; [
-      z77z vbgl gal_bolle
-    ];
+  meta = {
+    homepage = "https://ocsigen.org/lwt/";
+    description = "A cooperative threads library for OCaml";
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = stdenv.lib.licenses.lgpl21;
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix
new file mode 100644
index 00000000000..53ba904f628
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lwt/legacy.nix
@@ -0,0 +1,57 @@
+{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
+, react, ssl, libev, pkgconfig, ncurses, glib
+, ppx_tools, result, cppo
+, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
+, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4"
+then throw "lwt is not available for OCaml ${ocaml.version}"
+else
+
+let sha256 = {
+  "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
+  "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
+  "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
+}."${version}"; in
+
+let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in
+
+buildOcaml rec {
+  name = "lwt";
+  inherit version;
+
+  src = fetchzip {
+    url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
+  ++ stdenv.lib.optional ppxSupport ppx_tools;
+
+  propagatedBuildInputs = [ result ]
+  ++ optionals [ react ssl ]
+  ++ [ libev ];
+
+  configureScript = "ocaml setup.ml -configure";
+  prefixKey = "--prefix ";
+  configureFlags =
+  optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ]
+  ++ [ "--enable-camlp4" ]
+  ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ];
+
+  createFindlibDestdir = true;
+
+  hasSharedObjects = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://ocsigen.org/lwt;
+    description = "Lightweight thread library for Objective Caml";
+    license = licenses.lgpl21;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [
+      z77z vbgl gal_bolle
+    ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 65d3de2d9e2..5c2ec39ade7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -366,12 +366,10 @@ let
 
     lru = callPackage ../development/ocaml-modules/lru { };
 
-    lwt2 = callPackage ../development/ocaml-modules/lwt { };
+    lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { };
 
     lwt3 = if lib.versionOlder "4.02" ocaml.version
-      then callPackage ../development/ocaml-modules/lwt {
-        version = "3.0.0";
-      }
+      then callPackage ../development/ocaml-modules/lwt { }
       else throw "lwt3 is not available for OCaml ${ocaml.version}";
 
     ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
@@ -650,7 +648,9 @@ let
 
     ssl = callPackage ../development/ocaml-modules/ssl { };
 
-    stog = callPackage ../applications/misc/stog { };
+    stog = callPackage ../applications/misc/stog {
+      ocaml_lwt = lwt2;
+    };
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
 

From be48c2effc058bb9319d2c920204548439117646 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Mar 2018 20:34:08 +0000
Subject: [PATCH 149/170] ocamlPackages.lwt_ppx: init at 3.3.0

---
 pkgs/development/ocaml-modules/lwt/ppx.nix | 19 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix          |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/lwt/ppx.nix

diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix
new file mode 100644
index 00000000000..3cf08d06f1e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lwt/ppx.nix
@@ -0,0 +1,19 @@
+{ stdenv, jbuilder, ocaml, findlib, lwt, ppx_tools_versioned }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}";
+
+  inherit (lwt) src;
+
+  buildInputs = [ jbuilder ocaml findlib ppx_tools_versioned ];
+
+  propagatedBuildInputs = [ lwt ];
+
+  buildPhase = "jbuilder build -p lwt_ppx";
+  installPhase = "${jbuilder.installPhase} lwt_ppx.install";
+
+  meta = {
+    description = "Ppx syntax extension for Lwt";
+    inherit (lwt.meta) license platforms homepage maintainers;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5c2ec39ade7..7ac8508d889 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -374,6 +374,10 @@ let
 
     ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
 
+    lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix {
+      lwt = lwt3;
+    };
+
     lwt_react = callPackage ../development/ocaml-modules/lwt_react {
       lwt = lwt3;
     };

From 1874f09c40bb664470198a8cffa45bab1d31fccc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Mar 2018 20:34:15 +0000
Subject: [PATCH 150/170] flow: 0.66.0 -> 0.68.0

---
 pkgs/development/tools/analysis/flow/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 4a2d298495d..dbe19935d62 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices,
-  findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }:
+  findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.66.0";
+  version = "0.68.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0l1sdd1n0llmz8m81vym3zhcn824sr9w46h9jpb7i7wrcm4y410d";
+    sha256 = "0wags0msk7s1z3gi6ns6d7zdpqk8wh5ryafvdyk6zwqwhaqgr5jw";
   };
 
   installPhase = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt wtf8 dtoa
+    ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa
   ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be6957c7a57..8e7bf14f224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7780,7 +7780,7 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
-    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt
+    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx
       wtf8 dtoa;
   };
 

From b353ff944a4724c09cb5aca380cce37ecc2dd5f0 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 27 Mar 2018 22:28:58 +0100
Subject: [PATCH 151/170] linuxPackages.ena: 1.5.0 -> 1.5.2

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

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 9ed691d69f0..e3f382ababc 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.0";
+  version = "1.5.2";
   name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "ena_linux_${version}";
-    sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj";
+    sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm";
   };
 
   hardeningDisable = [ "pic" ];

From 24a2c3fe58d712617eff1dd6aa078ba0a26e3127 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 28 Mar 2018 00:18:18 +0200
Subject: [PATCH 152/170] firefox-esr: 52.7.2esr -> 52.7.3esr

Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 897575e4908..9aa17c3d2d0 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -41,10 +41,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.7.2esr";
+    version = "52.7.3esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "e275fd10fd32a0dc237135af3395e3a1ae501844632c973ff3b9bca1456702ee36dbee99fc57300598403c924c0db63bd62a199845c8f4a2e29db5d1e5973395";
+      sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw";
     };
 
     patches = nixpkgsPatches;

From 6abbe39551bba6a0b201e313bda291b0ce33f95c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 28 Mar 2018 00:27:17 +0200
Subject: [PATCH 153/170] firefox-bin: 59.0.1 -> 59.0.2

Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/
---
 .../browsers/firefox-bin/release_sources.nix  | 778 +++++++++---------
 1 file changed, 389 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 851c95fb1a2..3dd7d9e8e65 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
 {
-  version = "59.0.1";
+  version = "59.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ach/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "b982f2bd54312d66b7a1d6d6e775bad21eb1bce3bbe161cf980d03e55d4bfb5eaa217b05c16c72cd55165cdf7ee409c2e0a56143a82374f66c67609fed1464ae";
+      sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/af/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "fbafd3dcfc473b7ebc0d6230cff487819c37b6f41135060cceca72e8704afa147edf71405c1367137bab6c8013fdd98ad487bd7039a291f64b0b37eb468d5b18";
+      sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/an/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b7cf1261c2e776874ecb7c709d82f288e74d16770acd3215fbdcf44f6167544e626c1f809e4d68dac7a040e0dacba0095d24c1994fe329e5613c7a561ad652f2";
+      sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ar/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "16e308336b1ea37bc7aa18184e30eee4f1a073bc1dfe009c515a338f6412de6ad19ce96653cd58aa99d4ca34476e16693c03b01b7d5b1df3154ecab58fca157b";
+      sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/as/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "a6de3e421126adf95a02911db3140791c5a5dc9030e63327fbafd5fa3f5d6d81f4d62fa705c84a573788840e921ea1ab71e52d08df443405a6c8b2e69773e76b";
+      sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ast/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "2bd15deae2a01d09a622df87ce5329adb5d5da2e76dce678aaee202eec2a7ddd0ae79de205d3dabbcd189fbd3aa5293ee551c31bb3850b3cd7e5c02d73862548";
+      sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/az/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "ba021c1531fbcc1c7f4b44f798d0046c39b2578fb4fa8f81927f7a4bb3a3e8b3d7de545bb2d818cfe1c095cb4387477d05541b5e5021c56086a700e8cf928b64";
+      sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/be/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "ba5ac2b182f9534825468829b62359f5c24a2cfcfc0e27ff47469b814f746240155ceb228bb7fdf1855e378048806b70106bc0a3999b0cc2d4f69b28f7565784";
+      sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bg/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "a1aff58b327ffa5dc62975e31e59306350bc8b4a2b38e5993aea4ca70fd4c0e295b7e25a8deafc9d354fc674d8c55ae917a110bfa832f54fd0067f4e2f35dd71";
+      sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-BD/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "fe96f073482488f66f0b7a46852d763212e444c80cba0f495e275b4c73711374949d742bd8ca0c69cb9e662e71b13b28084c004b3530f702445796d7c1716f0d";
+      sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bn-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "31d8f589ec72a8ff3315fec3bcf9894ff6590768f2c380313c38efa2106bbc71bd11d54b553eca568cee0a7768f0e57b3ef8038d14ae2615fa1160145b123cb0";
+      sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/br/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7ed8310521f981a4ff75037198a9bcde4fa07077c298c43f5baf532e84be017d604d27d59ae38c10d0c422a1cc793652c148e7c3944171044f4e9f267b64993b";
+      sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/bs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "7ce16040b19d61d39936fd220351d6dce0210aa0edc0494d1956d1f19d7e027cb2d8d100940bbc34a77f05d305a5af3708d16bc78bd9b2364407bdb71ff05052";
+      sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ca/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "8f8ec749c55c4dd930d3e359b9a3003edddfb6ca36f6f65f0119d0049b09a4c3cbaf558178a327583769fafa2d64272099882833e2ef7d6956b606c05f8a6b76";
+      sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cak/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "41f6ae5d0aa44b90724e578d51ad7a3d6903dd74d30957a8786cddbd3ae427da0a453c1504a11ff13ab9dbb350829c1928d27ca0ec67e94995346e1414109e26";
+      sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "e219ec91c7346a72b64503f89088554f8d322968fbed0ff764d90df53fac06d4febf407773192530ad98d6c51dea23fb7c5f07e2b9099c736759a3b60b8b0a48";
+      sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/cy/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c6650b47193449b28e1d9f6420b59c1235986ececcf724234e26fd8168f52120274d3d8acd8aba036c494393eb635c0ccd68833a1961a36a10b04b1a1050bd7a";
+      sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/da/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b66299d7f65fdde01b644a21524635806c703df27cb4eff928189d65285f12140926e8d20d1f83b54263b8b17b7621034ac1da5867fd28d36b2733212c9b65ab";
+      sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/de/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "463ebdafacbe1eb4d0df9d4843ceb41849fc2680404e1e5f4af563bcd4fc4410f8cb212a396ccfca874c37a4cb245bfef8de4aa9620d3e30908f1c94d262cf71";
+      sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/dsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "947dbe47ad286c57a62557532232a5e833cc6f7b6295699415c727bc30cd1cd67074a568c1f842e3e7b95460595b16b0a9c87e94f38a37f22b5e8db82a3a4932";
+      sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/el/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b0d5015676280816cde17b217e078c8b912aaa87167317393c0c20b8ebb27460ead4a4656587bda19b93fcf4362e07ce11a0f5410cee733ab44bc2b1f0a1f093";
+      sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-GB/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "94864d56052d619d495c527af0941979470a3c7410e51c01e5a04be565a62a29a6055eaaa9f5b4bd6b443fb87702f52c935b3071b4ddccaf97a494fc2256728f";
+      sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-US/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ef8c7518bc9abd2f730efa428ccc418410c7c571b32c06633ecf82c949aeb3e4006d888362ab511d55db98ee2d6e152f9ed7cecdd976272c89f8cc5957c9132e";
+      sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/en-ZA/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "7e172fd957b000d77e4ff832ebbbf6b46a192668289394370ec95f12e5f319cee59da140bb3a809bcb7e161349c32f682083e7639bfb3f6fa5cab53ac4f33716";
+      sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eo/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "369e76a861625bc9e757980c896fbd1563e5127ce770557aa7e81cd80040146af62c526ab148168b2a078a9c16432e97e96ca4fffa5db5945c3475353cfc894f";
+      sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-AR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "a053bba1fb77617ccd9b2bb1595ebaf040760307dedc9984d3ccf5212f572835f9463611f38bce684e71728b04c4d3e484cbe6c20875b0703d39c3fdcddc6cec";
+      sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-CL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "618eb3fef5f3669bc104ba60b76cf280503bbb4f2700341e95a6024fb3113c56388fcfeca294e3fffa3af5db15d639c0e7613397505c63509d7f248e7a1825e2";
+      sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-ES/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "f8fa78438bf7561d422d9187b16c1284df2a79c6f8cfdbdcd838501b5f2fca1d2e05bfad6d59b9484f46e4dabd2630706a8c47f3323534e24ef4c8fbc4937a56";
+      sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/es-MX/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "4dfc8c70cfd5eca191ed4feaaf8c4dcf2dadfd7226f1ebd939997e8bdcd7d867afe0c27a51cf5d578c380665023770b2e54110dc2af78ca63a2a38165d879665";
+      sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/et/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "9710192f0c87ebbbd68bf336f1560007a86f9c9d55ee3df7311725f7c81e1415f5d5346378fc86424cf1d94e51efcaf791318f040c3652132dacce59a8c2668b";
+      sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/eu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "47a76627b97b2190f532ac82a6684787a6cd45f4f831b2af6315e6242367af68f84be7965cb6d91df89d8e43d04655c0e41231eff0b86cf329ffff5b26a56dc4";
+      sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fa/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "3a888e43b737998938a624003c6eca6362aad95d0e13203d655d67c4b76c69484240da43d00e24a809e1fa40b18249c9549d52794f9cd92469a028ddb4b585ec";
+      sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ff/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "365b907bb5d720874d206cc2fd3e6f21095ea1681a0bff5ffe51b49135bb3b3984e5cbb0a50951afc5bab3ef2bd2ea55af29912d25dba8f4680bf6bc25f24b05";
+      sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "9361b0554f221e13c4146f9eb0df4af64625062a368ff828d80350e932ef0bf6f9cd87e3399bdb42ca5e7ca0dfaec9357d57a345a978ff936958ddd074ac6c67";
+      sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "61123f188e491c32e9b912026554afee17d83ed8bb3480bc6ed8f10f46049e81f2444f6850c5a9f7841f9e897311ac0955105401fd2661ee703243c6e204fd60";
+      sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/fy-NL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "4575949552f1e0951d75b2f3eae5a6ea5fbbc6b69f0ba5d82b69922209a46b8f9701112cd1dd61b6c892eb1f4e6463e28874f3f84891e3eca3de0b52036ad429";
+      sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ga-IE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "4a05d48803502ee435ea3b50f38ed262aa57048b0f013c7165af37ad44494a1aae7f643e14d5aaaf7a2d5a1085a67a078e70ade9e614bfe33295351686661ccd";
+      sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gd/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "df9dcc72aacd44ecf73f0ddc34a6d97dafc9deddb35075273c2b958b2c23ce3a346433b050766f8b83040c495c2a84b454cd7742cdf6b59b69894a94553c21c0";
+      sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "3f55336a02249aa06674adbe8f378ad2b1a7b99164608f04cefe8c642ecffd336f9f370fcc190debeb89f97f630032d41aacb46e03cfd09a9a20bdf5f207312d";
+      sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "9bdb650bb25ad573a5722595d7b062b370d79ef6a9079354ee467ae8fdb8e319d3b666bef0569286a868e7d64453b2c69098945539a259184334910f70914211";
+      sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/gu-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "5f2621253981d58aa643da76dadae44da76bad3f50d08c35c43d52da5b0a8521ee4c5df5262558edb4b2bd817985aa02d6ff908f326d99ea58dd4d96b9f04819";
+      sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/he/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "ba7b0bedc2f8146dddb7f0a8a2c357dea4d23481e85f23e5d1f820da6b9c6ea84298ef609967e62741a2f9b57a6c4e94b0a90896daccb80b888313c75359879a";
+      sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hi-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "7804c9b6bab169fda70db8ff3f638add9fc22a6b8f9adde30482558e97d32946085258bfdf93b0e67a35709c474fb3aa028816e7f501dd554ef05a282f656815";
+      sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "e97cd1b68d5a1d471edfddedbc05321444880dc9ad2910010c447515ace632c25b0516ca1dbd529d44777c8f9046b5a660a768bdb35ac5e199d1685724c6a7ef";
+      sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "098842a0e8226eee716859b7e1bd1919a2bd251bc368ff6df58c95b556dc503f15186bb483503087a7e02d785453edc77d081e267b08487c0ff874361a82ee1d";
+      sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "cd6846f6268d96f84d405aac06c11322e188da3124ad848faaaaac7cd562c004655a8f7732294b0ce2ca42597c82d82fe8b1eb65dc5b0b659f7be342aec648ca";
+      sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/hy-AM/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "3e4f4f536c4dbd4337e301272fd433e4e0ea26976f2a5add8a0d90f310e2c3fb14a4b558c556214409788bc2be09d36bdbf95bc5385260b70408f00ec71c30da";
+      sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ia/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "35adfd5eaaeb3d40e32d501ff49979e4db878b6fab5598d64c3943cf57f846e439ef88693b39a03df65367436ce3efada9c367ee5de20a1d769620b00299bbaf";
+      sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/id/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3203f599f6ed436280143aaa563780c64864488f125462a56241785f9e7d6d48b2d3fadd0366fee131d575d8dadc8ca4820716a03de4c3b23eb0f0b033cc73f3";
+      sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/is/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2100f728268efc1d2c0f96e745e2574847aa844ef4366dab44f9f0d89e79372a2180d530c7fdfe627e17644871b3a71387037057058a0ebd117e187343b5d1fc";
+      sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/it/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "abef6687c0e0b90f9857e29d5b82ded6dbc0b304dcabf2586e1328bbfb9948b37f582a5ac1c58cb46026ed674863c437a15872c46741fc4e8d0a4a4be80cc05e";
+      sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ja/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d953aabe2368ebe9f944d91769b6e0fe18b1b5ad819040705283af6739b03fdf6fe9f3cfdbadf5231c9789ce62dbbe831035f8776f570e0be1e483b6eea578a3";
+      sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ka/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "52c4b6338dbc79a670b33e97d7996daf1ef72c22982f16840ea0cde0e6ec16eda6eee1688e6eafa2ce6eaa9cacb33ceb7196f2923c81d4e1fdb3af9c200b9c7f";
+      sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kab/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "4832c730d37b5890a85091109ca150b882202be9028b448aa57fa8e74a2f91673d2c6be4e963235c0453cbf070a996423e64f7cd93caed973d5c5018d26d7a4d";
+      sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "efb2fac05f337f22c326822efa17f7063dc71180d54621b95c000d6c86bf5180d5ecb012ab72cef23177cf07d7f46f507bda862f87dea507a4c1be026829ca1d";
+      sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/km/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "c7817dc8cd3e78b15708a863727627ebcdc6ad054da252f273a6e68cc914f5999fd6d7495d64586e1d218c068c9f38250db0ae54944a67f1116e5a12132c9dcd";
+      sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/kn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "9ed4c6d0a6a5579d1cb32e35a97df2b05d836e5eab5df59406da4d86ebae6374c38649232c2dff849865f538ce4264d8f08c7fa6c778f9ac65362cd47297ce51";
+      sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ko/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f133fda3bfbc59f895ead4257a097102af10954f0fb7ddd6bc9337a520641d8f1a26bd86011c0922c2770e8191e68d96e46d56a76d498c7a44c713207a9f8585";
+      sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lij/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e4d55a021271186cf3553781aab1953c9bc53b86c5d8550c6d45bfcf2363dcf32def20d411c4df10aca3e7c2a79ee527b23e248910ec1bbef8d1e15793e1b831";
+      sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lt/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "a08315a4134181e2f8c559e0c70ff05b1455f85a85d5b5b06c5b8cc70bb17f3761468af42c27be476ea3e342365262f18b98c523e35576425ee8e5ef8df9c362";
+      sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/lv/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "e6e62886b8bf972668e3da6452bbaa970cd16aa5593c8a3d765e0d784ba755e17641a1d7e5410ea6474484eb14b3b6b18b69e3be38f2e2ff30890afa18c9a405";
+      sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mai/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "a28537a457989974e11161ae84dee2de28d783447c0a0a6b5b03a36fcd1650d609ddbb40ed063f0c68149d314b1eb17dfe92d5396c855794d45a0bf8e3491c7a";
+      sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "da601ab25113316cb9ad44d2a8bd0eba23800fc97ab18ade8324048b1d7c757c51db9fe039992d18fa7b78846b5be496d9f3439500448f21d66a9d3a335479ae";
+      sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ml/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "eacba5bf549f1398f561ad574775af8c749251f9d4a57a2c91400236cb2b72b00e429d4dcd4597b6dc6fe95a629d4b56c2c1776e03cf5d158cbc85743bbdd443";
+      sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/mr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "e9e9b13cc3c4f48871d5b73ea88aba384d0ae792f7c2bb49f41d5b7da36243c108dd96925c122abb0b202ba8ee7591d8edd783546402c2066f5459883a255897";
+      sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ms/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "edf6153c9e18e620558e283086a96d49e484a74983b7d5823b1c17f9276f3c41d4282a46dc120a181a7e53595e1434f56658d34b2cad4c97e30753c07c899fbf";
+      sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/my/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c153e6cc2bb3ea49de8dea3661b4c5ec23193cd40e68da8160108b40fcda6717e35e7ef3bd2708ac2e47014b224e53f74b9183cb2c50f36d517f1a5ade425d40";
+      sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nb-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "1b94a618ec8f132bbf5b246354da4b424a682fcca74259b94f1ff5cb12cb0602d327dc7b9af2814fde45e5da829159df316442db6388fc45bee8c8255418a1ee";
+      sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ne-NP/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "552aa2504e1d5c15a413a0e7e47b509d37a8b424be9ec4371f0920a9ac8b6ada2cafb9adf054b695499d41fc9b606f6f0c95d99104318cee1d69998ed7bd1812";
+      sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "2449c6f7cb6106e7f49b5160ecf973a73882d653c68a8e5648a31595367ba41dd93e334f3a67e69958f4bf429a17069bdf5d66163f2be14e86068a30acc29045";
+      sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/nn-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c80169f8f2cab78efa8ad06a6e3dcea41359bfa2b4af7baa034b88c934d27243eb5b20b4ca4f956707472daaf1e315ee4d34e5abdc25edbdd0b8aa3915c14d5a";
+      sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/or/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "48ebeb9e4233b303bf5300c9d7413c82f9340a7f1fdb4ce23cd9868ae6c8c7b61532535dde653fec0f9a56a3b8d4595d451c3abddee75f6aeaa5b2450f26b0d7";
+      sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pa-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "4d2caea086ddd56544b59793d3e2422940d64b16a623e9b9717329a639ce8a89f9e69d7c8ed9121bd08d692462c99316e1364d89eb8d1cbe978c67f99bff2469";
+      sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "6d10818fe57a2b10bd5cccf068f42ef8e2d949a79c4ce6e4b2ae088944f17dee8ce14396b2e3f86d492e3ce31780bbd96ecd4bfe39cb8e15dbc70cbdad6a3927";
+      sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-BR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "b2a8732a03983b00e7e606099a215a8b6545e093e243662988400e059757f6699571a29e6c24433b345de5e47484d19c08685fe1b5410d71bfafe023d3bbc669";
+      sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/pt-PT/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ffc7c4a8cb7a092ffb86ff32ff8d6e54b4c49600ea9c8ac77e337f4c71b283adced784d23cfe8e69d034b9cc22f118756af44fc5a22003c77c33135a24197b2c";
+      sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/rm/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ca174bb51554e73d647207c62f4f17de52b47ca6960dc13f45becf0a0e43b73edcc7925a913fd42e3b151acaeded5bb68d6cdc6ac17f3add2bcdecb8a4b20c3e";
+      sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ro/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "4046be435da5d23a46ea007ed04c35cc9431d22858211fb2647df1ad4e00e84476544448ca86ce353b889a8db92fa1723c0598e7d560fc9980b1c7b82fae1552";
+      sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ru/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "a7b4becbe30e27c8bec3c71af691a03b916774a77e4626a89743a7a7deeb07e9489ba6e276e80b53becb78e5c2575465b6f141f694b71bf9cd68dd761c0442bb";
+      sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/si/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a9d8162bd8784be11924e9cc0567ea720b87232d175dee18212dbecd8280fecc610a964df77a3499c5f25cbbd466344221f5b071c8d83c3268d936e108adae48";
+      sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "999229f133193f19b49b9e4107515963fa28b524323cbf88a2d13542568997a91af911c42a3b353ab3d9dc4d05e45b8e2c9e08b4e6436da6292073365cb5db0d";
+      sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "10ecfc7d338462aa350aa957b3ca6c0de5eba93fdd680aa2dc406bbc0cbad821854c9a45dd12c72403393d7f9447d5dcc86981921f0eab4ce3c06549c642e08f";
+      sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/son/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "c0cea7d6ca475896c0b2b281a4a0df33311eda128d573b38b89b8f1653596d8d16bba713b8cc8bba267afc2a5cf734aa578532afaa3197cc92c5cd03db030dd1";
+      sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sq/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "45191b5974de941748d38ae74e87b135ffc813d5f207219b21469ca7804cb4b6ce9e7fdc1892bc6a6f4fc15d0935a7e770e82baf94f1c31dc77d1108d5f25cba";
+      sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "e931f1d47644d6a770f193cea61148445d8f43eaf5670d7cc76b3b115db15ccd4fc0938a59e7bce237d2d05a924660a791f4b19d44ccf06572d814a692cb9173";
+      sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/sv-SE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "95a8391082341543c2044a72d7f52de39767079957c99ec75c6daf95607877fce0ff1d3c42175964516cf93ff632789647f420687d51e717d3d51a280f5c9272";
+      sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ta/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "428e2269126ce169f0e83ba1274d4a11cbad2964dd6bb31e8f3c3afdfd3968fc9a06d0f92a77a0bd745f36810a526a75f8c670489cb8a28bfe086cd04819fb0e";
+      sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/te/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "34c0b91b14d70670ed0d1624a5d6b93ead775151b432add41bc13544ac2fc5acdf3ad9f8f26059655effc8f5507081461f737289011b41bb3972edf7dcf933ec";
+      sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/th/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "bd7bce3cf04674cd6423fcf7276bbcd3585c061b77c692cf33680f122b09d2c5c29ba0a2d8ec857425d9741ffce1ee23383d35c9b7a620aef5579d59dcbe0049";
+      sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/tr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "580604b9e4336aa6eac536d4514a41603890ceb6e9630609b4a36cfb0b34952f3d273ba1d100ea1b5509a6dc8dce9f10a335bf5aee7a0c6b133abaae3c4c7352";
+      sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "f6c7a9fe068ce1f760a7ca45a82dc5dd28c7e054823e3b9dacb6d00d628ba56c8b2d831a36237290d8803b3284b90cbd29c3ef685cd0d4973ee338b91ab541d8";
+      sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/ur/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "41c6ae7d2f80704754865982d4b64252a9a04a222c5cde279708960c8a2c167f68805ca2302a86f03ab55ba93afd069d4c289434dff8ec61b245123347e53e78";
+      sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/uz/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "5974e06472aa75eb2b9cdf1494d8bdf0f394d5a7493e9f77d631f47dbf0a0047dffda5fdbe23f32dbe65612b9b77caeb7c3f15887cc51fa7c2609d3960b9d32a";
+      sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/vi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "5b35c3ab9593074c8f88f2ad34db0e161c075d8b04785ea658a8ba49172707e9776a5882b291645d0aea5e333870723b5fbbe6c7957f7ee02c9674eb237a63ee";
+      sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/xh/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "8ae8b2f36cac9e1aac1f44a786d6992ea6b31dd83cfc22d1cfd75d057ae429a35e1d61272aac7ecd24d4dbfd8448f54682388e4e708222d1c2f6c6e54c0b0da8";
+      sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-CN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "76e09c7f0835270ed7788330486e1d00d10e8237e5e6b5af9bc2de227fdabb958c697c11f74d7df5b6876339adac09b6bd5e87c9d31b3c7945ffd00ef0d7527b";
+      sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-x86_64/zh-TW/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "87f298e06f0b58500231367da1e9fcf19f39c25cbf2b4d20980f45947539398f6f394833a6baa676c6ea27f87da26e5f211333c76ce91b40e7a3e2a6c6a33fea";
+      sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ach/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "3d922035f62c78c21e997f0b9e1265c8f9f8bbcd53d67d7042d8d30d418d54b3bc4f5b8fa056149d8c8dcd54afcae1ba3e418fc0b89ec19b7c3af27239a0d4d9";
+      sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/af/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "d85f3a911741b6dceb35ea6f2daab06a6258e66b07b79fa7fba4b1c277ae8debe5fb1c45c3d9eb07b910a172ff94baf6e4520a6fe755cdeaf19204b4dadb1f42";
+      sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/an/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "f1be5c00436a1b613fe46f5adfc19eafbb0639687346a3939437e10e64a7ba0c94b9656bff988a07210be68c7e57e982e9280aa03a0e69c2cce9f3501846ff20";
+      sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ar/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "aa2ce3ec19633a86d998132fe54eba30e52fc29d5b1dcde1c3197aab0bcf0a9f73caac3662d58e5465923edabcfb0559e8f23bff7f13b5cf89a11bde7d4b2eb2";
+      sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/as/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "993be32e81700a094358999edc280a0e0999efd1478eb03f0924c0fa6b8c6347e69e0408725b916a80f350d3fe93484bfe83137fc0ba007e7f7a0f41d1c12e60";
+      sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ast/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "ed49c1ea33b0057a8b6cd406820c788248016bede3983121503a8c5332fb305837add00f7a5c75ea0aeacbda16873cb519980f440d9c11b0b54b01c674832132";
+      sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/az/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "f02af6b9865d4f6469f62c1168bc33ac1f2abbd0a238d38524643dc5fd84de4a48b146928ca7c6d82f9db3e55ebbe861c29850a0a3aca3b3c1cea632a6938f0d";
+      sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/be/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "5b82b010b2ad960b8281e0cc016f7125bdae1b1f3b93a581998c4ef891ecf49b6b075949420d595ad644aa5c75ac6c552e7d26086b5ee6e807df5179ee6ad36d";
+      sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bg/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b404b3f97a9dc8675e701ea2ef8bc0a57b40a2390d98573434fdc82097b12abf28e9179de3cdecd0e3c03f0cf78f47cade1e41795eaafc113ea2c954a197a1e1";
+      sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-BD/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a992b1cd5ae8c2237acc97bd1f7e61dfe2abb3b93c270e64d2ca190d8ebb84c84f8a45de5cfe7eb853f4e3e99d79eb19838c4d0a02c73f13795fbc42e79ec04a";
+      sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bn-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "4188f40867dc0f23b2c52d59e569b7f030d4392bf7715d35678c69a29b85b0573bc3de6701bc550735881b1055bc66258f4c7090e5f4277ea494a60549ad98d0";
+      sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/br/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "c69b56c43aea2821d9b085c7be10d3cd8c7f609b8c053d8fe8bbce5f719001e620bc56d1e70fd85c77e01501a0df466cbca62e2e6ecff78196ad91b6c30cd8cb";
+      sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/bs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "77dab75b3c10d6ec24ddfa436dc9a6e037da3d692912d0417a6781890eef992cef250e8a38d5c1d03045dec7a073d2658a3d17a1f3e9c6d85a58c93ee7b4e19b";
+      sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ca/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "7fdf1fa6eb06cc338d06d30e8f1ca432cf1d7930a534c6c613e0f1278ccc70f1e81f74e43cce1e1b865bdcf2b9bf10607d73fb18d51e796c731a735f1e729dcc";
+      sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cak/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e4e35ea7e81190343337439a3fc95786f318c1f0dc338f2d816a9845b596473067095d0f3b446087ca8dea98dd2aff4db1c8e9a8c1f8fc5d304644b06e0042ee";
+      sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cs/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "48288a7ceb3fbd579511950b9c6d5fc133c1fcea8435994e804ea423e0cbfaf4780fdd6317bfea37a958f800a79b62792e01c7aa25a908fe62b21684d6fda060";
+      sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/cy/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "ae9fc1b0c8d9b46b86b6ec9bcfd97798fbab2410c6ddfab531e364871be70a3a74c48936bfec085220bc5f37397cd83fd31da4a709f337c57a8bd944e635e7c7";
+      sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/da/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "9ea4433a5c295abba639faed9681d68fb8976b1935a131ab763f6ac12f32afab2c1ead3709ad741e04c005b19fe230e13a93334434c76a033df69d6891f960a4";
+      sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/de/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6d864350a270efabd5258157c78ac6b70bb81677939bfd381b6996fb672da240b5c7ef5780819729d3ade763b9eb5a4222c361394e48d9c1c9eafc54795be93f";
+      sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/dsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "71e5608acee3d2cac48160e71739540c6d94fe5523415d9b639a3b493910347d38f6230afc0febb444e35838e3d402fb5b3018cf437eb48632ca1d8b873ce0e9";
+      sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/el/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "37ec4073075a29403e4637b48a74bed5c470ad9722c28cfc3e1d7aa5bb63034a0660fcdd2f78d8681ad21b569bc9060be05f4e1cd3eaa3d347ba0d2304075eba";
+      sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-GB/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d2731ba3dad5298e07edb49b608f04784312e6d7e0d1219eb45dfd38a65ef62c1f9b94eff5f97bf35d75ba36cce8a831db6964251873572edc60656a87ea5ff8";
+      sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-US/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d56c62b111bb629a30e9de4098a9bfb11b9b437bab572f3e588f4d565d86979c64ec0bd4be4a54b6c1d2718e5cd91094ea046424c9e85952a4ddac2c5de8fc24";
+      sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/en-ZA/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "5fd28d0239dd61c54a062a0f6efd5d0f406bcb483cbcc111a631199d430839129dcdba84b4da66d35f1c5052d530da07e3bc8fdd7f177a366974bfa54cb3303b";
+      sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eo/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "327b89fbc100d238f2c1211752ea1a95d2a5c33cdbf8fba35b44ff52f2b63f2d05d84c4c714090693df28c0057e29d047278fef6d4f7e5989ec207495bac3134";
+      sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-AR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "676b58cde2394983a7be06039fcd1150f6e73c95518f5889702cf71ce780c4994629c5452924354ce9826aa5e0726a5de75321295f55004afd10f727d456659d";
+      sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-CL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "274acb52107294b4a65f22114da6e79d4bcb6b06a126002a371c983a926a2ab9882896439f94ee2d2ded5e5955d42cc4a87fc0f16c8960e42d406b773e2a5fd5";
+      sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-ES/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "d23192f6cbbad388d8f3183876a176197bd82ea0bd596ef03935eb020d5d6dbb94692335dbfc1b98e63097b7c66521154b0b3d013cc769c83bd48883646e44d8";
+      sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/es-MX/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "48da06b532fa91a6b482b57a8cbbdfe3ee938b353433d22af479786129bed784380134ddebbfdc58bf06f5fb81629ec982ec5e1d9b51e92d75bde44014770fa3";
+      sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/et/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "71ec513f6b3dba3145c7b424c8f331c2108d0420a75a91045b4dfa4529448923e3ccc8fcb6b90cc01d8acd18e2164755ace78aae2d8da5eec056222b4dcb1b00";
+      sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/eu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b978c35a4ccf0efb9023f22cb05ae9696c94c8a642e3deded9c44900c84d3c0a58cfbce95aaafe7e99ee108db07a6b07a76813f7c2c3d971757eca817dc10ba6";
+      sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fa/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a67f89767cbeb3b37012c4a1ee64c53e74b30de6c5a14bce2fca15a16ce11a048ccba4e55f88ce7f2a888b7248df51fcfd03e0b0715e826f6b936db953313994";
+      sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ff/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "d7b7d9b86b90d5ca609870313b2533b6feb048060902727ccf34dbbb4f180f7fdd69683e34a7483804a1ba2dae8b264ed3fbff81b065083631b234a2893d4716";
+      sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "7c555f5ebe3fd74eb782cf9f3508c9714844cbaaa3520bc1c3b60bc8d2840874850e5f92bbd1db4f2dcc4cfba211f4aba485307f898f0b47d4b9ec93b4346ec8";
+      sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "edf4f0669c732312c27aa40f4aca66aa2a676f9b019cf1d35d0deef2ab4d27f5441ca9aafb3ed896e20538f765de4715b67a546e4364f384e05748cd495b3f0c";
+      sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/fy-NL/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "58238d57335a18e63230fcbc67f83059e2439528f3d0ac508750dcfad4a2c48296e43c53ecc203258f917f87be78fe50dcafaabf88b6183d5d790761bd21a7ff";
+      sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ga-IE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "fe4865df72926342c139309d34c8d42187b39e098848ff32b7a0bfa21798f2d1e6dc0879dcb17ae150d977942f355c532de7d402fca3226010de8812da0ffbe0";
+      sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gd/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "68f94b2511f72a2049c07a20d120fe282a6b85a3f4284e9695ab5cbd6eadd4ee1926bcb133fc7f7394d90d2e3b47e2ee75b9860a49229012c208a144fde5e85a";
+      sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "24bb4da7b5bd5a8bbb3d5bc8ccdc96ed29d9435ef00c35c70b67e0aec5baacbb910d77daec54fddaae7d68541bf1e9d051f3b1bc80e8467cc78f3c503acc0682";
+      sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "24a6a40ecf5f8ca418c83c828cdc6905ed43afe137a0d59b036e68c093df3d8be679c64d06a71973a891d5765f9c366252959d6c95cfc8a5e9b5b145999526df";
+      sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/gu-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "b36047e9e9957002d33be2c540104dc530d010a646ab8d8516ecffde0b89b9a6f82bf8b94bb3f55fafb002b5c39437b7941d5fb2a0cfdccc5159c2013db1b058";
+      sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/he/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "c4d0195f72ee0afd3aa746d0a1ae5f0f7ef58646f6b4e7bffff8b1c4ac863275881c29fb7cca09ff12765e9902a6bf9404f11b45399919c9873758bbae8d017f";
+      sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hi-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7bab64a89c03e37add1c6d45756acc3ba19751313f212f3069b9c1938f7533ad1d0cb99b7bca392bb5598e2c10b461f79a47b45dbb77285f7afe12f5de781e94";
+      sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "aa68496e4e82fa5f491b0df056460ab3169be81869248fff0d3ce2a180c9b9963edfbfbe5b051846302ab713f436836dc63d40f65ac10ab185bc12e5942fc71b";
+      sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hsb/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "89640b9df29c1fa946351fb74ca61e6f318ac190976f75b73aa56c66f2a67ef88b64c663cbdeea86c30c6644cf7870b59c2f9fa479ac6557e368dd486fbc4a34";
+      sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hu/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "46a6cdddc77b1d29bf85b40e6e33ab0d6b11a72d425ff59e9156cae7548288f02e3e1a54d296e4e1df1efc1e8e3c252a955c2a5be8bcb9e22d9d0e6e6b12d08e";
+      sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/hy-AM/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "0697f146aa1e7d0d4aa8be28b72a642c66a15d7e6a2208a4d704ee8559f4f814a8a6cf601c58a7516816c86a374bca5f755d30e11ca668d9f77c8ea4e388f204";
+      sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ia/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "107bdfde5633415250fa0cd34ecf29dc39bceb8a5762445b9b5429f4c83690193fe433128799446029f458492d4bb2fea27d7654dcba5a7ce3007bcf40052ff2";
+      sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/id/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "6935a4805b0498d5246f73720e02a022665fa40750937d31ba35d887ab289bcfc65fd122e6c18297443a6488a92a983e00844d384611e04e2e947d20a1aa82a5";
+      sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/is/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "f04f5a86e348802e38593a0c6868a1f0c534113d4511a35ad4e831a2b3d00d8d9f7522e9813230e2abe710708d61c502337de031f934813275e0d81eea8b0379";
+      sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/it/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c0db0620e0df091f31ff576d5c87004f4c283a7455afb0098a5de50cfc8bb7879ece4d8525ec1c7f4d0af9d7934d254f114cbded07c8a93126cc6b35d6058f61";
+      sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ja/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "8a705718db55246b74ec0d1baa30e82c18b5898151d4b0ffa7f888cd53cf704444627c47a00af70eb381f9d5e4d163119ac57b23eb316524a4f949a722809d6a";
+      sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ka/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "6c0c0f2b67f327e03d874ea02fd084caac2756c21838c9787a03213961bc585db5bb0f2eb068a714dcc028a7d503836f1e7f652f60e08c0e9ab45f496e53b780";
+      sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kab/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "381d4835f2dfc3a3a553d228e821daaa6966efcb47ca5d7a625813d59db8081a81a46dfd2f246842c937f75121585124c0e7607a9bd0cafb59ab42d88a2c908c";
+      sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "82f0e6cbbc9a686be9bf76a0c582800f75edd3f608671faceb813addc0e2fb66a631082e083016118dd3aff8775432ef566319cf9834a8aaa09ed6f774ddc34d";
+      sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/km/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "7b1e81cf13051609897ad632afa18709dc6d9bbc66a6b7289188abe2f04a9bd1be159aa08342ce746930fc0cb50b19f0ff8abbea695787433acd25ad1cb48c58";
+      sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/kn/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "c17d8eba5bd0c1923f958dbde4a2fca62c423213b249fa1e2829361ade947aad32cdbe257cccf5d5160dd36033e827a78c6934db6bf96f166152b967a2c5d07d";
+      sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ko/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c34c899ed8628829dcfb48b80a8b4022db9fadafc4edac4e227849ee58e06b0a9cd4fe089e080ff65e70177f7068686dab678f2e7b04dafbf1338caaea779b62";
+      sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lij/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "be96ae1d90a0e5f2308af47cae8bef7e028f01ef156bbd0497e578a0440a7362b18c63b36806ab4f1f2f1c4f8d6c9e5d9d03593ce38d1271809745cd2b266584";
+      sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lt/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "b141b12385d040596085c328ce95b4ac741ccaebe1e950f00ebe09e96a2ea5b5ade4c5438f9b622423ef658f84659bab414eb467227cd9a664542fe76471d1f1";
+      sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/lv/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "ca296c7d74bfb0b4aa59da3f82dfe32b7c6564953c9850513bcb429ad68b6c867112eef7b7a2f9e1eb0bb8b7baa5f0f4caf4c9da311729e21976d70f8847bf44";
+      sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mai/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "378b32c8ca6cf0319c54dc239bfcd9edc8b834a5ecbe8c990ff8d7f7f28a89a30c53384c413352219309bf537dc4b0961ec0ea7eb2c1a4977b062c280ec130df";
+      sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "7925c3a6beca9e35cf301dc7b4ebb059fc87cd710e0243c71b65c55918d10ada853b4a4b8a1c7aa0e0c89bd8e9cd4414d5a162a430cf2222e3d5c0e824b96c73";
+      sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ml/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "aa291245bcd21bd1e1a08f1b84346ec61311df8a9fa6f9b4af5b9cc6fcac6f332472cfe009f02faa9d842383c5e0588dd7705eaffb37c030f5e20951a4c0b2f9";
+      sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/mr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "3bf781cc015ff35393f2d30244bc7a8c32a0ac789b0eb9da9616b1d58bb211982db2b03873a91d500f3972d0ddc32383a8e77af4b2f453d2fb8dccb71c7532c4";
+      sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ms/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "705665d30a04883d1fe5791348edc2fe0aa1554cbf2932901b99ef1f4334a1ea9658574fc02c05ee64f6b2e3e8d487b8520b1f1963f285f6475af1334160e5b9";
+      sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/my/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "b1272fc81d358c3386cbdebad0595c7595b1d16dcee3fdef5f49776d6607f8737bdd4807140989e16873455df4a8746e00b8d3548f60cc9b22c282a5cea5a136";
+      sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nb-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "b44fc5f73c1dc3625ce50c9f6058f56f874a91e04178bb179667c6fde462a2436c6b35d58155ccabf340742f03d0ac1470b56fba405a13caaec4075567b3b8c7";
+      sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ne-NP/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "bb063e310856adfbf3fe433d60d4fa19e8d5ace617064d334faa595cffc77d39d4e4e303b82858af8a956d43956928c7fcf70f319ce4059dae9b750d46ee3cf7";
+      sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "64f3cfc10133c3fb0e566422282764679f9d1587b1aa742f24e9ba77f1f45e2c1dde4cb9b97d0eb3895b745cf2037a6dda9bcec469fce3b1ee125967f2869380";
+      sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/nn-NO/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "621c8767c5874fe530a0b4775df12be89c778915ba1f0d46271390c2208672d4211a9de501449458e88429483bf1ce453db652256c59308b3d42aa294d36649b";
+      sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/or/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "3c271c3e01611d8e046d44fc90ea3a13cc974ad3fe08aeb1c3fa5f18f104dd1481a5a5c9273bf21a29b7aa15f49791584b32bacd26063ffde1ea4846166d4225";
+      sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pa-IN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "b0f6248a44d247c7affc35c2c4e664620e6ad5b83c4135d66f803245180052e77fa84db9d05b96475a221d5c2c288b73ad23cd7c717cabf2557282d72731cf4e";
+      sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "75726fff593b0143a192cf3947f6c83a30c77552b227ccf2e5d0869b7a48dde22b1d555fee3baae8398b5cab58e1523ba7e15db6e237ece085b920f5fbbf4094";
+      sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-BR/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "701ffb3a4dd31cb6cf50a5523a384f222b6578c2d2a2870dc1e1cd985137dc9b78e81de092b1ebaee0108164bebc94aa1a8ea12981c02d49f885d8d6c9c8281c";
+      sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/pt-PT/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a978e219a044b3e507ff5d907626939f8f9d0c3c988662ccdf394e613ca1127b2714c9973d90bd7d835e2af574d115b495c277f2d668142155b54e9098a285ae";
+      sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/rm/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "f0f3d5e022793bc92cc84fa5f8b413fc1ae1ec9da126386283297b41e47d722b4399722f69a05aac216d46d1a1ee90a1b6fb57194284c157e68c84121d4d989c";
+      sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ro/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "4995938aeb22e69a6cd8a6b37b479e9d23a140b73ce2e5c4e29e6ff4f34d702db426346a596e207c2dd2e4d1bc6f1dfea00bc7ab7a2eae763ffe9fcfbf3e00b5";
+      sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ru/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "32ab4f1bca6a51d204c54f4485d9642e8ccbebc008cd56e0cba55ea3a5ae5aebca050fe1e8e2b2a7fdf04480ecbab04515c0944c0d5aae0b81e350370cc2cabd";
+      sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/si/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "c2407c652b1907b3508f655c1bc831ecda75b8135dbfcaa1aed1a509a65fe2f21f22720bc80fdceede1e77c86fe39d0badf8d23f37ae48310df132c115bca448";
+      sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "f2a99e4f688a3384d23d36a87017ba0b5f28bfef2152867f8e8c8ca134a26e26052339c6edca1c24dfe5db5ce09d194675cac364a4918e46ae765d30ae3ab8d0";
+      sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sl/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "f454a9cf5a2e1528a546a82d6c2a1f4f2a668bd2b56633216d3955ec5c1c89d8734d8cdb0ee9306698aaa5060bc5f4797a9e0fa1c8967a00fd204eb035a8ba29";
+      sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/son/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "4b020b9c0f6e9bd594afc47900025dbd2223e50668f9f43f139b00f5534487806810bc933ab0258f5fcc8c277f7c5d2411d8605dd0fbae893f5809f9cc400c22";
+      sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sq/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "959f10db2a46cd8616686618d55119b01f0ac8e00e79093a949788ac903b6d3845a919a420d7517813e28b1227bd6f70fe8be9df39de8406743ddd7c65865e28";
+      sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "407e9337429d644ed75d3b2ae4953c5da3c6994e2f2ef2320becbde68662f16c711c987d4dfe2f0a784833b3c721c62cdd0080cdc1ed45a099b0c7b256411b85";
+      sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/sv-SE/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "f59c60fbeb82cb56ddd447d4c3d4125ea3a98e95a74e7802d73eac25489f2acd4566e01397b9ee6c70260779bb895fb104ace61f2ce9268b4f3f3758d686de1b";
+      sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ta/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "3ddc5a37d37a7db421f46d1d66d52197473f0e73c5c633ae52f12caa473ad5a4e73612a57bfc8d5d212c2b573b8308fb1b7697f78e153094230f8da64f074b64";
+      sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/te/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "c60cd73ec1eb27f9ab5e4ea63d3b4dc691c5c85d57a486ea408cda99f0c44c6c17e7d8e2a1de585dab1d4717bcdd7417b38b785c6f37722a3056a701163917b8";
+      sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/th/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "0ec9c7b5143268d1266e939e5ed2617edf41c99e5bddf2d4240f49b1ee2822c4c6b269a24aa607623bc82a54b501cebc1f924a9c87fac21f95108089495414f6";
+      sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/tr/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ecf26013bc9cc189c89780c4b8b01c4f25dbc8f3f6c7bf924f528fe06ebf8c4952133e8446b3e0c8a09e3fa9d84b09883b3d4665d27ca7c028d90d3fe3d7fc1b";
+      sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uk/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "c8595f21e86c4d1124b882ae4f1be026756b7cecb3ed5a02b4c723c37a999e2829881fab5d6349485078965881a91cfaf28bc926b5e96245e1771a9160adec76";
+      sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/ur/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "8d7be769c17135ad58a120cba472565597ddf05893f061e1efe2d2cf57c79bd8ec6f6a55e3271773fbc6a452e1794979cc619cc1a41d1bb13670b4f1badf4bb6";
+      sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/uz/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "cd75b674a8ff62be2abc78cfa25873950914a7ef0fb6b652c483486c8dec888bed9276c2c7b323e5787ce802583e1d140d9414e7af9ce3ffc736e38fb1521177";
+      sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/vi/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "c5f9cb57563ff819236358c0ad18992f2c3f8b80decf690ec3945b029e2dbd6bc6f564af2a5bb6394eddb8a52ed0a0cab446cbd9c49284de821a814b766b60b0";
+      sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/xh/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "9f96977530f745eeb1cdb14b40bf657e9a3d9e322b250fab799b37d801665fa47a47aa88c1f28998a29ed69523e42f300b69e008f5d2ff7f166e12b3c1fb4497";
+      sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-CN/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "5f3cbcfad55017b30e72ec4fb266d5b9f822804cee329c67c5998ad44a9fb6852b32764179586862cff1dc311c9a9a84259894282d57b5d2146c1d4de86442e4";
+      sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.1/linux-i686/zh-TW/firefox-59.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3f48bc028239f8cc8bf2f818129b1509f0e8d895087e8e7b16375df447e0d0ba7b543679a808aa579fc92bf2fc4af6c3797eacf03c905ce3714eed897a8b8f86";
+      sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa";
     }
     ];
 }

From 418b37a77865fa2f56c5be19da8580278245f17e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 00:45:34 +0200
Subject: [PATCH 154/170] =?UTF-8?q?phpPackages.php-cs-fixer:=202.10.4=20?=
 =?UTF-8?q?=E2=86=92=202.11.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index c36cf6f9215..02d9ec51b3d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -383,11 +383,11 @@ let
 
   php-cs-fixer = pkgs.stdenv.mkDerivation rec {
     name = "php-cs-fixer-${version}";
-    version = "2.10.4";
+    version = "2.11.1";
 
     src = pkgs.fetchurl {
       url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-      sha256 = "00i90cbd6lkq3wssp8z2b0l2q8ahajxlrzdrqcf2jnjdhv2xms4a";
+      sha256 = "1270s5y7bgcml452lngq4fqn3a1mx15gfgmgcczjiiv0fxir446b";
     };
 
     phases = [ "installPhase" ];

From ecf5caf457331ca777f498a94dea34e9befac028 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 02:12:01 +0200
Subject: [PATCH 155/170] firmwareLinuxNonfree: simplify source fetching

The iwlwifi repo has been merged into linux-firmware.
---
 .../firmware-linux-nonfree/default.nix        | 49 ++-----------------
 1 file changed, 5 insertions(+), 44 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index dc2a5278fdc..206787ecb8b 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,51 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2018-03-20-${src.iwlRev}";
+  version = "2018-03-20";
 
-  # The src runCommand automates the process of building a merged repository of both
-  #
-  # https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-  # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
-  #
-  # This gives us up to date iwlwifi firmware as well as
-  # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
-  # so iwlwifi cards will fail to load on newly released kernels.
-  #
-  # To update, go to the above repositories and look for latest tags / commits, then
-  # update version to the more recent commit date
-
-  src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
-    shallowSince = "2017-10-01";
-    baseRev = "44476f2465dac9c22bce90da66e86b2b56ba34f0";
-    iwlRev = "iwlwifi-fw-2018-03-02";
-
-    # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
-    # randomly mutate the hash to break out of fixed hash, when updating
-    outputHash = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma";
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-
-    # Doing the download on a remote machine just duplicates network
-    # traffic, so don't do that.
-    preferLocalBuild = true;
-
-    nativeBuildInputs = [ cacert git gnupg ];
-  } ''
-    git init src && (
-      cd src
-      git config user.email "build-daemon@nixos.org"
-      git config user.name "Nixos Build Daemon $name"
-      git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-      git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
-      git fetch --shallow-since=$shallowSince base
-      git fetch --shallow-since=$shallowSince iwl
-      git checkout -b work $baseRev
-      git merge $iwlRev)
-    rm -rf src/.git
-    cp -a src $out
-  '';
+  src = fetchgit {
+    url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
+    sha256 = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma";
+  };
 
   preInstall = ''
     mkdir -p $out

From deecb4c1aab780047d79978c636eeb879dd68630 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 28 Mar 2018 08:25:23 +0800
Subject: [PATCH 156/170] terraform: Wrap PATH of propagatedBuildInputs
 (#37861)

Plugins (namely terraform-provider-libvirt) may have a run time
dependency on external binaries.
---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8b3e83ea86f..00b753a61a8 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -44,6 +44,9 @@ let
         let
           actualPlugins = plugins terraform.plugins;
 
+          # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
+          wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins)));
+
           passthru = {
             withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
 
@@ -64,7 +67,8 @@ let
               buildCommand = ''
                 mkdir -p $out/bin/
                 makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
-                  --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin"
+                  --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \
+                  --prefix PATH : "${lib.makeBinPath wrapperInputs}"
               '';
 
               inherit passthru;

From ebcf2d349a497a936fecaf18a7a9c1c42cc5f83d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Mar 2018 10:58:56 +0000
Subject: [PATCH 157/170] terraform-provider-libvirt: init at 0.3

---
 .../terraform-provider-libvirt/default.nix    | 47 +++++++++++++++++++
 .../terraform-provider-libvirt/deps.nix       | 12 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix

diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix
new file mode 100644
index 00000000000..34a3be55f30
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }:
+
+# USAGE:
+# install the following package globally or in nix-shell:
+#
+#   (terraform.withPlugins (old: [terraform-provider-libvirt]))
+#
+# configuration.nix:
+#
+#   virtualisation.libvirtd.enable = true;
+#
+# terraform-provider-libvirt does not manage pools at the moment:
+#
+#   $ virsh --connect "qemu:///system" pool-define-as default dir - - - - /var/lib/libvirt/images
+#   $ virsh --connect "qemu:///system" pool-start default
+#
+# pick an example from (i.e ubuntu):
+# https://github.com/dmacvicar/terraform-provider-libvirt/tree/master/examples
+
+buildGoPackage rec {
+  name = "terraform-provider-libvirt-${version}";
+  version = "0.3";
+
+  goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
+
+  src = fetchFromGitHub {
+    owner = "dmacvicar";
+    repo = "terraform-provider-libvirt";
+    rev = "v${version}";
+    sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna";
+  };
+
+  buildInputs = [ libvirt pkgconfig makeWrapper ];
+
+  goDeps = ./deps.nix;
+
+  propagatedBuildInputs = [ cdrtools ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dmacvicar/terraform-provider-libvirt;
+    description = "Terraform provider for libvirt";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
+
diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix
new file mode 100644
index 00000000000..fdf394073ab
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0";
+      sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b89..823030ece9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20744,6 +20744,8 @@ with pkgs;
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};
 
+  terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {};
+
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
 
   terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix {

From a8375e40561e027939cd6892ee71e9d6da0b388b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 27 Mar 2018 16:33:37 +0200
Subject: [PATCH 158/170] caddy: 0.10.11 -> 0.10.12

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

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index ad8aeadeff0..d89e59d662e 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.11";
+  version = "0.10.12";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6";
+    sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88";
   };
 
   buildFlagsArray = ''

From e6f4614e8582e0ea11995a6756b7f25abbc391cc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 01:02:40 +0200
Subject: [PATCH 159/170] lib/modules: fix typo

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

diff --git a/lib/modules.nix b/lib/modules.nix
index 654c4c588de..acd07f732bd 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -660,7 +660,7 @@ rec {
   doRename = { from, to, visible, warn, use }:
     let
       toOf = attrByPath to
-        (abort "Renaming error: option `${showOption to}' does not exists.");
+        (abort "Renaming error: option `${showOption to}' does not exist.");
     in
       { config, options, ... }:
       { options = setAttrByPath from (mkOption {

From f7342a362507e2680496be23dee736c59c31d104 Mon Sep 17 00:00:00 2001
From: Garrett Berg <googberg@gmail.com>
Date: Tue, 27 Mar 2018 19:07:19 -0600
Subject: [PATCH 160/170] docs: extend rust docs (#35587)

- Add example for setting up nix-shell, improve rust docs
- Rust docs: add gcc rust dependencies and fix carnix commands
- Fix a typo with the carnix command.
---
 doc/languages-frameworks/rust.section.md | 86 +++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index f0498eac5b1..b77c41e9b22 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -16,6 +16,12 @@ cargo
 into the `environment.systemPackages` or bring them into
 scope with `nix-shell -p rustc cargo`.
 
+> If you are using NixOS and you want to use rust without a nix expression you
+> probably want to add the following in your `configuration.nix` to build
+> crates with C dependencies.
+>
+>     environment.systemPackages = [binutils gcc gnumake openssl pkgconfig]
+
 For daily builds (beta and nightly) use either rustup from
 nixpkgs or use the [Rust nightlies
 overlay](#using-the-rust-nightlies-overlay).
@@ -76,7 +82,7 @@ an example for a minimal `hello` crate:
      Compiling hello v0.1.0 (file:///tmp/hello)
       Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
     $ carnix -o hello.nix --src ./. Cargo.lock --standalone
-    $ nix-build hello.nix
+    $ nix-build hello.nix -A hello_0_1_0
 
 Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
 
@@ -276,6 +282,84 @@ features, we would write:
 
 Where `diesel.nix` is the file generated by Carnix, as explained above.
 
+
+## Setting Up `nix-shell`
+Oftentimes you want to develop code from within `nix-shell`. Unfortunately
+`buildRustCrate` does not support common `nix-shell` operations directly
+(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945))
+so we will use `stdenv.mkDerivation` instead.
+
+Using the example `hello` project above, we want to do the following:
+- Have access to `cargo` and `rustc`
+- Have the `openssl` library available to a crate through it's _normal_
+  compilation mechanism (`pkg-config`).
+
+A typical `shell.nix` might look like:
+
+```
+with import <nixpkgs> {};
+
+stdenv.mkDerivation {
+  name = "rust-env";
+  buildInputs = [
+    rustc cargo
+
+    # Example Additional Dependencies
+    pkgconfig openssl
+  ];
+
+  # Set Environment Variables
+  RUST_BACKTRACE = 1;
+}
+```
+
+You should now be able to run the following:
+```
+$ nix-shell --pure
+$ cargo build
+$ cargo test
+```
+
+### Controlling Rust Version Inside `nix-shell`
+To control your rust version (i.e. use nightly) from within `shell.nix` (or
+other nix expressions) you can use the following `shell.nix`
+
+```
+# Latest Nightly
+with import <nixpkgs> {};
+let src = fetchFromGitHub {
+      owner = "mozilla";
+      repo = "nixpkgs-mozilla";
+      # commit from: 2018-03-27
+      rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe";
+      sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw";
+   };
+in
+with import "${src.out}/rust-overlay.nix" pkgs pkgs;
+stdenv.mkDerivation {
+  name = "rust-env";
+  buildInputs = [
+    # Note: to use use stable, just replace `nightly` with `stable`
+    latest.rustChannels.nightly.rust
+
+    # Add some extra dependencies from `pkgs`
+    pkgconfig openssl
+  ];
+
+  # Set Environment Variables
+  RUST_BACKTRACE = 1;
+}
+```
+
+Now run:
+```
+$ rustc --version
+rustc 1.26.0-nightly (188e693b3 2018-03-26)
+```
+
+To see that you are using nightly.
+
+
 ## Using the Rust nightlies overlay
 
 Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.

From d390ee74e3258a719c7d26dab80c107e7a7e72df Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 27 Mar 2018 21:24:27 -0400
Subject: [PATCH 161/170] Added bionic dynamic linker

---
 pkgs/build-support/bintools-wrapper/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index ae910b76c70..5c0436b73dd 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -53,6 +53,7 @@ let
   dynamicLinker =
     /**/ if libc == null then null
     else if targetPlatform.libc == "musl"             then "${libc_lib}/lib/ld-musl-*"
+    else if targetPlatform.libc == "bionic"           then "/system/bin/linker"
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".

From 169468c40681b551ac906dfe68db338c56661c2e Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Wed, 28 Mar 2018 01:14:23 +0200
Subject: [PATCH 162/170] apache-httpd: fix typo in config servedFiles

---
 .../services/web-servers/apache-httpd/per-server-options.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 1d53ce65900..4bbd041b6e0 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -118,7 +118,7 @@ with lib;
     default = [];
     example = [
       { urlPath = "/foo/bar.png";
-        files = "/home/eelco/some-file.png";
+        file = "/home/eelco/some-file.png";
       }
     ];
     description = ''

From 28c00f8f3b4b1f619a7c534767a5ef515ac42ee5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 06:53:07 +0200
Subject: [PATCH 163/170] monero: 0.11.1.0 -> 0.12.0.0

---
 .../altcoins/monero/build-wallet-rpc.patch    | 78 -------------------
 pkgs/applications/altcoins/monero/default.nix | 21 +++--
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 10 insertions(+), 90 deletions(-)
 delete mode 100644 pkgs/applications/altcoins/monero/build-wallet-rpc.patch

diff --git a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
deleted file mode 100644
index 5436332db80..00000000000
--- a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
-index 63908005..f6656d5c 100644
---- a/src/wallet/CMakeLists.txt
-+++ b/src/wallet/CMakeLists.txt
-@@ -86,43 +86,40 @@ target_link_libraries(wallet
-     ${EXTRA_LIBRARIES})
- add_dependencies(wallet version)
- 
--if (NOT BUILD_GUI_DEPS)
--  set(wallet_rpc_sources
--    wallet_rpc_server.cpp)
-+set(wallet_rpc_sources
-+  wallet_rpc_server.cpp)
- 
--  set(wallet_rpc_headers)
-+set(wallet_rpc_headers)
- 
--  set(wallet_rpc_private_headers
--    wallet_rpc_server.h)
-+set(wallet_rpc_private_headers
-+  wallet_rpc_server.h)
- 
--  monero_private_headers(wallet_rpc_server
--    ${wallet_rpc_private_headers})
--  monero_add_executable(wallet_rpc_server
--    ${wallet_rpc_sources}
--    ${wallet_rpc_headers}
--    ${wallet_rpc_private_headers})
--
--  target_link_libraries(wallet_rpc_server
--    PRIVATE
--      wallet
--      epee
--      rpc
--      cryptonote_core
--      cncrypto
--      common
--      ${Boost_CHRONO_LIBRARY}
--      ${Boost_PROGRAM_OPTIONS_LIBRARY}
--      ${Boost_FILESYSTEM_LIBRARY}
--      ${Boost_THREAD_LIBRARY}
--      ${CMAKE_THREAD_LIBS_INIT}
--      ${EXTRA_LIBRARIES})
--  add_dependencies(wallet_rpc_server version)
--  set_property(TARGET wallet_rpc_server
--    PROPERTY
--      OUTPUT_NAME "monero-wallet-rpc")
--  install(TARGETS wallet_rpc_server DESTINATION bin)
--endif()
-+monero_private_headers(wallet_rpc_server
-+  ${wallet_rpc_private_headers})
-+monero_add_executable(wallet_rpc_server
-+  ${wallet_rpc_sources}
-+  ${wallet_rpc_headers}
-+  ${wallet_rpc_private_headers})
- 
-+target_link_libraries(wallet_rpc_server
-+  PRIVATE
-+    wallet
-+    epee
-+    rpc
-+    cryptonote_core
-+    cncrypto
-+    common
-+    ${Boost_CHRONO_LIBRARY}
-+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-+    ${Boost_FILESYSTEM_LIBRARY}
-+    ${Boost_THREAD_LIBRARY}
-+    ${CMAKE_THREAD_LIBS_INIT}
-+    ${EXTRA_LIBRARIES})
-+add_dependencies(wallet_rpc_server version)
-+set_property(TARGET wallet_rpc_server
-+  PROPERTY
-+    OUTPUT_NAME "monero-wallet-rpc")
-+install(TARGETS wallet_rpc_server DESTINATION bin)
- 
- # build and install libwallet_merged only if we building for GUI
- if (BUILD_GUI_DEPS)
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 57a058bada6..48932afaa0e 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,34 +1,31 @@
-{ stdenv, fetchpatch, fetchFromGitHub, cmake
-, boost, miniupnpc, openssl, pkgconfig, unbound
-, IOKit
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, git
+, boost, miniupnpc, openssl, unbound, cppzmq, zeromq, pcsclite
+, readline, IOKit
 }:
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.11.1.0";
+  version = "0.12.0.0";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero";
     rev    = "v${version}";
-    sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
+    sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig git ];
 
-  buildInputs = [ boost miniupnpc openssl unbound ]
+  buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline ]
     ++ stdenv.lib.optional stdenv.isDarwin IOKit;
 
-  patches = [
-    ./build-wallet-rpc.patch # fixed in next release
-  ];
-
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBUILD_GUI_DEPS=ON"
+    "-DReadline_ROOT_DIR=${readline.dev}"
   ];
 
-  doCheck = false;
+  hardeningDisable = [ "fortify" ];
 
   installPhase = ''
     make install
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adb421eda1c..c9802730195 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16690,6 +16690,7 @@ with pkgs;
 
   monero = callPackage ../applications/altcoins/monero {
     inherit (darwin.apple_sdk.frameworks) IOKit;
+    boost = boost15x;
   };
 
   monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { };

From d12daee695fb53b7d8a719b4c518465d621ae946 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 06:54:22 +0200
Subject: [PATCH 164/170] xmr-stak: 2.2.0 -> 2.3.0

---
 pkgs/applications/misc/xmr-stak/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index c985f601447..98b3af52d6e 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -2,18 +2,18 @@
 , opencl-headers, ocl-icd, hwloc, cudatoolkit
 , devDonationLevel ? "0.0"
 , cudaSupport ? false
-, openclSupport ? false
+, openclSupport ? true
 }:
 
 stdenv.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
-    rev = "v${version}";
-    sha256 = "0n21y37d8khgfk9965mrhnh6y5ag7w0s6as1fmf76yx6vajvajsn";
+    rev = "${version}";
+    sha256 = "1iisy73pi4xx3vmqvy6whdzb566jqyjx4pdyx0g35qjj8giflpc8";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From 5d86c50057173cb8bf82012e535ea991d9bb3f6b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Mar 2018 06:59:30 +0200
Subject: [PATCH 165/170] xmrig: init at 2.5.2

---
 pkgs/applications/misc/xmrig/default.nix | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/misc/xmrig/default.nix

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
new file mode 100644
index 00000000000..42d9e448991
--- /dev/null
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd
+, donateLevel ? 0
+}:
+
+stdenv.mkDerivation rec {
+  name = "xmrig-${version}";
+  version = "2.5.2";
+
+  src = fetchFromGitHub {
+    owner = "xmrig";
+    repo = "xmrig";
+    rev = "v${version}";
+    sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libuv libmicrohttpd ];
+
+  postPatch = ''
+    substituteInPlace src/donate.h --replace "kDonateLevel = 5;" "kDonateLevel = ${toString donateLevel};"
+  '';
+
+  installPhase = ''
+    install -vD xmrig $out/bin/xmrig
+  '';
+
+  meta = with lib; {
+    description = "Monero (XMR) CPU miner";
+    homepage = "https://github.com/xmrig/xmrig";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9802730195..137066a11db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16699,6 +16699,8 @@ with pkgs;
     hwloc = hwloc-nox;
   };
 
+  xmrig = callPackage ../applications/misc/xmrig { };
+
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
 
   monkeysphere = callPackage ../tools/security/monkeysphere { };

From b92a9e150465f176acad2e41e62f71df1f2e3a57 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Mar 2018 22:09:13 -0700
Subject: [PATCH 166/170] tachyon: 0.98.9 -> 0.99b2

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/xpwz7yb6jqisimg2rw0xn5zh8n8i89fb-tachyon-0.99b2/bin/tachyon help` got 0 exit code
- directory tree listing: https://gist.github.com/755515ff78d7dad0ef3e73cb3333c2d4
---
 pkgs/development/libraries/tachyon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index b1649da6459..e4a24279c9b 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   name = "tachyon-${version}";
-  version = "0.98.9";
+  version = "0.99b2";
   src = fetchurl {
     url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${name}.tar.gz";
-    sha256 = "1ms0xr4ibrzz291ibm265lyjrdjrmhfrx0a70hwykhsdxn6jk8y6";
+    sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
   };
   buildInputs = [];
   preBuild = "cd unix";

From 14e24db9dba463cc6c6a37d5fe3914dfe10b983a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Mar 2018 22:34:26 -0700
Subject: [PATCH 167/170] telepathy-gabble: 0.18.3 -> 0.18.4

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.18.4 with grep in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- found 0.18.4 in filename of file in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- directory tree listing: https://gist.github.com/92190024cdfe17a3e79730f988d904f6
---
 .../instant-messengers/telepathy/gabble/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 40de405e0d2..2d880bef753 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -2,11 +2,11 @@
 , sqlite, libsoup, libnice, gnutls}:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.18.3";
+  name = "telepathy-gabble-0.18.4";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
-    sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
+    sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
   };
 
   nativeBuildInputs = [ pkgconfig libxslt ];

From 43c6a3f23a3475736af39119c3189bf44fb3c8fd Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 28 Mar 2018 00:39:11 -0700
Subject: [PATCH 168/170] php: 7.2.3 -> 7.2.4

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

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

These checks were done:

- built on NixOS
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar help` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phpdbg -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phpdbg --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -h` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --help` and found version 7.2.4
- found 7.2.4 with grep in /nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4
- directory tree listing: https://gist.github.com/3c197892ad9174dae3d07c1dd61b418c
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index e87d4e89a46..edbb26a3bdd 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -353,7 +353,7 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.3";
-    sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa";
+    version = "7.2.4";
+    sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i";
   };
 }

From d12cab3bb185ebe62b366fe36aca50ec085dbdee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Mar 2018 09:24:22 +0100
Subject: [PATCH 169/170] buildRustCrate: remove ancient test guards

Let's leave x"" to the 1990s, where they belong
---
 pkgs/build-support/rust/build-rust-crate.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 75563e34c38..b07a09d6355 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -19,7 +19,7 @@ let makeDeps = dependencies:
       echo_build_heading() {
        start=""
        end=""
-       if [[ x"${colors}" = x"always" ]]; then
+       if [[ "${colors}" == "always" ]]; then
          start="$(printf '\033[0;1;32m')" #set bold, and set green.
          end="$(printf '\033[0m')" #returns to "normal"
        fi
@@ -34,7 +34,7 @@ let makeDeps = dependencies:
       noisily() {
         start=""
         end=""
-        if [[ x"${colors}" = x"always" ]]; then
+        if [[ "${colors}" == "always" ]]; then
           start="$(printf '\033[0;1;32m')" #set bold, and set green.
           end="$(printf '\033[0m')" #returns to "normal"
         fi
@@ -194,7 +194,7 @@ let makeDeps = dependencies:
       bold=""
       green=""
       boldgreen=""
-      if [[ "${colors}" = "always" ]]; then
+      if [[ "${colors}" == "always" ]]; then
         norm="$(printf '\033[0m')" #returns to "normal"
         bold="$(printf '\033[0;1m')" #set bold
         green="$(printf '\033[0;32m')" #set green

From 93a77eee1aa472a9a85a0546fc24681177716f5b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 28 Mar 2018 13:04:55 +0200
Subject: [PATCH 170/170] nixops: update to 1.6

(cherry picked from commit 2a28e657421be06a0f2b1189344f454e12d0e2f7)
---
 pkgs/tools/package-management/nixops/default.nix | 4 ++--
 pkgs/tools/package-management/nixops/generic.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index daecb8746ea..ec82115087b 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5.2";
+  version = "1.6";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb";
+    sha256 = "0f8ql1a9maf9swl8q054b1haxqckdn78p2xgpwl7paxc98l67i7x";
   };
 })
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index d9c9661d41a..f392e0f50ed 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -25,6 +25,7 @@ python2Packages.buildPythonApplication {
       pysqlite
       datadog
       digital-ocean
+      libvirt
     ];
 
   doCheck = false;