Merge remote-tracking branch 'upstream/master' into HEAD

146 files changed, 4087 insertions, 2035 deletions

diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix
new file mode 100644
index 000000000000..96b3533a6f5c
--- /dev/null
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+stdenv.mkDerivation rec {
+
+  version = "3.2.6";
+
+  name = "mp3blaster-${version}";
+
+  src = fetchFromGitHub {
+    owner = "stragulus";
+    repo = "mp3blaster";
+    rev = "v${version}";
+    sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
+  };
+
+  buildInputs = [ ncurses ];
+
+  buildFlags = [ "CXXFLAGS=-Wno-narrowing" ];
+
+  meta = with stdenv.lib; {
+    description = "An audio player for the text console";
+    homepage = http://www.mp3blaster.org/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ earldouglas ];
+    platforms = platforms.all;
+  };
+
+}
diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix
new file mode 100644
index 000000000000..c3449ed3a4f4
--- /dev/null
+++ b/pkgs/applications/audio/ncpamixer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }:
+
+stdenv.mkDerivation rec {
+
+  name = "ncpamixer-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "fulhax";
+    repo = "ncpamixer";
+    rev = version;
+    sha256 = "01kvd0pg5yraymlln5xdzqj1r6adxfvvza84wxn2481kcxfral54";
+  };
+
+  buildInputs = [ ncurses libpulseaudio ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  configurePhase = ''
+    make PREFIX=$out build/Makefile
+  '';
+
+  buildPhase = ''
+    make build
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An ncurses mixer for PulseAudio inspired by pavucontrol";
+    homepage = https://github.com/fulhax/ncpamixer;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ StijnDW ];
+  };
+}
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 3b429290f7c8..c28c711d618e 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2017-03-29";
+  version = "2018-02-15";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "10c31e57291b6e42be53371567a722b62b32d220";
-    sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx";
+    rev = "5ae43bb27c42387052a73e5ffc5d33efb9d946a9";
+    sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index f21c171ef609..58054070760b 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm
+{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm
 , dbus_glib, GConf, gconfmm, intltool }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
   };
 
-  buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ];
+  buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
new file mode 100644
index 000000000000..ccbceddefd2f
--- /dev/null
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }:
+
+let
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ];
+  arch =
+    if stdenv.isAarch64
+    then "arm64"
+    else if stdenv.isArm
+    then "arm_armhf_raspberry_pi"
+    else if stdenv.is64bit
+    then "x86_64"
+    else "x86";
+in
+stdenv.mkDerivation rec {
+  name = "SunVox-${version}";
+  version = "1.9.3b";
+
+  src = fetchurl {
+    url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
+    sha256 = "0k74rcq7niw4p17vj3zp9lpgi932896dmzqv4ln43g0pz7l18c8b";
+  };
+
+  buildInputs = [ unzip ];
+
+  unpackPhase = "unzip $src";
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share $out/bin
+    mv sunvox $out/share/
+
+    bin="$out/share/sunvox/sunvox/linux_${arch}/sunvox"
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+             --set-rpath "${libPath}" \
+             "$bin"
+
+    ln -s "$bin" $out/bin/sunvox
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Small, fast and powerful modular synthesizer with pattern-based sequencer";
+    license = licenses.unfreeRedistributable;
+    homepage = "http://www.warmplace.ru/soft/sunvox/";
+    maintainers = with maintainers; [ puffnfresh ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 725841e47b49..bf8a5f15c2f2 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -6,6 +6,7 @@ let
     };
   };
 in rec {
+  # linux-bundle
   stable = mkStudio {
     pname = "android-studio";
     version = "3.0.1.0"; # "Android Studio 3.0.1"
@@ -25,11 +26,12 @@ in rec {
     };
   };
 
+  # linux-beta-bundle
   preview = mkStudio {
     pname = "android-studio-preview";
-    version = "3.1.0.10"; # "Android Studio 3.1 Beta 2"
-    build = "173.4580418";
-    sha256Hash = "0s56vbyq6b1q75ss6pqvhzwqzb6xbp6841f3y5cwhrch2xalxjkc";
+    version = "3.1.0.11"; # "Android Studio 3.1 Beta 3"
+    build = "173.4595152";
+    sha256Hash = "0106ggrf4mkxx3a2dn02km8rdq23sf15ifysykcay29skgdmq6wx";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 3a5fde287067..250590d0d302 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   name    = "albert-${version}";
-  version = "0.14.14";
+  version = "0.14.15";
 
   src = fetchFromGitHub {
     owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "1skh709f4y4p0vqabvvysn6fgws2yq8izbwkib7rfjc357chhmi7";
+    sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index 642b0c65efcd..fc1c08dc2b2c 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, ack , tree, stdenv, ... }:
+{ fetchFromGitHub, ag, tree, stdenv, ... }:
 
 stdenv.mkDerivation rec {
 
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
+    substituteInPlace memo \
+      --replace "ack "  "${ag}/bin/ag " \
+      --replace "tree " "${tree}/bin/tree "
     mv memo $out/bin/
     mv doc/memo.1 $out/share/man/man1/memo.1
     mv completion/memo.bash $out/share/bash-completion/completions/memo.sh
@@ -32,4 +35,4 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.mrVanDalo ];
     platforms = stdenv.lib.platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index ce1c790614ee..6ac27f145a93 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 assert imagePreviewSupport -> w3m != null;
 
 pythonPackages.buildPythonApplication rec {
-  name = "ranger-v${version}";
+  name = "ranger-${version}";
   version = "1.9.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix
index ef8bfb1b2be5..a4ac924cfae0 100644
--- a/pkgs/applications/misc/slic3r-prusa3d/default.nix
+++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
-  boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu }:
+  boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu,
+  glew, eigen }:
 let
   AlienWxWidgets = perlPackages.buildPerlPackage rec {
     name = "Alien-wxWidgets-0.69";
@@ -34,10 +35,14 @@ stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
   version = "1.38.7";
 
+  enableParallelBuilding = true;
+
   buildInputs = [
     cmake
     perl
     makeWrapper
+    eigen
+    glew
     tbb
     which
     Wx
diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index b1db01873a3a..d705de1a8cd6 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -3,7 +3,7 @@
 , faad2, rtl-sdr, libusb, fftwSinglePrec }:
 let
 
-  version = "1.0-rc1";
+  version = "1.0-rc2";
 
 in stdenv.mkDerivation {
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
     owner = "AlbrechtL";
     repo = "welle.io";
     rev = "V${version}";
-    sha256 = "1xi59rmk3rdqqxxxrm2pbllrlsql46vxs95l1pkfx7bp8f7n7rsv";
+    sha256 = "01x4ldq6lvmdrmxi857594nj9xpn2h7848vvf3f54sh1zrawn4k4";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix
new file mode 100644
index 000000000000..8a23134e3ed0
--- /dev/null
+++ b/pkgs/applications/misc/wsjtx/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
+  docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase,
+  qtmultimedia, qtserialport, texinfo, libusb1 }:
+
+stdenv.mkDerivation rec {
+  name = "wsjtx-${version}";
+  version = "1.8.0";
+
+  # This is a composite source tarball containing both wsjtx and a hamlib fork
+  src = fetchurl {
+    url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz";
+    sha256 = "21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce";
+  };
+
+  # Hamlib builds with autotools, wsjtx builds with cmake
+  # Omitting pkgconfig because it causes issues locating the built hamlib
+  nativeBuildInputs = [
+    asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool
+    texinfo
+  ];
+  buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
+
+  # Composite build has its own patch step after it extracts the inner archives
+  postPatch = "cp ${./wsjtx.patch} wsjtx.patch";
+
+  meta = with stdenv.lib; {
+    description = "Weak-signal digital communication modes for amateur radio";
+    longDescription = ''
+      WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9,
+      JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
+      detecting and measuring your own radio signals reflected from the Moon.
+      These modes were all designed for making reliable, confirmed ham radio
+      contacts under extreme weak-signal conditions.
+    '';
+    homepage = http://physics.princeton.edu/pulsar/k1jt/wsjtx.html;
+    # Older licenses are for the statically-linked hamlib
+    license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lasandell ];
+  };
+}
diff --git a/pkgs/applications/misc/wsjtx/wsjtx.patch b/pkgs/applications/misc/wsjtx/wsjtx.patch
new file mode 100644
index 000000000000..a5bd7ec3e196
--- /dev/null
+++ b/pkgs/applications/misc/wsjtx/wsjtx.patch
@@ -0,0 +1,12 @@
+Index: wsjtx/CMakeLists.txt
+===================================================================
+--- wsjtx/CMakeLists.txt	(revision 8382)
++++ wsjtx/CMakeLists.txt	(working copy)
+@@ -866,6 +866,7 @@
+ find_package (Qt5Widgets 5 REQUIRED)
+ find_package (Qt5Multimedia 5 REQUIRED)
+ find_package (Qt5PrintSupport 5 REQUIRED)
++find_package (Qt5SerialPort 5 REQUIRED)
+ 
+ if (WIN32)
+   add_definitions (-DQT_NEEDS_QTMAIN)
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index d7a487ce3096..afb38ace1d93 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig
 , gtk, girara, ncurses, gettext, docutils
-, file, sqlite, glib, texlive
-, synctexSupport ? true
+, file, sqlite, glib, texlive, libintlOrEmpty
+, gtk-mac-integration, synctexSupport ? true
 }:
 
 assert synctexSupport -> texlive != null;
@@ -19,12 +19,17 @@ stdenv.mkDerivation rec {
 
   icon = ./icon.xpm;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig
+  ] ++ optional stdenv.isDarwin [ libintlOrEmpty ];
+
   buildInputs = [
     file gtk girara
     gettext makeWrapper sqlite glib
-  ] ++ optional synctexSupport texlive.bin.core;
+  ] ++ optional synctexSupport texlive.bin.core
+    ++ optional stdenv.isDarwin [ gtk-mac-integration ];
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
   makeFlags = [
@@ -50,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage    = http://pwmt.org/projects/zathura/;
     description = "A core component for zathura PDF viewer";
     license     = licenses.zlib;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ garbas ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index bb573020b4e0..d280a10f6180 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gtkflags.patch ];
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
+    string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
+    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+    echo "''${makefileC1/$string1/$string2}" > Makefile
+  '';
+
   makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
 
   meta = with stdenv.lib; {
@@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
       djvulibre library.
     '';
     license = licenses.zlib;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ garbas ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index aca676de2136..1ca7644f60f8 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl
-, libjpeg, jbig2dec, openjpeg, fetchpatch }:
+{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk,
+gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec,
+openjpeg, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
@@ -11,7 +12,19 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
+
+  buildInputs = [
+    zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg
+  ] ++ stdenv.lib.optional stdenv.isDarwin [
+    gtk-mac-integration
+  ];
+
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
+    string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
+    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+    echo "''${makefileC1/$string1/$string2}" > Makefile
+  '';
 
   makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
 
@@ -23,7 +36,7 @@ stdenv.mkDerivation rec {
       using the mupdf rendering library.
     '';
     license = licenses.zlib;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ cstrahan ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index f954d2392d76..215ebdd75640 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -9,11 +9,18 @@ stdenv.mkDerivation rec {
     sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ poppler zathura_core girara ];
+  nativeBuildInputs = [ pkgconfig zathura_core ];
+  buildInputs = [ poppler girara ];
 
   makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
+    string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
+    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+    echo "''${makefileC1/$string1/$string2}" > Makefile
+  '';
+
   meta = with lib; {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A zathura PDF plugin (poppler)";
@@ -22,7 +29,7 @@ stdenv.mkDerivation rec {
       using the poppler rendering library.
     '';
     license = licenses.zlib;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ cstrahan garbas ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index dd8c3a26ce1a..c324deb28e0a 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
+{ stdenv, lib, fetchurl, pkgconfig, gtk2, zathura_core, girara, libspectre, gettext }:
 
 stdenv.mkDerivation rec {
   name = "zathura-ps-0.2.5";
@@ -9,10 +9,17 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libspectre gettext zathura_core gtk girara ];
+  buildInputs = [ libspectre gettext zathura_core gtk2 girara ];
 
   patches = [ ./gtkflags.patch ];
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
+    makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' )
+    echo "$makefileC2" > Makefile
+    echo "$makefileC2"
+  '';
+
   makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
 
   meta = with lib; {
@@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
       libspectre library.
       '';
     license = licenses.zlib;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ cstrahan garbas ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 0f12251a3df2..2fd7d58e63ed 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -11,8 +11,7 @@ in symlinkJoin {
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    wrapProgram $out/bin/zathura \
-      --add-flags --plugins-dir=${pluginsPath}
+    wrapProgram $out/bin/zathura --add-flags --plugins-dir=${pluginsPath}
   '';
 
   meta = with lib; {
@@ -25,7 +24,7 @@ in symlinkJoin {
       as well as an easy usage that mainly focuses on keyboard interaction.
     '';
     license = licenses.zlib;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers;[ garbas smironov ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index b0ce1bb73168..bb5a7046dd49 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -144,9 +144,16 @@ let
       # for updated patches and hints about build flags
 
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
-    ] ++ optionals (versionRange "64" "65") [
+    ]  ++ optionals (versionRange "64" "65") [
       (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl")
       (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc")
+    ]  ++ optionals (versionRange "65" "66") [
+      #(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8")
+      #(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5")
+      (gentooPatch "chromium-webrtc-r0.patch" "0qj5b4w9kav51ylpdf38vm5w7p2gx4qp8p45vrfggp7miicg9cmw")
+      #(gentooPatch "chromium-vulkan-r0.patch" "1wphsbc6kyck5qanbc4bv14iw2s67fvp1c0kwz29a2avzkz19s84")
+      #(gentooPatch "chromium-ffmpeg-r0.patch" "0j58g24j6n6vpy6v9wwv34x0dd43m52wg0xcrfkzp72km9wiahff")
+      #(gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
     ]  ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 7b39eb755ef3..bc9105acc77f 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 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl";
-    sha256bin64 = "0i1g0hv2vji8jx9c973x8nr1ynzsvqjaqcncxj77x6vj9wp0v41p";
-    version = "64.0.3282.140";
+    sha256 = "1ggj1a7v2n4v34kb8gx2hcswlayryr9g62zqlry26bwmvz6qzsx9";
+    sha256bin64 = "1ah8088d8p674dj5bijk5maapmiq9iap1w2i81dl0hhpyqxx3h3i";
+    version = "65.0.3325.73";
   };
   dev = {
-    sha256 = "1b3gyj55xyqsb439szisfn8c4mnpws3pfzrndrl5kgdd239qrfqz";
-    sha256bin64 = "1hmkinzn4gpikjfd8c9j30px3i0x6y8dddn9pyvjzsk6dzfcvknz";
-    version = "65.0.3325.31";
+    sha256 = "13klppyl6rbkd3ffp8y8d95l4mc72gmj45y34wynyfap6b4z1lmh";
+    sha256bin64 = "0w1ipy858p9lbpcrjhs44kncgw7c5qv1929h0w65ybgsggjqh0gz";
+    version = "66.0.3343.3";
   };
   stable = {
-    sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl";
-    sha256bin64 = "1zsgcnilip9rxbs51xvnchp87gh4fmgxzrcf9dhfrnldhji17ikj";
-    version = "64.0.3282.140";
+    sha256 = "0mf4qjmrjnxs7mx9c5pymavmib7l2a2kxiy0kqk3mma1y90qnc7k";
+    sha256bin64 = "0idij274g53lzvgz9h5xxi8l841vvvr78hp25ndbmpv4a2p1d83b";
+    version = "64.0.3282.167";
   };
 }
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index 9356794bb5d6..90aec9831930 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -2,16 +2,17 @@
 , libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }:
 
 stdenv.mkDerivation rec {
-  # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a
-  # release but it is basically 2.1.2 with the falkon name
+  # KDE hasn't made a release of falkon yet so we just track git for now which is
+  # based on the most recent release of qupzilla
+  # This wip version is 2.1.99 so we add the .1
   name = "falkon-${version}.1";
-  version = "2.1.2";
+  version = "2.1.99";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "falkon";
-    rev    = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db";
-    sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy";
+    rev    = "dd3c570c41b4b3d0ad17202b78bf14cf1ac56495";
+    sha256 = "07d40cpckaprj74mr06k3mfriwb471bdmq60smls34y62ss55q9d";
   };
 
   preConfigure = ''
@@ -21,8 +22,6 @@ stdenv.mkDerivation rec {
     export FALKON_PREFIX=$out
   '';
 
-  dontUseCmakeConfigure = true;
-
   buildInputs = [
     libpthreadstubs libxcb libXdmcp
     kwallet
@@ -31,8 +30,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];
 
-  # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm'
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "QtWebEngine based cross-platform web browser";
@@ -40,6 +38,5 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.unix;
-    broken      = true;
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index a44d2e477be5..8ab640b90093 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,975 +1,975 @@
 {
-  version = "59.0b9";
+  version = "59.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ach/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ach/firefox-59.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "d0b824f7b892a33e37bc3b05be2b52edf6b3c47687179a652c76f30ca55215926278e7507db9738b057cd73b33f4d021c7cc02d00ebdc569836646de20083418";
+      sha512 = "d67297d6a8d80e20a0a28b754edfec69143f57cb4e4d5ccd7b22debe6118147ce91305711def2573f95e1a168738b65002bd39ef33ca64e068742c6eddaadedc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/af/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/af/firefox-59.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7a2e1ee92deed065ae5bda9abcb9fd35d7845ee39e1a7b58359eeca212e6d71fcb2199da6eebc38ef464d0f1bc037c650667e76da5caef74d406a060f2361d87";
+      sha512 = "a13cee559448c1eb1fcd2983328979c188b7f94878c7b1f929c77304890c9f411707bc5a6fc6b9d0eb4df325f847765d1c8e6246b8b203c6344cd2c7aefa8239";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/an/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/an/firefox-59.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "9bd4f6b7946d5bcdf6bc82b47dd058da80d17ac9e81ff2c591e0f584389e88c7bfebd65f2a1667b4cc96cfec008b75d31a4b074b83f69b423718321798bfd509";
+      sha512 = "dba06d2a4b8c69453225cb8227ab77a5444e7b2e41958c0cb852c0ebbd095abf5c8757e8571e4ba38b8a85430550418324cf0d79f7146a3d069b1aa7e42fa093";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ar/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ar/firefox-59.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b995c3676c43f35e435d32b1f26f959e97b3996bc14817f4e32c2b99f5031623ee43319a8f7fba1491d5631614c9648ef599643429a5b9a56b85dcc604fce0d0";
+      sha512 = "2d59e991277780970999a99fb41a3bc86a7de2832a1f31b6dbb240d4ec1620c95c7d96c637aec57f9b8066990bfed72be6beedf02bf6ca10b923f4315ec0bdcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/as/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/as/firefox-59.0b10.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "4d0ab07fccd92d75cedaa92e760771b0a12e5e16fd126ca827387f8e98c147e716a7858621c99b42dfb0775baffc12f99af07ae0525a21dca750a7c0f7760944";
+      sha512 = "29f0dea3e44250d9cb62dc770f415602d852de3da8f558cae3625063fad54088ecccf90ef32ab321c0a24a05fd981b9a247f416de9f6675b3b3e275486e84abc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ast/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ast/firefox-59.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "74d9e4aba1954561de6aaef0b4c2c409613beaf2f4288a805d45d531bdeb11a44a75f9fd9158733494ce23ce37b10e9948a6907c94fdb2413ad817d6338c0f49";
+      sha512 = "b5f36f7db2b51a3091b6375549eed900d23855fee478066e805ddb4b958d7884320a08770b500a0234c4057fa5724151548be73914a49644b139735dac01949b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/az/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/az/firefox-59.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "85f1db5f476f5aaceac30775ed61def35fdc894a668f3c5b7bd99e85ad5fc497c6f6e681337734df2d0fcc62f4717d541b5d54ae7d1e63f2f42bb2f4079cca40";
+      sha512 = "aff3f14555668b31f6761b46520513671a2b29f68b856a97b8de0c958d3d21a8b30fa83c58744bc3bce9ce49e4705aa05def39ee12203d55a6e684183234110e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/be/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/be/firefox-59.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "67b400a6f2ec3e15971da1ccb34ac411aa3df0bbe407a54c68d2b638248f89c156c5cf4ae58e1573f861e311a5d738f4b578a933fb5e8bf4df773d12d6276d78";
+      sha512 = "0f96bfc1dd6228edd1f030a4aa2349c033d191d5e8f9085370746f55a40a7a2f00d35c6d8e25d54375c640f9d70cfbeb2d726e0e8485c22b8a49b792ae229a44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bg/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/bg/firefox-59.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "bbaaaf9376914270378802f23d7afbafd6ef7ceac3b4265eda8276df46eeebeec8df1f79cb13b008666ae9ac90d90a4723b8eaee78ac574570f794f8099b8552";
+      sha512 = "9f167037fe39dc61dcfdea286c57c0d5e50318df66ff20535cfde687587da03303eca1a953402d78fe9493e4ea1fb090d3ab2c47052a0d95b501ad0c509872dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bn-BD/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/bn-BD/firefox-59.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "08ed6fde269a11e6bb349930193e8f0dbebed18d67ff378a2cc0ee4164da96e562ef4d568fbd20ca449cfa5f38ddbd4d0ee5676b710cbe816c0e6cf4510af2d2";
+      sha512 = "153e8b03b321c3dd055030d7db1d26f8fc9860496492699736557f7e007cc73025fdb31804d75f1a1375779c92b583ae6b49dc7e2a12f96e027b862fcc20885f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bn-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/bn-IN/firefox-59.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "605f3a23c5db5c7db771fa946bbf9a5135bddb2e64b6a9789c3451d49bc60682b247a5174059165fa295fd75d215b4ed553de54cbdf8e987b6ba572d5bd1b7f3";
+      sha512 = "3501729cc608ff14f1f5346fa1952b96979256bced96afb4c75d3a8f877454be95de1763eb8e663dd56acd44bd69b4f90aa504f4408c545f716c58530f80b56a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/br/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/br/firefox-59.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a49b83fe9181136b66a9a84ba94e84e2316f0cc57e58f0c20cc49f2d239e14d11c3bc74892180a61af2d7fce2527b46e753128d1a7f5a6cdd1d06f635e95bd37";
+      sha512 = "0ad110afd9ca38c8b1f0a090ca59c76ef2a104e6fd7054c1689b424cb75a685dc0ac882e1c5dadab7719ab138c4f5d72365e9b62818c7485982a3a091fc59713";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/bs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/bs/firefox-59.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "dd5e833a3556866737955b7474387ac5f646910afd32064bbea348d7a6d37cb39f83967aec106cb75cfd6bec3bfdb17462448069da24eb90b0395111ebc3d770";
+      sha512 = "801595b00878bfe7f5795b28cb750fd188130931d3c5ad6e3338c796fd0326e1f38ab33bb33c4ff23392e8db2a213fb9ead3e58ec5f1ea0ef10693f37966ea31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ca/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ca/firefox-59.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "27f57c541fe249e0e0e6319ce0f798f87355a8977cac464522a415723fe88277ce9f01a14917ac806c8a498765da9a23bbdb2a2a598e25e7d2cd902a6bcb990c";
+      sha512 = "01cb39952c34790521d032ddde36b8591819eb525c807b701ba40567b6c9e5c09b734d5440f770164807541c16579f64f0fd0040b9485a084295c6f5b1fca00d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/cak/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/cak/firefox-59.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e609f4ec07316135db36325e68e25255e47af476b7376eb75f352fb6b8a1f7fe80b856784196ef1b21ec20bc3dc70735bfdc7a4caa39b4a226104494eae66b61";
+      sha512 = "6d3199e1973062d5d7fd5d3d2886464366153ab71c0961e60c120e0c566a43d3c31d9ae0a29e7c88b0cc96c6d6623a031f0f011a99466e9a36bbc6420f700c31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/cs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/cs/firefox-59.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b22dcf1bf20260d217195ec797d511b0700b99a7b25b9abe89320729b57937f598c47acc29fdf7ec9fe800263bd4bc064fd4c912f86c3a803ab85343e4918214";
+      sha512 = "cc437a989c5dcc202031ac61d0568ebed5de4b0a1969b6bdd8de6b0efc1a843ef9c84804c6c144b19d3b9a58c2a7d2ea39781eb116e56bff4a17d57bcf75d836";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/cy/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/cy/firefox-59.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "6db8c21a38c8ee55288110bafe1f7cad35107debc5cd2969031fb2e6c99fd1c177c929c477178ecbfea9691b98bc7da3dce1d65654ca2299657322a2b60cfbde";
+      sha512 = "e7572cf1d4a2a5fc807385107f059a46ecea283b0a2db7c525dc72090b19b42cedbd2cd6d82e2ca19b3dac5ea8aa71e19585bc8e0a1c7d8fc11d53b3c066c37b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/da/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/da/firefox-59.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "7a3b18aaed7cb6187363d0a27613436c07bd9a73ae99a3f899fc31f44e667754fe4bf1cc5a86e18ab7c89fd47a9adc9a74caa6c5d3e4cd4859f6cf9a39518e93";
+      sha512 = "2d20cdd7622d4987dde65719db13d69d9ea06c62c5be4c52207c444e04e4076c42c346daf77b9466871b0487ff5825c27520b75073e4d2a415b2975c8eaf5533";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/de/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/de/firefox-59.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "8b1324cb0be071fc26165a1eafa3b0d039a5b344aaf1db243a8baba72d1287531f055f8112b78ae373e062dac2deed6fcc4fae815d81560226e23482126df911";
+      sha512 = "218fa97a6348a6a8964c7478b9b4cff87d04cf429a7df036c38c8ff795cd66767e12faa726bbe3778bf9ab4a4f565513cab4797a169200418986b9c9afcf000c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/dsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/dsb/firefox-59.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "80c5ff404c7c92895a80796ffc2c4277f9573ac7995c3446626492135229ff00eeb55b1aefc8cdbf4da500b8e647d6422c8c31ccc909d0f64eb30e3b70381126";
+      sha512 = "946f6872db7941c92d44d8f7bc47ff55b5abb8af4ff7bf823acfd727d79af6cbfd038cd28f1b06886264706e1d68321ff1bfef20010acd41252794cb3ce335e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/el/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/el/firefox-59.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "275660ce5fb0a2c049a25e076d7b07fc499a74a298e09b126fd4de69d57598b0c0625a1ad59e046411df1f30b923595ffb751364f2d1b7ff0b0e0b59b0682bec";
+      sha512 = "79dba8833e493c8f66ca1a46fb4b8dfaa335a3ab931d786f46567a3342e2cd7425ca4b41b7315e6be6bbaba49638cbe6b265dd4f0b55a900952fb23c8bb58fe5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/en-GB/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/en-GB/firefox-59.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "c1e30bbeb97e61cffba3c0a18dafaa9761fd71d3477b36e27063ab004dbb67eae0ab850e03a7fca4e01c22eea052810ecfc231745b631703b5c6e24dfa9ff12c";
+      sha512 = "b9ac9c89bd4258e6e9d743ac87a4f7d7c85e447941e767645908fc021aea01bd55a13721642724fc78242f2b683fcb914748c3dfa84bb8844c1a0f216fc0d2b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/en-US/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/en-US/firefox-59.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "91c4c1cd3013f7d6ed7a576fbe39dd0c4af0c7c4838e54aa712962e7f1a2fe5e08864b675060956d7608472a95eed762fc0e1608febfad8a42eb25484d8edf48";
+      sha512 = "6bed653b0a6de82dee8f598e3856d18a229255af5d46b352ca2fe4f2ed343edbfdcf03ac5efa5d8f195fc5605ce409da8d88b5b7e9b5a1997fb9c23fa2ec2b71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/en-ZA/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/en-ZA/firefox-59.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "8c582b975127f0a3fceec2ee73b8ce4aef316747989fe712ebb9213de004f2612603b54282b91b653301416f5d1c974aac064610531af0f4845da093dabd8e96";
+      sha512 = "5eef045d5e397e9b994638d33c8eeb487c297b237560295223b339765591a69d5dd02f22aa96ca74cc57e1a3ad812300e92bd7a3c1b40eb074de13e2ae105eca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/eo/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/eo/firefox-59.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "4985b986e8cc467607fb9ab8577baa98084f9442d51131bcba7744fb883d0b9df8d69b6793a05da49b98faa06476175fa2997d152687c65cd108c86334f224a6";
+      sha512 = "0565abe4376ce0e699d648e1840594e9856bdd21e473f476c80a9e2ea709ecc5fa433c449b3184bcab3faa41e22991b32bb131a47d8bcb7119d586de0ffd5853";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-AR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/es-AR/firefox-59.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "591c4cbe1bfb17ddabe3c3193bc71581c4ec14cefec028ff298257ca63e0e1778fc1badefbe3f58609b7b837a674cec80b0e7e6383c33d313193897e9ef08af5";
+      sha512 = "448b6207136e96b88e9e1603b498d144385ad83e128657f1867a69fa150de57df4114ccc23389d2e26833ed64f9254f97825ae0f7ef9b1ea02828c23c2481525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-CL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/es-CL/firefox-59.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "ead4b2fcb6a69485301b2bb5d55abbb771545f576fed35d373908da512a973af9cdf53d7e34135ec82c499ae6279148b7cf53b643f48c356d5514084d93b6148";
+      sha512 = "4b235b8312d2e47fda1974d0160516c50b17d21cb780696f50b87dc7092d2497da323181b0829135ca434d6ffdff9aee4446ce36940c9b15b36fc7bb0099ca87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-ES/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/es-ES/firefox-59.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "780d2362def55f093d77efc6a53b1c07a27804ce571a937f2efbb85a2ab3b25195f0a95a33aecb1f45e75914db61ae7fcc4336699701d15e76eecb7982e219bf";
+      sha512 = "0725c90086d37ed1abb7a95d8a10a009ab464dcf35fbb9cbdc0c4555990cc52e61b6595e2a331d51697e7bd3b5cd8f9ae5edebaa7da223601a32c30469b6d08a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/es-MX/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/es-MX/firefox-59.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "487d64b959ba69da2dcf8b2be8c07be5cfe1a8ef4831206a5943d40bbdae626adf5ac4b291b28a00b5938133926c449838bac1511cefa4a20c3cd6cf7ebd5288";
+      sha512 = "ad1734f89b5dae1d84b408d19fcc5e9110b57e24b831d17038d481ee69cc5361a60c17b96aa2507b700b307e6cca88182e0e898629e0692edca9fdb39a868463";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/et/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/et/firefox-59.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "9734419e61f89e62be79b6796fdcb1f5da8a265d2004ccbc8372141a456fa151580811e12dc3cb16c29a7742fbd7e8c91ee8b14d4bda4f81401e945d42200617";
+      sha512 = "0753a517907e05eaca25f57e39d974e126c3f072a84f844a360ece77276b2c08cabc01c1473bc41e1e4efeaee7fd1ce5394a2e179f2c1ba496729e1828f5014b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/eu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/eu/firefox-59.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "54f021e8d28c06aadf87f42d92130fa4fa841683591254a9bf76e17f10233347d30d01c0df5e300312c849b5f3b8872e3901413e553f63ae67c0175ce8e17bcf";
+      sha512 = "76537aa4f855041dd951cf4b8345222fbef62a63b83ab3bf21eb29163668359cf6536dbe23e46fcd422246d92292eea2cc2d349dcc2e125217c47e9fd4b913c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fa/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/fa/firefox-59.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "2157aa64ab820b2702077dcae6a9813f39f5f38a1072de0bdf81dd86344b30f2ec5cb84885d12e3e8f575755a4fb4bcbf83ee543bfbb944c3ddab4214cf387f1";
+      sha512 = "e01db1b5538fe7cf5a637b633eca9aa014a5c632c524c4280b391ad746d7066d3b43e9ddd91c77f30fa5b79f4b0ee33da4618a348b425f023670bb2e01afa488";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ff/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ff/firefox-59.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "d111fb2faf6fe9d4d9b5efbd7afa5f15d820d2f3536bc8395f199ae0de39dc5c96b428d7a967edd2cc6af3c178ef86938f3e0d1c2019939fae46c10ee32b7200";
+      sha512 = "55b8e17a29faf832efd77b2e84467ab51bb02e74ea5fe0fb3cfe9815229969a5f4c9b71721382fcb3b142755a1318d3117216cfe0613b15b0423892046b48ac9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/fi/firefox-59.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "526de8bb77b5e891bbe7cee7b4190dbf2ab009f274a14796fd0ebf50d9bbffc8786b913dc5041bc5e12e44e67c669ff573ef3aed9bfa9044e151f090b83c0af1";
+      sha512 = "1bd6772f63c2cd6015389b5826d6da2687b5d67344cd7e4aa317e4c5037d4b37bb67bf1acb8001d9d7c3a47224bd2d773dce7eb07dfec5ded698f7e68d955fb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/fr/firefox-59.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "2fe0b2b1e6ed63154bf80fde9286514e09fd7cb6d66159446003984fe2ea8a79cee872052b39ddb893c6584bba8767c1e6b3aedc4d84ad813f7c64f3288d97e5";
+      sha512 = "63a805d74ae0c9c885205ee533f39b2004accb5b1d4c34df76a6f2abe6c94af99530ba1f47f30b36591f5b2cf01f142007eba6fe91d17fed3a665a707d9320b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/fy-NL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/fy-NL/firefox-59.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "5675c90ff4d7e34e854c51ae8ff10a38f542da4102c3f4e1d9a01b125ca5329f70bfd2916fbdb4572e86b46151e95d3eee0ffeacadf589aed33a003ee7aa3b9b";
+      sha512 = "bf4ccb85167e111f6d0cf2dcd972888d51913f1151099b5d3c82f7c185cf1fb1df4c3e46fd7e445549cb6ed17007f1d2b8230d4e76fd93b1a778d2dc34cf8232";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ga-IE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ga-IE/firefox-59.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "960c5e56085f794d729dadcc1acade326941dd2ef12882e70cad516ea1ebaaf2b51377a474344a2d16c33ceb207301a85b9616c2c61ee253f9df628a790f31ac";
+      sha512 = "777e0b07342268d61a874ad586446efb35b0ce2a98115f1e2b9ae64b2216368105c06e5d4514f93673a45de3766f3ac986f47a71fa3841841c95aa8afc7d390c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gd/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/gd/firefox-59.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a0d619233d4262760612f810c2d484c6e7219c73ee5892a5f675e5b43f3f75d75a085ae26d805246dcbd93b6e715307b22c790686c06d48591d7c87d8e609f33";
+      sha512 = "4c7ecc169c1134e29369cc98d305af1a390416125e4825507bd5f316b92e9fa4558f9b7f56edee674a7843ab6f9a9cf9b7b48ea5c80d1846736ccd74d41a63b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/gl/firefox-59.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "b8cbe091d195065e0292f032d35320b7a8256dae389b8053d45c9e7741a04b3567d9bee1d0ffbba785d5e6280f664a239953bf9ae5c1966b0ec05f47bcc7e182";
+      sha512 = "704ffcecb202a9aedb378f57649e81b70bdf3a982585c0be6ebfebd04641d6646e0c607bffeca5cd52786c3a2ed7452280389ddbd111938e51228285b8ec0351";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/gn/firefox-59.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "75c3a248dce6596e2615c17f4d1a322df27499c994c8ce99e17fa5e48dea4772ac88e4824822ec9005aa2a7492913d6f6c651ab603a7585a0b35954478d72eaf";
+      sha512 = "df24fc1f1949f6b56597727f536040d096d10e2870ff0665e56f1e590ff4fc151534d7332a8c3d23c115d8ce0c467a0a59476a3770a8fa80454d89fbb9148f6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/gu-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/gu-IN/firefox-59.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "9695443c1c770bc6ede69711d1d3ca8e9eb28a2947a76a3e4c38acab9f3398ca3e10146715fc7f4c14fb496b798a5466ff2c6f948fa5b4a4ba512c9a60e4adc1";
+      sha512 = "3a2474b0b021ade7cdb4322c78543229eb30fdfe6d6b7e9e0ec8cfb7bcba1c597e8daee07d790ee65675d1c2d8a10e63ba4f3c9b1ddd9787423c94442372202f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/he/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/he/firefox-59.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "0e0e06f07e3ac011a4ef619be65a9f463fb15fc3d554e37021ea203258b6b0aa32229d686392d97fd26b8ebb6617fbc420fa458f63b7746ebfdea4f5f3de19da";
+      sha512 = "efb9c513b3654aded9c3154d68d2961239e6ea3ef8efdc057e127fa6108d2783427bb3487b659b86c02a4c5c6a7dfa52fd521afe00555a7cee1a5db36d2a1c5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hi-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/hi-IN/firefox-59.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "23925b04301e013d057bc672d6d7816c206a62db03afb372d78bbd3f9d38d28c74e9b48404dd89da83c802025288d756177a50d6f54c8a18a2f9dbdfd1a66fac";
+      sha512 = "d5aae2b904f66c335132d60e1fbcccef0485f2aa3b017a64bbf5d1159ddcb06609367dd378bec1cc2d41addd8c71926112e6da811cdbcdee9d78bdcf5dc5deb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/hr/firefox-59.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "31d9b7ceeb0e61aebb6c105c1f9150e525edeea98cf230fd5eb24fddec748b9fdf5913febcb23bdbc25cb7abb3793da00a37e2dabf78da0b6e0f04f1129e6d22";
+      sha512 = "65a1069f7283f779671e8d23db85dc088657d7247188e0663ccced5114f11ed61e87cac0ac20f8cd2025060da7413863ea7c4b19818f50f9ea197027a4e2e15a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/hsb/firefox-59.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d377f70d7153258c1ea486b32a2b174b64f1643610af28ccea2b38b969b47e1684f198eb1d515a198e52bc1a3c9614964730352118001a6d7030f70d4b4e7aea";
+      sha512 = "dfb5d46c9282e89d9f83b3ec834d8c6bea06a2edfd0a769b94a475f6b6f89d0ef8eb09957178ff518a46a25eb4fee487920cf9131ae866e126ee26d52fe9907d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/hu/firefox-59.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "21bbf2cfa8113819a9fabb571d2a04de9094237879fb853b8657138f01a258432456c6034d8ffebb37af6c0489725d5d5643220292d9d566536fd6f85bdf731e";
+      sha512 = "a0a4876effd843a60e8f591b8156e727fbf02944630cd306d64ee828a7c71c9e60f00eade7a886790f8ddfbc172a3fa36dbfcdd904ae45a48c1b1f43b4167984";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/hy-AM/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/hy-AM/firefox-59.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "353bd2022bb33a2cfd4d590e585ec8460385abe23797853fc44d75d6e9ac0bb782aa98a3e39e8660a49348ba97fcacb98531095b34fb718abd135aa06f381851";
+      sha512 = "6e91cc50988f9ccc7dda02bbfefc1bd64a888c469ff05c63e63cc64fde8a067ad85a0cee757241b76b2c3b2e94216e00bf6621c258bf0ffa590b52241573a186";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ia/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ia/firefox-59.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "d731b958ee0b847520123c29cd7aa85f05b86de3971b765245a69e8009029728e7a9a11ba48b351cf21dddb9e913b4bd690c581ae1bd4d920dc10052636bcb2c";
+      sha512 = "0184218c2d293fb48c0acbaa4df6326d056d2ab4d8d9cd54dcf1a3013d48dfb195f2d239e5408481dd6f9a0598a2178eee96be4dadf23929212a13e540884973";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/id/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/id/firefox-59.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "1a8fa7688c4fc4683f2822e94a18bd3effee322c17400f2a9622fb8f962da1f59ffd292f580cd2592b10ce18345697bb6d4fe9cd43c7620649a4721335628a62";
+      sha512 = "7ba32aea9e00759d0ce8e81ccca9ea108b5c2d9a728cc04989708e0d684e2e67cd4925cb5a37dbb4cd14e10be06ead735cbf29d63db2833951970c819cea4939";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/is/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/is/firefox-59.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "e04ab7a86bdf3768fd6b540a601d148a9d4283d2ab084c79c0e94638dc66f021b7864e269c1dd7e1fd34f83a9023170890372014e2e133cd5cfd9fdf8e84ce0e";
+      sha512 = "b3896588a32de1339fe94d94053d75249ee6ea6b0c44a0f8c1c000e954ce913930f405c9303f28745722ef7bbd4e4fe4cc38bae61135637aaadd2bdc2e24315e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/it/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/it/firefox-59.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "170af026205cecf0adb2f1a4a98f3cfce731c4e493df7d01839989fb483f1477d239bbad4987c70e00cdabe8e9c74a0c37abbff460e132b06fe1fb04e152592e";
+      sha512 = "dca2fd60bd40b233654d5af7a801acba1ac4cc36edbc0f6f71970b8fe02463a48958e43650be6aa961d19f4cab10ccd258afd04045a1166e3859d7b674f759d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ja/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ja/firefox-59.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d7ec1e94f5c158f2fe6be3afc358617eef421c40d3c0b0aaf1b865101538db8ae0d2863781374c355b62844ed72d78eb6e216a208ba6e227bfb2794ab296df27";
+      sha512 = "adfa3482f487494db1370a0f01597635066196d278d4092f71026c811357c1b3a21dfca944f4a0f579026721531a83300fc9c6cc682f1a2d893069bc1d1b7199";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ka/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ka/firefox-59.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "e8cda6ac07e488ffb7138d7bd668f1c31156518aed44374fa3dbc9008477beae620dd49062311662570dae991871eca3db9f796cec57053084246335b2dacced";
+      sha512 = "c6ae39b494ef085bf7b37d0974de5637797e5206d10df351ad881b192b5324c73b6a7d7828b8b2e3dcd7427215a43eb270d4ef755d56dd5200564ddce3a18d7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/kab/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/kab/firefox-59.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "798c4c711aba504a4355620da64258ac3d0913e3d476dbde83debc6795583b38926fe6d62bb74469d8fa98b02aa1e22b3800bd15b3fc95ea3c173376753462da";
+      sha512 = "40d1c19e70b45438cb85af656d60ac8e71b2189e30469c488dc31a260173ef7f883c0b8d95c9414f66142475e45da37b48587d10f4e6ca08759585798eb50814";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/kk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/kk/firefox-59.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "1666cd700b1898f9cde89ddb8f8f95b737effe25f3d896fd16788b823035e318d8938b86dff5394767e33685bbe12b81a6354d1cadb5b74832fa7d5d5038010f";
+      sha512 = "4e23041d30215df9a2bbd80b667c3495ba50204fcfea18bf9b6429ae8f4df39ce4bc4c99f9af20468eaeccbcfbfe5993b9259bd44d55b8e8fa7c64ddf40cdba3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/km/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/km/firefox-59.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "846bef3917e03032bb18b0ac9ea6e9b22eb69c166a817baa94f599c531509c05733af152afdb3f188d697a9b7887e5c093a1c7e74d55b0e0bdf04d522aea0deb";
+      sha512 = "a07c83a3dd3f46512e760bc0dfa8205bc09b0f7e5ddd51429961ea618ecc8d61bc4e07bc4e16f3d4b68e72bc6597e367f25b8a5b0435c854f02d6b6ea7a0a952";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/kn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/kn/firefox-59.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "46d362d8bf22d66d12173c16b4a841acd24d03a62cab8fec64b9a0f451e066b7d6ba440bd9dcb88c105ef1448f55c0ead828a6c03909f98e3261ac0b7075b64e";
+      sha512 = "4e451deb67d20fa7729b7b25cd043dbefdb5465bed998627098d501cbc2cc32d2879b213d770ffe6ced6b7ba99faaac2a9bdcb830ef930b614a9fee79384c325";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ko/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ko/firefox-59.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "89fb9c6682e6bbfb362801b138714a243d88e3df56a0e2441b3f152be883f3f755cba23468b34c13065688a46695414988bbda3a79c87b98191c69142801d8f0";
+      sha512 = "1ec0e029a6c3ce8104075bf068028fa733a92e4bbd6fd41c4cd5e11b9da5ddf672988952116a433fe5e429162750fefce925556395dcc953113c8dc2b6304cd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/lij/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/lij/firefox-59.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b7e56c3b9c16365d9bf84a04aa05b87110f2b98baeb809b18c14bd5c72b18f735668607be13146edf0a26811cdd7e48839119ecb12220b204e30bd4823e8a905";
+      sha512 = "6c1be6807982cc0bf920ad598776637c88771d6a035687346dc03f0cb9a11657f5a2b42041029eecdb7abd6c42bee5b12ec20f2bc96d0996be2d7c3c1c555364";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/lt/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/lt/firefox-59.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "642d8751fe7a370c1aa26c80c1b1d178c0e169739c8ce3bf2f21c22e30de2de107248af59ee640a3d9f18a64c0f88b930ecafd4c75772b0d9bc2b1276123508b";
+      sha512 = "7b0044eb5198316a29afb757342a6daa679c4406d82be4a9e286d7308b2c8eafb16eb9205fbe7790990524870f166a81106fde535a91eea99625f20c193e4ae0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/lv/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/lv/firefox-59.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "34f183861186258e27c401fbef8f88dce95c4065787cdc27c6ea83069a3b405ca6c3b6f80c69c1eddb2be655440870f5bf981b9ecd98e40b13811d71c90be965";
+      sha512 = "726dae4327e45aaee4422e018ec90dde6309dc1defb820d9cde4bd1ba9f907853c84157c2a8d2ac5d26aea9ae92fd97cb529c4c2a6a11ea4a1d36ad79626aee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/mai/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/mai/firefox-59.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "cb2700f60e82863e35d63b368078af80d9680ddf5ff9b9db5a9de2d669ad621cbe61d6c402a27f61279f11723779ab2cb6d366db836b85a35dcc603c63bd26ea";
+      sha512 = "5a9101890f85dab52ff20c457bb697bf09c2f642806c9b6677ebbd659175c2f8e99613e97f1a7979855678ea6f33b4da08092edd3414ff26f2e17970d78e3d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/mk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/mk/firefox-59.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "d8a1bb34dc7aa854112d1669680822eadabb4a6a0e60939e17460d55cb105f394bd7fb913c4a6883c8a8c663d9b76169dc0a7b5d032ea961a53138a9718e68a1";
+      sha512 = "23bf219d149a94f769f5ce23dceade5762ea75494ae09b31d4aba9927c0b79881aafaba7a41e48dd90d09b7557cb19b6ab5231dcd7953070eceae004c0192a8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ml/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ml/firefox-59.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "df0e2d93c70b23fb7a2739b31ef9bfe3f6a1266d4d9aec32491e8964200375c4074ca1804d7da578039c6b34784a2f4600fd541fcb29ed3663afe54254b3f46a";
+      sha512 = "8f6170be96fef409cb7abd05e583fddbdbc946a4169e59813359133bedf0fbd98296bc175c37bf35ead00b871a11edb315de6aff7a29dbbe7ba30713e69ff6ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/mr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/mr/firefox-59.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "12631b346454c48e84a771d52d9e8c8e7eb7c310f0d0f078542070c81682834de1bd00b39ee000f5c13f2e1c91b5e99a9a47d90d65b19d26b3d32164f893cdb0";
+      sha512 = "c1273e47d7bd6d312e38b15c234d89ce8e263f6a71e1b21b04d1079d554cb6b329ca5507b9cca3c7efef92d7531547022b3fba50197089255fcde4ec1de665dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ms/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ms/firefox-59.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "54b16ae46a5ea3ae32646e113caf9533a973feb8462fc1c18667ecf2059668ac37eb744fab69a7da29b2de1145c3a8577bf5f2ed271dbde42f646c39e1805c12";
+      sha512 = "85149f7bd4165ba5d553712a2a56f6e800cdc00257ab03b06734cc6172e242a4105200a880368194b446b97e8ab7e00562248e322fff8d0eba643592c3ca7b80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/my/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/my/firefox-59.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "0913fe1a481f849107d38b84917e000c0c818f4cc4d58d9e0066fcff0e6535e6bb31beef8759c8d2f51d422b7cfbc69cd427624f276dbe778d1b308d9c36c930";
+      sha512 = "aa6d3299e48de111c26f8650988b2063a92f39b6310b9384539f0fc30f66a7670d6e3f7fc187009179398b34d9f0506f11d9556866696e0ef4a24d9ed221eda7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/nb-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/nb-NO/firefox-59.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "41ed256ec0c84c8a23e692912c8f7c9c775bfa8e9aa0adbdac9abd2e6530dbb85083147bb1bce616830b45f956b37e5de00cbe6e5fd0dca8f6e899e481ad9526";
+      sha512 = "bb5007e8295a51053b63c55edc5729b1bbc228021e59bc6a9017370a1b9dd00c3f078932a3ba5bac8ff38f68e659f8802b499de71d3dcac3d69ab22eb0625686";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ne-NP/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ne-NP/firefox-59.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "4367b6ad8749feab909a96a9edf2a0c2f1a9b1de1b07c415311cea1ed53d1ed3ed93ca80147fba4ebdeb3dbc1658572a374557e51ff4818af85a97ebdac9c95f";
+      sha512 = "7964bbe109229c3225a4eb6ea3771da111d21aba11cc75f92146b2c6c42f190fa65bccb20c255f98c66cb13efb109e2b7d66b047ab2b891fde51e77ca38f573d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/nl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/nl/firefox-59.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "d58aab30b306d633158ec21082a78b799f84695ddd9c86e649e5023ffd5f4ed446c86ec71e0091369cd079b13c812084487a1c9f3baf54c17a1c72bfc9ae45c8";
+      sha512 = "73baff3c4e2bd59ba411104c769591314d0f5067152d8b41ce9d17ea97bfe43aa72840777edd7021f638e12f14580052984f790e0eda0aee15a1ed20802a0a00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/nn-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/nn-NO/firefox-59.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "321ac6f37195cf02d2ed5188adba5f156f4be90f2e211b1ae56e3ce580a1f59076eb0321961f4a64c125a6d4b250cf0e44e274b1c1154a7640f954855ff8c8c8";
+      sha512 = "11c1bb9795695ef4fa1eabebabb27b02990580372d0e529d73d644fd70a79615de762b05d1fdf7f1c56ae99bc2e8416e6e4d82d78d74c126c1ea5142c8eb6674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/or/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/or/firefox-59.0b10.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "5f70ade64d062cb8d0f16d9ed8b950809098de5597ac414b8c5e5dfc8f055f7c957152e9009a0029f15233d3577d36b0ccbe7e0f0b36c5b55b95cbc7fa553a93";
+      sha512 = "529d405ee3b78218399149dfcae61828ef2e0a4664c06f43af885c636b7513af2b0cf35a809a4946ee483b8e236168932861c23a50dd2ed313cabf405df99115";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pa-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/pa-IN/firefox-59.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "057718c46c7bc6137d2f86939ea259859631d2ffff51d6f3fc6e8125a98e0f1e118dec3b827855e6f5c9d04a4887f8616e1fbf9b02423e047575fa6b9bf3a97a";
+      sha512 = "316c2b5779579637207539f84ec211d2973d77cebf665f2b601939e8233fd717afdd8ea2c365e8441445270edcbeaf2957bccd0bdf6ce73c978487d7768d8fac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/pl/firefox-59.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "23b89d7d5b2a7bf8f9b23e918bd58074eb4c6f1e3e63cc8c3418003b06de90e106dcf490fb35fd07f5d09592e824d8d1aa755c4ea9046f930f0fb5c571ed13ec";
+      sha512 = "ac886ecca5d0f29c6897e5ce91cb2ff7898a9192cf09988df481fac6605608f2e60aec38548015e6b3fccf83805492e75f2de326d4efcf14873649a612333dd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pt-BR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/pt-BR/firefox-59.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "70699b077852ab4551907bcb6c0f278da6dc2ddd8eb0577577af5ef82add6262c8563c266e51b0f00a63863b43c625a3c88597e46e1a24760dcc8fcfb5a8d8de";
+      sha512 = "e5ee6cf5163dc8deeb3f02c30a5f0aa5b90bd2ab5797ca9b496001ae72697410eeeb6e433952f1b18160e610431ab158fc83c6257d4f5a7b55e89fadff467842";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/pt-PT/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/pt-PT/firefox-59.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "f5ae50ed82e25a3bf0ebec23ba459590c4ed8ae5ed1281ccfd12e8a0f381836137b2b6eb2e3ac8de2036f7ae71fe19fa2e39af2905370b9c7bc4b5837d41aa3d";
+      sha512 = "48c6d88e1e8c45342a8cf4942af8542c9ebb4a3ba7d5a62e05df17410ad2fb5682a107bc08baf7efce40bed95c08a1dbe5f22b62a0e32a920dcdfee7d1ec78fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/rm/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/rm/firefox-59.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "f1033bb8c46ecd72796c040a08d9f5fd687fdeef00ef7058d583a16b4c8a0fded1b453b6649b2499a666634acbd69072b04425975767d446735baebe261ecdc7";
+      sha512 = "566af3a8dd91a10ef5dd4141bf8c02025def2bac2d127d9fea2d68a6849c3913132c9c9e44d72477f5228ec6425611f7128b1d9fbb281833d59b57ebbef245e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ro/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ro/firefox-59.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "bb25d1a3e2401ae384cf9295c2c61aa3d12b97a655cc45583be8baade89fbb7a5705b4603299d5fd8918c4e708dd7454e4d97ad2179a36911c0857a53b3f97e8";
+      sha512 = "928f11db94d739321b103d28d12d7e11c02bfad8618d53ec629dc754a0cb2592ebcacf8b1807b650f4e5f61fb9813c214e56aa4ab75e6d12daff6ab30574465b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ru/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ru/firefox-59.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "ac15a7a92864c7e1078c2b9dcc1c49d306188edef2dc04b1a55ee2cc507cc989d224bdd20a5985d83c23bce63973031fa5b2b20fb833a676e4a1d6d46a61ce88";
+      sha512 = "e3df779f2fb9cbedf69a6a30eeddc8ada96ab787f8d7fe1a962c03ef3f07ff8186bd57c103291c151a8009c26b9ef9b5428e47f8efafff34639d0ca48442d10d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/si/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/si/firefox-59.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "4c498fdffb167f4d5ce77ac3329080e5bd10766d3648d5ecbfb1a2535c9c0991399cd7aeb78978d239623b8cbf61a91de505b17644b0b4414ac26f40b8a79fce";
+      sha512 = "1c653f1bba2deaeddc36069b8d99c02e9683a9ed1cdf3cc319941dbdda2c5b89403f0da6c84de48ab4630926d9abc063072e9098e3154fabc342c6e22270a7cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/sk/firefox-59.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "8aa412871a5ec065e43153df859f340d1e2d04102ade4141849c385d9c2b051d525bda971840296210a24ee1327ffd4c9869ec1904f920f97d07a93ac67e188e";
+      sha512 = "fb26493156f2e8760310742b0801cae8849f97925d4ffeee46204c53304f8c83951b5722f0622f781f9eab771eb0b7fb11d6d4d9f0d3fcd8f135f5d9f0c6c3ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/sl/firefox-59.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "bf480809ca43829cbeb993e1cc1e619d2306fc3784db84575128905d4c81017a397b7951878b8fce22d34ffe03d2fa3c728e4dfec7799b18999221b4b8d71f6c";
+      sha512 = "95cda080b2cd952ccdef3ee5c8843e23355dca53dbb2d399d07151ad0ac4dfbfb14b916b021fdeef9b2f2a48dcaf8406df5c6e50ea9ff20d6d7375192ba58133";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/son/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/son/firefox-59.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "ef60a643cbab2337e2f9ba6a9faabb5574687cc588043b4f98d93a7af12d15be549cdde57ff5b1f8384fae155723023d1b5d1425951305530de0a35e765c9fc7";
+      sha512 = "b334363f51a91bd6a00cbd9159cbca1860c2f3964a2294cebdbb91d00d4e1d3269e551c49fd850d26de9cc6377c75138ce848d3b0300ed3bae503f1e725a6427";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sq/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/sq/firefox-59.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "408b87c1f055b9a53918f6bacd4d734b6129ab8b871b90c0244bd751be90e1abf7cc7c65d99ba44efbe738afd5c5c156b7e2771d762b28b227fafca3be9a08a4";
+      sha512 = "8cbc7084d340d3c4092c8b91f6ca2cfabee774198acd38ff50096edeb96dbee521e42b7be66a191cd5357d3b9ea591effd95b7c3d2003f61841dd7060595b563";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/sr/firefox-59.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "474e3eda5ab4f7b303c5c03b0d5750882244f929b1d1acb53f945194c90337cdf7ad7a21dcbfd9bcd4a2fc656233cf5fd6df339ed3e61ecd5194b2ac5783d13a";
+      sha512 = "59eeaedd60dc732a0a3fcad6983b45a8179b21ca32ab9f7b12b2c00e925b464214bb914cffbe809570c8e824773a8d0f36e4db6c257685fd44f72d008a289bb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/sv-SE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/sv-SE/firefox-59.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "bdf7f8c0b0395d67d2440cbea97a8eb575a1991ec9821b7019b90d01c1590ca916a6a83f55c2717c58cadc4e625d9eff73ace44ef5309caeece7e7dd4e1f169a";
+      sha512 = "dbafaa57a86b822806676a6e1ded9ef91a66e6986313637ddd6904a6de84c477c2bcc52f4f30e8313178b15e08bc8ab4ac96591ca45fc54ec85bdd90629a7b60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ta/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ta/firefox-59.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "a77214a5fac9f5c94b46a92776a6e31d83a42e506e4d2ca7e8aef8f14e764b921309963dfedfba7e06d1173262e7d1603a69989d7165daaa4921f04cf1bc7cf2";
+      sha512 = "b32d2ac7a2dfa9ab9b2e17f7f638d978b4ddb156656a4b7624015bfbf759842802514c5806c97ef8c54bc6d6e656d5080c11ae1822928b2c3d72c1f7cf6b0569";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/te/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/te/firefox-59.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "14721ce3b33ecaf10c6fc3d6fd304bab00587bc94851a08a4b1aadc46b87fbaf1a4f7caa37b89f8068f6c15e6d94c01c73b23fb1ed80707ac3bc12da7c443ad2";
+      sha512 = "88adaa5f8e1012d79cfc9f3e33a645513ad32188f32f584943336d77de7b18a58924c40d22d6e6d4c7fca9a0fb199c46571a0d7fdd5cff8c486889de187f4851";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/th/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/th/firefox-59.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9089175f670e061f66058af660a8380f8e9eb296a4cefe1aa8f9c73317c8aa7a0c592f0e4cad090b74886136eab0f974a2723b4930cfcbef764fc23552d53f88";
+      sha512 = "a3e53ef5694b0b5455a4f2711fdee3ae837f5f94943e603a65e1d11c9e9b9a0f779983c9912f310e834093889baec8fc3562ecbd5afba6ae7dd1e814f414eb5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/tr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/tr/firefox-59.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "073a8a0694f4b1c480731c2a673a034cb8d5293d58ba5cbded74c96f39ecc226d9c503b91490b0b94753bbf94d1397f58fc54f43f6ab06fdf85bee3f6de9ca77";
+      sha512 = "739603403c2c7e2a38c8b564461d4ff1de26a93b14b6cde0881f18c07357bfb725c1331c0a1adbd043c2b7a5ca02e01a583361b0412da77e2420eb8197c998d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/uk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/uk/firefox-59.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "df6071801ef922afdb91f9ce413bd840829dfaa0c984b78e61811f5b76f8fa15205636c4cae2ab024f917a4207b4ffbee27eb4bbc699a21adc5a04bed6873aa9";
+      sha512 = "f6eb7a107c75ba2a1653d1a7f0155394b6ff3fc95e0c04d61705aed829c28f3e337703f13663f64375c995cd3c1baf6d8dc4dc485a9d6e05d31e8b80ea415f77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/ur/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/ur/firefox-59.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "dbdec8a48060d534cca448394b06ab613efa5276b54e1e343a0f4addfac9299991394c0b98e5b2b9b16d07ae1098c3d62c2abf4966d963cfd3ead7c0ef54b7d0";
+      sha512 = "c89e2a4959991bdcde266b6ccda675ea4dbd8a580982c927f37df22128fe50a818c8cf01f88b6ed726f59f3e1d3357736a8b6cbd7eb87ec29600ae42e392a32f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/uz/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/uz/firefox-59.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "d742c0d9bc929654e67af2dafd1c1cfdbd0e6ca7e41944644a91e3acd01bbaea4365e3851cce964b9c073d448cae430133c675b52524e4c2faaf36b84455da32";
+      sha512 = "0946b37e30cf5237a92bcec1217a05b6a73f6ec93ee1a5681288f8297ce4fb169a67b2e9d9523c9ac11e6c371222ec4318f78ee5981bdc9a0368a75598dc09b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/vi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/vi/firefox-59.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c3609513673f8204991b7a96515a988da5d858b0e1f89fb3f83014c46eb13cb870507fbf043fdad8ca16af9e1d8aa476b7bcfb6b53b08e5673326ee1b49ad16d";
+      sha512 = "b6c0c35b047fec2a4f4a72c8013dffdea41fa04bb13c7fd3d87b48559442c5f474f23ba3db4268e39d99844862cdedb17ae7986be8fcabd42f029daafcb4adf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/xh/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/xh/firefox-59.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "1063702590acb172db8991e5f468ca16390b58937142045dfb74f32d636b2aea85dda874e7a98b206cfb9123305d896b5e74d9ff094a7cbbe2e2dcba184ccbbf";
+      sha512 = "3d3e9b60ff2e1822ccaf4e3742848b5815e89caf6096babc7296be4f17d6d0b768266d6355ff82e55018d8c868959b238060f3698e5c1c6f2907cabefa649ed6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/zh-CN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/zh-CN/firefox-59.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "9e8bbc1bf967a952c8f0236b877d4ca2b9cb6df7eaea676c243807d13e5a7d37ee9e1b9e7a62bb5f33fd0c103dfecc9569be271fa9df3fa0a0b2059cdc0801c2";
+      sha512 = "f34ab6c6df17688d3a7c7b93bf05b1db7253f84c80c9250d433382b97b993203eb70ae8569d0e41f63b3d7dabdb293d0d09573b7b4ad777d2128e9acd5116fe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-x86_64/zh-TW/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-x86_64/zh-TW/firefox-59.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "aad2b03100adc216f9db9a67b1b191f18c457f73f6370dde6b8ddb0a20550fb8cf05807857654d7c221bc02ab34c2fc4e6802d02793b517eec7d298fdb332f86";
+      sha512 = "add74f738b7f1569cb1036e11dbb0354c955b9e5733d4e95075833c5ee78ac952b0664e6f3b5e9f25c7270295128d774c045d4b84d5a82179075e1f3482a6724";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ach/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ach/firefox-59.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "16cdcfae8fd185c36dc7b776b9e8ae9187009993a7954a39e0241a759b128a70c6af13288eabb30217c63b8a20462ce424f66771f7307077c90fb3aaef290619";
+      sha512 = "723e20dffe1521794d323c1d2ea4fff5e1f45e9bf906458231db306b5b3818fd2da101c54b71ff782e131ecd39b1e9915a1f6b3da7e93e86e58e8af700e07735";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/af/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/af/firefox-59.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "9a6de409b160d530f4215dd7377626175e08f97d07da4c818c140029eb4bc095ae63de3cf29c959f925550cbbff9b9d4abbddeacfba25b942bad222377e25d46";
+      sha512 = "1ee86c023a14dad3a0c833d7532895ee8e7746e92e6615b9e93ec923612ad2efcdc370c305ed38d4eae09a999f16e30a7954481180036230280fb5a3510eb6d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/an/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/an/firefox-59.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "c01ccb442b54c66789d5c8a83abdd07681a0fb4c0a5dc89b484a080ec541364919f933a5c15d6548d6da71119e6e39a5e77998693565a9b35acbfa7fddce6031";
+      sha512 = "4129b0363089853b64c306aa2e482aba79b67390a5db241d8acf05aa5f2ea3c6a6e9de48e2e7c1bd34ac3a085bad4b5ff9cb80e090dac2fab22d77d839f0c361";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ar/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ar/firefox-59.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7a091aebf08965aa6710f4a3e62f3b97e528da63674e80e06eb2040a7b3f3ff8b43205d4e2f8623495a85cab874f6f960ca1137dd8f94cbd63ab5deee875f983";
+      sha512 = "d3179e3864ca8df90cd3e946e48849a9724c708bbbd4c3fcdf795e8b897fe6914f019b6ef6a375116c730dc875bec9c97275a29dc9f85213cd54ae97224e78c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/as/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/as/firefox-59.0b10.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "e77170c8a24a08b7d6f1be2fa33ac5517f1ecd2782bed6d27994ff81f95ce9c2de27e3f3f088bee402187fbfe5429ab697bb34551caf7d61ec9563357cbdcecb";
+      sha512 = "ebcedd1fe461f4c46eeb3d506985fa2b73dfa95aadf2f275f3dbc26643acbc13067757822953db3ee1276ae1d7bd6aad6a56d3add6497970838016d59b5712db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ast/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ast/firefox-59.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3955b2ef1d58a67f9d9adc069869733864c7c97daf5117297e02750c81e67466af2ffb6e18e349bcbeecba27473313018e11cfd2bfff9d98969c761bc741a688";
+      sha512 = "0aa59365b855de6cb628d72dc2418602a307671c5bb1a28f33c8dba0793a6631a81d1f55d83d85731802a49461edcb14d581ff260258585c83598019a9b918da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/az/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/az/firefox-59.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "71501be0ccc1692b848783f532b9465e611a0f3f86358a8623f0ada5776a57e44d11a6cc4bbc8676aa25b3d583bdafcb48532a4315732b93a64aff1ed4915810";
+      sha512 = "5f6163b104235530abf7adbd4fa37c329d924b473459a5887b21c671b29ab6d12e9c898cdba72411a613bed250baca9944942a1521c2389ad07c682874e6f58e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/be/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/be/firefox-59.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "dd460bae5afece025c2cec2dadecd007ed3f336419e989a2d62d9d6f10747e4c822cf409fbfc9f7320884f296830bf2fc31589d6b9c168276883af9365a2b42e";
+      sha512 = "a8489947c9324d09548cb0e39182824d644ed9e46f48e6cffb6bee9b34ebd59b06a96a14ed78613a2d49a4ebbc8dc0af9ba2caba695c92556734a9bc285bc195";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bg/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/bg/firefox-59.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "edd8c95113131cc48b165ee0b4152885b374b4b01a2ba12d3b63b6640a0f14cc3c5d788d7ffcf1865a3a8832d62ef71c0feaa22b980b2e98e94155584cb8abcc";
+      sha512 = "2976a1223f61363f6ae817ebe80eaf7229bae8c0d82ce77cbfce9fb7b6f098af69d466b9e18b0c8686692b9d9acd1123f3ea0683553cc6fd5356f0cfa3117bbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bn-BD/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/bn-BD/firefox-59.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "69718622ed47a50a5f58397097515b1bd349341a816d9bb646bd40bd6ad96a391379c2bc593cb6fc11c253a2a9da7924db7adf702f90e0f77fc5b4de68f47f62";
+      sha512 = "3cc8f3072c39f77491144277fc0a754f6af7dcd3321eee311ab64cf541ad071b82f58f7921420a7d83f5f42d21d9a6239101bf6f73268097a7baf8e9948e3b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bn-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/bn-IN/firefox-59.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "5c69514b6c919e9fb53f1f13c6e13e79b47e4169fb91a532101d3878e5401e88f382bd965f835f152e6e6c4f0723e2e604d01d85b58cd58ec72042ecdfed01d4";
+      sha512 = "264d2b825fd2ac012feb2c68af29a44f3a9164768dc113b7174ecc47f41357b745b01ceffeeee39e024e5b3322ab4063c4125bf2b8bf83282c255cc3c69f8333";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/br/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/br/firefox-59.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "67844d13ced74f4916ee684acd5f40af391099141721fe463fd0c781966f16be11c04be1d8d8f1128576a3c8987392d70d92dbc6028453851be0473a770a233e";
+      sha512 = "143c2e6e2f4375857152563e8f8ba0c4b540ba8b92cde66c02e6d2df608a1b1cbbbd8d378068f02cb0472d8dcf86445a90bd3cf0dd945c1a2d09233e261110e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/bs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/bs/firefox-59.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "a6342c9dc7f10c10308cdf8a4c974661a9aba90fe88a8de4945b438ea44a404c0bfca5af0ba361026a275e39828b6bbd4fe4fa7edba292440816b076b630a927";
+      sha512 = "f70588fd50c55ec4d6f1dd5de3c2757ab85d40d0c42bef5db06bc68e77264f5cc06f181a630a65778efabc5d0853a91b7977f3f2e2af7e7849a822794099fc5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ca/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ca/firefox-59.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "44d001522f432884aa9a8aa9ac85244bd74605be09865a72a15bda297a2cd9b80c8380842bd6e85d444d9d3e1c518942e47ba58641146dab2d7d17fb2bd8a377";
+      sha512 = "c32b3e64d4ad042220229265e2d301f7b4dd7908a6af128dbd3701c034c17efac17ef81156ffe4ca10a68afbfd724ab0a2a96b1208c29be32cb5e1260e685773";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/cak/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/cak/firefox-59.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "8f9e1a6d100a98afda2e355ac117839a196899356aaa47881ef0fe4f236a68f6fbbc1446c6ae03324d05d91879791878ebef40341d133ef9ae55a0478663ac5d";
+      sha512 = "638c5abe4af2171e27d2cb0cbfd197e94038ee12d460ece3a54586a51321dae642956c1daad1e45cc03a866e4fd101d063b082e6b976a391a23265789b2acb95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/cs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/cs/firefox-59.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "26110672c5f1ada5a26ca2422a1c42c44579a8d69f612a628993bd0a7bcd7bfbe43e9cf913a010eff929c159b3eef4d4e7c4e165d8f855361fe0fac6934313ed";
+      sha512 = "e80e616ca97d525c624c8204e5cde1c0f43dadb8d7abdc7ca2dbf54a75bf07e958db340d2ab121fd8f45b7d95d67145d47cdaed71cf56d3b45921768d039e0bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/cy/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/cy/firefox-59.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "98fdcf7351cc9d0b2e856200bc188ba0915012ef69122ea6cf7404cbbb5781c57e45632d366d2bbf71b1be2600152e60a42b9831cb242ecf031f65d869bb9f01";
+      sha512 = "2aa8a0038a42400421f9becf418c4eed54a68114516affbb5b6141cb87627bb0b31f8477a88f6594025391aefcd01728834e355b211ab7d98c2f6f109148f87f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/da/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/da/firefox-59.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "8d6b7f0778d0cac258374a1b74cf48c899d68d0b6ed8a4a289ef5b4e4ab704ba29c692ed33933c785b91dcd5df28afd8ec998825c581e669b6ed8997f12bf46d";
+      sha512 = "34567f758ab943e01c2f86024615d89049101cbcb78eb9565d41832075ec2fc6826cd7e0f9a14b73d07918725960c1ef6b4a15c634ed05b31e6946d43d4a81c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/de/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/de/firefox-59.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "82f232d47ec06cb7497b5ddf895c838ba3a74c19cf3438a70486bb3d1a4fabb6b283b6a193ef34bff80f993552e04ca2b94b130100b42d47f1609a4af16a19dc";
+      sha512 = "2b80aa6635591864c31897c8fdf3d3ef2513fca824696687674cb7a64cbe3131bbb37e0a102f9756e5635de4e26433f7dab859f7d0d9d5183e5a27f7eb9ae985";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/dsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/dsb/firefox-59.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "f0f647ededa2848c33bd1e05d9d97ce606b93659a74abd24fd8cd230f4b765606a519f123b944888fcb3c9de2764bfff580739df71d683e000a9fa799976329d";
+      sha512 = "f4295d0089ede2a60089b5bec3dafdb5625d14b99a9ca76c160fd6e1b165285697964756d33a0bfa7896e0ba3be0369d564228273a5fbd80648ad991396f57b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/el/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/el/firefox-59.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "e57db46a1bca9715219e57c64c631855b31c77a111fbd727c546655df250c9edba649627aca64f51070e5b0c590469b0fa24b028e12311aa905dcff27105522c";
+      sha512 = "b8dc0dca058a5ec42a1b870aed827f5b1e9b9828b23861f9c71174c1c7083d11d0a0b0e5054d003b3fa10137260e4ba3d45865379010335b5b386b0baa43d008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/en-GB/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/en-GB/firefox-59.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "300b2c6a04188660e3db120ed7e7dd9ef7f1b862698cb67eed0bf679e3b85abb1eb0b4b01d615c9ab48d4ce3c399f905c291f74ea1ac7268da15cd6f78bba4d5";
+      sha512 = "077b9fd6185bf39bed0fabdd66598be60af2500ce7df9edc8db336e5368abd20a174664a7f38e207cda1a5d30fd2eecca9ff8ae8a7744c055c206dfe3e0b8935";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/en-US/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/en-US/firefox-59.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "45a9aabdb3cd3eaa50057e796d3878fd54eee6ff5a06ae05616467614add5395adf002b8eeed3828723ccaeb09ebe50fb4da86d32e891edc7f90d34c67a27d60";
+      sha512 = "5da4b4dfbe842d0e39ef7de0225f52fead20f132b01b8c824945bfe37e52397ba766c646911db4919152f10bd99c5e17946cb1811d1339f110413f60728ca786";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/en-ZA/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/en-ZA/firefox-59.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "003228e421cb69e4a6d14f357f85f024857b0c685aecad342cd8dc603b26f77db68d8faf20aaf78cf8600abf55881c2dd7f475b213a4b40059df877647077b25";
+      sha512 = "41dfb32677c420c6c1fecd8cf5d0e2a57e252e166b86ee02c0a3815440f12a1d677b9bd82e74f0a8ed064f233f3e47b4da95669f204dae95691e1281ac33d354";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/eo/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/eo/firefox-59.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "be38114d551f5d38b15933c53bd5c2a0f14a7b719210f71b9e2bc73e5cf35f4ba5b88e75e516732335c18b7c38ebb1c78c0e9f2743f78dd45b631460abf02e74";
+      sha512 = "7b88bbc652a15024ef64d99fddfd1cef0f6802196dc909607ebc03acbbfe0c960747717e61f3400678fbf916e38e0af21607304da552250ec322d373eefc9954";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-AR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/es-AR/firefox-59.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "3d4c31b75cd52ffa705d9f4eece4d0162ab002be4b9a6934668be98f60c4a1cf1b697d052a1355e5977f4c86dbd6ec0bc1de015f06c779406cbc0486086ee095";
+      sha512 = "f876dffd575221ac4a0444f17363e7fdcfaa38fb4a919ad114c86280669b8553e3e1b4e93cb31d9b89f65a45abee0fd111ae39f7c9d813e2e4cbd44dcc925c08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-CL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/es-CL/firefox-59.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "ee03cbf35b4c9f00e1c5fd91437e8fa5738e96de02b5b98498f8914aa4f97111e07b4e5fd9b07d19e56ea5038521cf8946c95cc8a0e1964c41c7ec3b3525b315";
+      sha512 = "88031ddd054383d649762cde7fab0e34974e148efe8189992b45fb8925df9e393d2011db18e5ee54bbd2dc3e9bac9ed8a85b2901fec490f24fc72c49da0e83e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-ES/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/es-ES/firefox-59.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "8173a9a80a281c933bced8c7eeaaefeb131c650de6af2ca4694a5e5eb4ad7312ac99642bb7fabc70d5652bacb04069927ff76d11a7f765fcd1b7292243a62f97";
+      sha512 = "6d3cf86e7f529ba891633eb7c2d828f744c3b341b07282cf0b263901161a5040eef7bea4b2893d6f00a3a01a31da3c7c77d422f1d56d3c7ad7a5e0b3e7ad7265";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/es-MX/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/es-MX/firefox-59.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "c5f92fae20e0220e6a2cdb158e266f0033ab7edb21c1903c17b722e21f2c0a070fcbca94c4f204a7f818def8fa6ae6429a20b9e63d9a5544537d0744d551b210";
+      sha512 = "ade9fd8745e6f173fc50f2de4131132aef0629340dd9c9444518271aa559ec42f64b64ec7f253d69e0050d8396db0168ecdb9380b33242f0a2f2639b6fee88c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/et/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/et/firefox-59.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "d23400c74303899a05b4fd8ad27337e8acf913a2fd1aedc6cee4d3f0650720f4bbc1df9a723579120ef859d4454a290a3e1607803be430e6e8f41e2bfebe4286";
+      sha512 = "8bb3454885d0983ab567a08222709ccb670473b7fce6cecac3444254f952c7d9c5879d127445dddaa8517bfd86c59e0eb859b8056711f8f7bf539b5e519170d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/eu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/eu/firefox-59.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "77d6836b724f41382e11c57f940e35c6e78127e1bab2b2dddb80d6f3b9b92b1a1c6353e230f9cdb743eeafad421f05b0f398b0f15a6f09330dd2d7191bc0cd3e";
+      sha512 = "4c35da88832ed1f84a72a67996dcb0c784422fe8ad2a94f50974b17f31bbdc7a3aea29860533dc213c09ba3416936e231e9d31d7601c8f8001e7b624a2d79b75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fa/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/fa/firefox-59.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "8d3798658ebedb5aa8240d69ccd838bdf506bc6a8b1d916846b5aaa2f2d02e75f871e7efcca416b6729756bdf024c5edd6de60abe1720b70640db9881c964431";
+      sha512 = "fa61f66594e802b4d25427de4bf6bf4eb9ee47503a85121ede40f6545c05c44c5f3981bd4f63b2682309b10e7badc9e7062b7bb9ed2841b68f7e469a647b4ffa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ff/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ff/firefox-59.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "9d19ad35f48f9d9c8e7df2f1ae31f5141f89b69f77f9e7194d551763f77259b763bdad5c88f1b02fdeeccb96ea8e18022faba9853ee58c4749e12b220044d88c";
+      sha512 = "f15f6969bb912f8e3655e0c66e7bd0cb2249c5bad684b2b2d2047acc076a35b5f9251ee750569e6c70c60cfd128ad83235478f4f0e3d2851c340ec54baf4bacd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/fi/firefox-59.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1b0c74cbf7cbcc6c4711696fde9d292462acdd3038b4fb95f8ebc3d8d60efcb6bedcf4b7fa7676a31bbcff5508ef4b6c7ecc5e43387e55c7a7b535d37d1a30ac";
+      sha512 = "be05527dff205c9cfff54d11c7bdb3e9c163ad0a529dd87e0c08d16a1019731bb0a884d334c0fbadfe6a64b2fe9f6bef9b432d546b3f29bc00ebbf0c4379c64e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/fr/firefox-59.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "71aedcc83cab05936a3f5a1108969720da1bba80c3fb69da91121039c0de6afc7663b3c220bb25cc35bb883e47067c67117a2f231aa2fae1f3636aa31f37e491";
+      sha512 = "d1df2b6bf6466d6440fcc00f8a86176b7184e4bbb09f7d00f415f06e7adab5fc92175cf23f03964cff209ecc601276f468109091b5d8c155230444618f495ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/fy-NL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/fy-NL/firefox-59.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "78c8de461444c1fde5344ada624255e1b384798de7b4a937a9208aac0515b9d27c97e39fb7cdf369a38b38252c800235ca4c507deeeb24d9db78b1296d27a544";
+      sha512 = "c0f2031628be64226600ed2783f3540cf1bc9023515d9f9db6b3fd176504e730c89828c76424c732f0efc26e95ac36a3a8b315689bad38101f7876025c33ee73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ga-IE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ga-IE/firefox-59.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "e30b5aa9815c45c890abbb08a2347b2040cf90be53b7c85289c5c44fb260ea712b726b4ae1e0e2ce1e6236958e812e96269c92d4d3685f33d0386b606aecf916";
+      sha512 = "972afef4b2d5edcbd10f5c4aa177beb4602b145bd5da936ee174fec3772e5f47fd09774eb128cb498d53b04cef8ba3c5b46dc860cbf8a6219a36b06c2c6d139b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gd/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/gd/firefox-59.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e5fefdc0be186fa4201858ec239c8275a2d8c5565e86c2973175cfb40f46be5aec8bde8986868b95ebd83fb6633cf5c857704d624af23141a6a797cc0b8cb75d";
+      sha512 = "71fbdaf56b1b0fabe78650ec6a96c0571314e81aff9831937fc6358462b6ed0c031bff89ab570f8f2e2ab925771a17e5a0b8bd4658c812c87fd79d862b960304";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/gl/firefox-59.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "a0c28cae5da059fa648c919542ea7b5a76f14a8bf57a911efad4a5e362f7cd92322d760caaf3260efbde334e3366c234d4baee08de3e5f85d0b58989ef5f2277";
+      sha512 = "4a72cbe10940320a81901db47c72abafac8a551d2181a92c636685d33271caf9332319c833402d396634ae4e25a627c42b58229bcb13c81778e2d31cc8db92f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/gn/firefox-59.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "a085a51943870fa0c5addeea3d1132415a838ae004edd8ccc05f2da587b8f6fd0354300ff2a97d3e9bbcccc3e2337822a30638957566953a50f7600391e16e59";
+      sha512 = "8d95ce3b75ae7941a4d6601c03bc015f7ce5eba486aec155df3296013b8618c179c5da382ed09e8ea4710c4ae8ceb19a6d408698f2206240314cbab7759cb8b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/gu-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/gu-IN/firefox-59.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "5c2e2c48973ff021c4549345bc10ee9d60153279bdca93b18e58518c98702e9e7a57bd5729e5235a15e191292239d0d69f2272d4f10d5bb3c726c9c332ff8a05";
+      sha512 = "015bd8da44d1fa97ae70ec09ae3d280091e3cae18a36a5a7fe2bad098d160a6c6dc3612bc9933a7e5ba63588b120a0a7c9e2d70d03fb03ce738822d7301900f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/he/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/he/firefox-59.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "27c6c567a84269c64d347accd646e39504c44c7a6b60766ad9cbe1b2d5af23c33abbfcf3182fc8a730405b8e45dae96a19acbd96dc45d8b8d81b52493c75e5d7";
+      sha512 = "d4a90c1f4db4eaf6bbe40c89a8a49d16606b9ae658d7f656e846b23c3e73b79737ca080a9f2922a5bff570772bed1ae691941ce73a4c24925fd1fa1c73adcc98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hi-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/hi-IN/firefox-59.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "1a440b4588a965010455e40f9c5ffe75066a5e13a322d7b33ca579266d5fe8ba8966b58ad1a1c547ce2323f962da88aee0d8f75fb2826cce40802147ac35054e";
+      sha512 = "5c81a1c6ac96c097d35bb64690552b82c0de977742fbb9505d5b5ff76a7ddb9093d1c0102ba84dab24b4491e2ee6f1a04a0e782c196e83499ede1e3db3bf8b78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/hr/firefox-59.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "a673683f09f63c1020d0d4517f14d4333cb17f77685f1e3a20ced519a29f17701cb4451e951672bee6f473b7884e08f59d2f9e3beaaab613537f7637abdcad81";
+      sha512 = "9ffee7fe2a4bc335dd45a740c0f2473225f3c93f5692b59411c7d7ea884f47d72f50e0a8fc2bb1b48c72f3820bab241f7a77e9a03688f494237acb392c675564";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/hsb/firefox-59.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5a85f81113a3c3cccc93e98a129b8d21e29151533ca22a0454fd46ec8f5146ae5441d3592b3cceffb874d8264acadd28c36660c5a50e9517a622522c2eda9229";
+      sha512 = "e88351ce38b10aacfaff4d3e31a2dc057fc2f2af14e1154f297f8384bf5a4fcf0572a1539aeadbce23023222dd79da91616dbcf1ad9588451f17d90367dcd613";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/hu/firefox-59.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "0eed12553cc29c218c89c5444b1f2bd8cc2911f7dbaca52afdf49dcbde66132d7d5b241ae71b2fc36b622d2f9eaf0de86245e5cab74a085f36ec70de31d7201f";
+      sha512 = "b7898b65d9bca55b4be11d2eab0dd543968610e80caedc43e80aeabcec0eeddb837507d1f2e9196accc9f4779a34600c40afc2f3d8285f027e2305b168a75e77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/hy-AM/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/hy-AM/firefox-59.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "874706c361ec7d9d3e1730476a71d339d6bea18c873a78b420615f95d7c640fd4040a1c8e8dcc5b99f45d625ca1a7f9524c321e76d0f0300b23f97bb6d7f4d34";
+      sha512 = "2be9e9b7d6e123e381fa819e14fd4146770b251ecb3013cb4dee51799553c3aa2d3ddadea1df27694b567d69e06421a92ec251c506440d2b4cfd17ffe94f4ff3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ia/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ia/firefox-59.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "28ee6c4ed8a1bb1b4c1323a41e9d1d1661317d8fb9888c0d7a0a5dd28ac9ec54742f97fb85e8cc34763c4eb1acc156be605b193d6bca7a3ce27f0b7d37415d11";
+      sha512 = "a9ab4d70a0c0b5010a4c0941a8e83153ea090c027129590eaddfd1e2ab0f453bba803ababe54b61e54ab16e34834e4046680b2d94a477c04f2983c1f62cd55fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/id/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/id/firefox-59.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "335499158c340bb855fabbc2188dc610cf6c8dfa39dd7cf8b52cef9e415a62a121c3f341dca219de4595d6fbd0feedfed16fabc8c5d69a9834d928a0a718951c";
+      sha512 = "2a9abc63807bbc277a66c997468699e37ca416c9b1851f8d3fc7a350a98f1b5c17c0c47df0a3dd20867fc75b1bb669cdac06535c5d240fcb0f3cd02743765db3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/is/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/is/firefox-59.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "594a8d34c2254234b375d92601eafbd3c15594af392798f1a39e01dacd431fc4da93658e23cd3c2e2d0f0c5677bf26dbfca0afd3a9322c65b9093a992454b5bb";
+      sha512 = "4b3637f6511bd6342096461cf29c1c5467ece26f3d0e68f368ccb19ee9690b0f261c9c2aa01bc2de754a1058f88d1e108509173b73f0d73a522fe445c1ffa33f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/it/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/it/firefox-59.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c49268d4641de170cda8e24ea449747f345d4f32ebb9acc916e7db15fc5ff88418109dd6f01dd8ff648ae6bde61efe76f0e4024b5c8b5ef0460e56fabdef5faa";
+      sha512 = "3dec7921fc051e5159e6f9a0b33727679f712a89774d5a50078d6aa0de994bef54aa175f9dd7c1a62a3a86f626327c564b852c073cfc17496d9ce192140ac974";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ja/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ja/firefox-59.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "dc196487f3005bab86c3feb9d6b91db02429f0a19ccff6773ed79ab7539332e30a36a34c3ec973520ad877d5d6f6a060166e05ce462571eb2db206b511836c94";
+      sha512 = "bc14e44198bac4476305977db972198c310b6c5cdfb4d59ecdeb4abff77ef333cc996ae1e7920459efdc52e2b150bc507699f2c468d8273c04f09a4da1d3c31b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ka/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ka/firefox-59.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "fc3b491df9c014b2f8b19990e26d581dcfed014a57fcd6668d4ce8a7008f6875bf4310c5ba3a891b0b261a87faeddc0b4d076bee61f4be9759c44feaa8eb6a4c";
+      sha512 = "e9b9f5c9751f0dd96fc15f2d4c35e9417ae91b6d44cd1f6da84d4ac7bef380fb5ab5cf44eb1564034e55b7cb94bbbb6bf6c653d9d6fc74a7e40f5046f77786f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/kab/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/kab/firefox-59.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "4bc6823f0fa52ffc4b9b8b06a86d996786666cca4b752a17ed63928f07b810f99cfe2f2edaf6dfa51be0f986a21616928e2c5cacce4c04869eadc71df83a7c67";
+      sha512 = "9626b3db1477acbf3d16b9f9cdaecbc2a408987b21970fd091ea1db384709d0a7e0536a9a4fea6e6081d439a3b64d9b2995e8c4b5a39289f05606aa1ecbbdeca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/kk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/kk/firefox-59.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f29c52e225abb3c9201555887d87d23e24e97634fa8dd3efed74b0f9045778c9892d23ff2e2819a5a49126cec69c9a006d456f35c7552352d3dc83d5be800500";
+      sha512 = "8919e03f9725c7b8c71468c188eee19fec16627793ab22d7350ea2edde405909727b1559e63f4249fbd2415b717e6a4019c5285901d7e45747c6397bce951b34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/km/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/km/firefox-59.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "a5ef092dca22b204a1e2cb28410d79fdb04bf37529fb1b66417a7ca55ba40b42c5765a24d05af3b8b8093acea62ce8a39e9596da0dfd6e70139c5384aa60cf29";
+      sha512 = "837a35249670a121fee75d129a992af646464212178980a9cb9500f9f79b1418026a066ee3fe744eb1d05a183dc0cd5a4231be57aa8901526504b81f577d0e99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/kn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/kn/firefox-59.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "d1fd86071521fa8dbbae1c458bff768def5b804179911efee344000f70473acf4a17bf9797fa43952491cc101b0c6658c57a1163d89214ccc070378d4dc1a274";
+      sha512 = "8ec37da221f597f428bd4995ea3157eeb0ebda9f74fdd94dcc032e4b37f54375fa2fb6a81dcf50458265f1610f17222c811aa882e3f66d2225691682656ea89b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ko/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ko/firefox-59.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "973d9e47a567e9c82f156a8badc10afd4697801dfd375248d73ef425f7f7a020d0985ad771b273157b17807d2689d96665018869d653207cd7c813aa1fe397d1";
+      sha512 = "7c8cc9a056fd9bbabb6ad6f23dea2592077d473b2b2a2ef161aeb7034e2ec6fe92c27967b7d631cbf9f7dce1e3a102e9a9c7274b1add7ba158225b922cf889b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/lij/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/lij/firefox-59.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "9081a2b3cd31887609d11838ebf04c7c6316efe96c922c27f7a2021d9ee090063e61ca8949f8658d53e470044aab3f730184617f07386801bc252cdb61f77ab6";
+      sha512 = "2b1f129ef2115b227d743e37402b3f66ecd807ba8d6bd01e419a8a927ffe4a02ee37f168557ce5f05d2fa8ddc43400db9037e1550b892a5d84b47dd70a930a31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/lt/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/lt/firefox-59.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "4c1ba961d6da588d82d061b2f6b1b27d0885491450ed8e8c747f2150b43c576af99a9d498ba761f7273e30ab897ebaadf62a927b7654116cd01d9553be7f8657";
+      sha512 = "0b349bac56cb6d84400cc4ece681dc4335e6f31378805ffe32740d1fe90158b972acff1e8f4e3968f7fce1b63e859ba9296025681020bb6fed7198bb725476d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/lv/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/lv/firefox-59.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "725ef29e18cd01d55133f293747e365a055083a16a3a0972b7f3336a1bcfdb2f70ffb215bc53f95d037e3e9e42918c5255b89203e9e18a71abeb7e01a0ec8f50";
+      sha512 = "824f6ffc77a52df59e65a33694a9560966ad7a7e5807a3cc1758637371005b312a85f97b558e3cb24632e7c84501e940fa2c4b0f22d0fd632a145a002ee90066";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/mai/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/mai/firefox-59.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "557ac856be89700220cbb91baf0eba6c8dbb99167e981c0c70caab77405f261a81c4aa51e71e2aa249d105c49a034f2bdfffbedf65531ab64af69c312eb97591";
+      sha512 = "83104e8a1dc752cf89ab44fba4cc86ea2a504d37573b5a093d105fa42b02d3f4b7a829d53fdfa4243c520678fe55e852b46287cfa860451f1b1b2d2b46384aa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/mk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/mk/firefox-59.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "1d86dd693c51f13ce93f66525ce086b3e4556044ad757d0f1dbb2fbae838b3bf540057db249cedc3ed5a0b339fba0208863172f891155f46c0239fa35a8739df";
+      sha512 = "f3b2b1de51004b7b817a5421fece1e9627709f352f8079d9c578422be337fca66d0b8bd9941e91efb94a3e67f89c641bb5a4aff962b63c22e45879c47495a2d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ml/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ml/firefox-59.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "a7315761acf610859798613aba1152ebf680cb03d06ff4f878427fd5392014c7d86bb3e89f6e43e39f07ee8aa8a5ef9f126b206d38c649f32d8e8d3ece2b2780";
+      sha512 = "e2244cde24a267155e17965b9f605365433599df7ae50a547da6c74c3a4b84703013672eac8ec6e021e3e443f4efa7f6ae4e6b282035aeb67eb1a780ff975e79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/mr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/mr/firefox-59.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "cb06a7848f51ba74c855c3a433361818daaf784530643e7c660883d7bbf16de6c02ad5e94681ee20784bfdcb5fa9e98bcd40554e59ba72523b4889e152d17e83";
+      sha512 = "383faaf2f9678a78db87e296aa221246a683df9dd67afd00b2838ba3c3740864072cdd5874c447e6fe5a8863fb0f045b9f5f0850a028cf18e681bae33e2ec04a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ms/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ms/firefox-59.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "7bcbe813839ddc817d02536840201aae2b971cfb05bfb4059727efc4b7fcf3ffb9107ed9220ec18968a0bce29cbc051d9fcd3fd122f7b988b58093afb7a72d98";
+      sha512 = "134f8e9da04c2c39f4a143cf5131fbe9762b6469ed3214e206c8bfd01b992c8174ef7e25c4b1a501a781b81b8eb3f05f3dfb5f2326ddaedd3b9300bffa907e7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/my/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/my/firefox-59.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "e3243d3411bdba7602bd61eac32cb5f9f2d3ae93f524e7faf1ad506a6917c616e3d0cf4772c0676ca7ce7e6649fbfff173a3443a7281e9fae16ef527a8fae3ee";
+      sha512 = "91aa41f22b8ee9ff8966d9fc87436ac7dfa343aa862562ea3ee45c16026cefb262105e4648180143de9c58221238d2aeee153ac54af5e7b4c87f1e18a6432dff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/nb-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/nb-NO/firefox-59.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "1c8a1dcf25c732654605af8f545aa7fc9010be083ba1306463616d69e16c1d707f5f9a415724b4fa025006783d093f58ab8c29259205ab67b0f9424a7d2fe480";
+      sha512 = "2cba3ec4e27580d3628633cfddce70f86d73f02316df0fdf4d503c6787868218ad1a425ccc1c25cf021b43ca80404c4407958058e61108a1f7e9149475a73872";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ne-NP/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ne-NP/firefox-59.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "1dcfe0b5d8b59e16869130103b5a8b86dab18421c66fb08dae348d74530517eeb10694744d0f6758a8b67d80892c5110067f18bfea8bbe137cb3e051fc3f6b8e";
+      sha512 = "0116db2fc2ec69521591e3101aa3f2e8a5b1953f879316acfd7dc4ba4742b90f503a11ca7108fcdc8d39b8a6c65bd71f167b4e4750c30219ceb60aa8c1b65c93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/nl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/nl/firefox-59.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "63d3586ae6872e6c8d107e40ca7fb88f37dd6ef49dab4d7bb784981b4a0bc3ed660701c3b6d6785ad837d5effed8635ce9cb9424d17b67f96d38eec83327af8f";
+      sha512 = "b35291636fca1c0e5767df5fe43c6461f27af1a002985869a35970a72d26e01be2fb3285d493ba33cd6ba44b7b0008df9b885978c4298e0ebbe76c066f7dc47b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/nn-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/nn-NO/firefox-59.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "2b6b4178b442e37fb9dbc62fcaba972ef8d999832f656572171d5e58de7a4bc81ea2d3502e5e8b391c0de509d5013987d4ddb80852b2f650afc90a2e32b24714";
+      sha512 = "7e237f7dc56ce897a3c58b52eb9e3aba3b6ac9407644ffb64ac891682c1602194d6fe17c95e79ba6d1f6a9f6dc68dcf8d6c5f0116f5133e7b9d34987679a7d2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/or/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/or/firefox-59.0b10.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "284347f6a03bdd4cc4909ab051c265df577a1ff362877d1364e81c526b88c37ae5e124a5d2db62f2aa91825aa5ba9f478f77952df216d8216014c28c45aaaa42";
+      sha512 = "75242caa2021c4b0ee15d6158d11bb3d84151fc0504a2cb1fa55d80cf8f02a40607821db8aa0e3aa2a468b9bd9c84b9dae6a5c8871d8658104ee0068bec45998";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pa-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/pa-IN/firefox-59.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "b740844ce2308e86d5fa17a054d3c1ae6c52925d9832287e73b7c659271f38824bbf2cc37e13687d52246f840de501d929bb86cb2962adffff233a54135b9299";
+      sha512 = "81d6dcbfb7e8270e0abbffbd4c090bb7bb8da1d681a9960aa22af463e55af2c83aa6a3c0c07613e9916fe5e456b61f1ed368fee38ac5234ba4e97c88f612ef5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/pl/firefox-59.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "c6e3db290157767d97293992258bb51d7048c221bd6a02f3ad1df84034a459e985a7e1309028287f8dcfc744d05968b01d989c61dd1e430d0875e8cabd0163b5";
+      sha512 = "97d2b31ce3b375acecb10dc070b44ff8f97854a9969d157108364afff9150cea894f7b410eea53ccbd944ca7842178efb592e92d328bb13b9cf4f24f1d182f7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pt-BR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/pt-BR/firefox-59.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "85598285f1efeed867b684351c9553e670e451eba50d843a7e15cd06adf8de361c26fb731a53833fbcf756641a236f0ae9d1d981f1ec872f8601570b058b94d3";
+      sha512 = "c7b3ec4aa580ccc899ef692cc6f289e4a81e22ecab6283697f01d953a2f157573179ae083f1627171bc123a88b9fa292f43ddbf7cc727980a5b2cace896555e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/pt-PT/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/pt-PT/firefox-59.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "bbd1d55ae42e84d0f1c0ee47c34096ce91114d323509a94703bfa5dc42186b8e7d1337d7ddd88ba67a10f5a4b25e07d53bd512d31a0cd248df1c487e3cb90ff1";
+      sha512 = "e12a82acf09200cd326e91d0efbedde7411380f7045321c6fb7217c5f4572ab2c68f6c5e362d8a9d41392e0c8f2078f6d996d05a52658b80143fd35dc5aaeb7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/rm/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/rm/firefox-59.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "44f1cd1e279e8d1abe73fd98688ec639cb8fdfa40484e7273fd7301974477ce30c2a49dc69508f564865f96fd70b686e1c7f1c24ad0b919113deb2769034ab56";
+      sha512 = "698856a52c73a1c3341cb542651a55a6327f21def51da1710c598ff36c46439d29406735f6f0f6a9b0cfc2128d4faf5ec2af7a65afe01ef3c24d4fddc3169849";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ro/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ro/firefox-59.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f1514b8d1d1ea2600241ae36b0a5f40993b781bd7f9c8d75a6dafafe11b3a87b1256f33ba8014b7bec8bd5b9fd2e52bb06ddab400ed88dd00fcadd7dde36ffad";
+      sha512 = "132b308252875aebef4690c8043e6e98e0f888a5a4fd47b999f1aaf4677c36aaa9204734dfdd70bae662e6f5ddc7c359e7558a7d84fa9c87acd749cc6ee64886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ru/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ru/firefox-59.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "46be3e87169f3c3bd24116ef282a9997277682b6601586b0bd041314c9030b77903d8f3e2a3bff6e7cd9d73cff1394537e96aa4a46fa2ffe807ec3947f099021";
+      sha512 = "62d3c2f435251f08b6cba0b6d1449b8082b8c1417e3097dc2b1b84340098a5de114dad565af75e1b283bc862593e1e2b2f027f5f051c47bc36605abeba2c28b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/si/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/si/firefox-59.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "9568653aa064facd613bf67782fac72a4654116f7cb9418ce21f1990601416c36096694e061d941bc853dd9a2072a9f713c3f12cf5f88891223ddc4d1ef02034";
+      sha512 = "e0643e13224e98ffed9b1dce880036d4e4f6f4ee40c70e8e33f8f2260287faa6be9f0a917c1f8f7f3797cf10852256c85443291c8134f6c4b8d79523ae58d5c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/sk/firefox-59.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "4cfc9cafc1a3fbc34183634fbdeee908c6723e32fae3680101f9cd00f22262f5624116cd2e15ed3f0a1e9c0ac8c829d023fdf651d09b3aad2856b518576f1a5b";
+      sha512 = "0122d88efce5b2dc6643376a47988e9ccb3969caa6c1213ff343eb2bf85ca11e3fe287c76b9ca53e76fe08976b7ef567b4c89fe67844d00eae523de000be8b22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/sl/firefox-59.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "741d63fb0cb28116ff03aaf89a4ac6cae05b1ee6232f3d5b7a03fc20f3c7502908b2865694d5972c96275f1bed82a9545c22ac150a176e2bc7323cd46df4ae53";
+      sha512 = "0898ad77ee7b0d902739553754f2edcee538c0b951504d53a9e0bb8c0dac1bf53f0b59603d32a4ffd7c78bea813b3b64c559eb7b1910b42a115254844b4ca231";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/son/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/son/firefox-59.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "89293ff544dc2426681f0474705e09be6bf764e96ce751c5336fcde5cb1eaf873ce7ca1f53324178342be901f6701405e48de75a8ee0805aef462f2948f40148";
+      sha512 = "ab8c8db74db62d3140c0ab8a976daf17a111fe46d67dd0c937a5a6f8a16d5b184e5308ae8e74ff068d6aab8f995b897ee8c77436a43f055beefd57cb7acde9ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sq/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/sq/firefox-59.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "d0d1bf1409615491f999ec7a17e98d10fa25fcc16036da9c3aa6579fa5fa63e0f0e6dcb365dc5157ae763dda978b5b5219165842045142e5e36fc0d49eb14f3a";
+      sha512 = "c324623e037905c060fad851805b7ccd2d4dd108432b7ad78419a4c9cfb028c2999d0fd066483c7196be41fabe69d36efe33bfc02c88b626a8dcdec59c1f7bb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/sr/firefox-59.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "ca57a0b0f5a473a6a76a674646aee7c2bae6c957cdf0469fee29ee3a57eb05210cd9bb3262ce4239173ee9075401d42dbf52059e9bfb33e3d04d0dd65148e1d9";
+      sha512 = "4e6710b2b55c757034b22469a19cbcff5611203874874a51f97d9d55b646e00e390ec7e1a68b941c6bd39b4a989872be3dc834de63d84a71f528e0700e9aeb8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/sv-SE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/sv-SE/firefox-59.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "c65474c1eb6849834d655ccf0ad25eb914b0e93b6396a09024d8a6b4e3af423b930e9d022de0a3ce1da047455e522e7fb018ed82e5bc6586b26599e71ce9bc09";
+      sha512 = "1cd71c355c264ab64ecb844021920596d5f748a4333fc2ed3ce8e21fc23180ca3a5579f31640fec686e548c16fae9509f9a4757b39c78abf6340f82d67ae548f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ta/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ta/firefox-59.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "68a41fe71bcac5dbb4ad473c83d58b683790dd8a1d63a11f5191727261d1a6d1f6cb61de3bee2141286ac5820f7c7a0305d2fcfb1420c95726b418b8cf27d27f";
+      sha512 = "a7ded77250699f59caad7a41dac12893e301c6c010e09a3f6218698c90dc38dcaf27cf047b976125a628b396d76f5bbdb6d96a4ab730b15f4067824204f169eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/te/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/te/firefox-59.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "921650bae38434e6344406d7490dbccf1186fbb243a9f14b9aeaab60fccf24ec8dd403b5d58e5e7352f95d93688a4670fa42449f259e68796600afb9941031be";
+      sha512 = "8897798337ae43de036597a2bd78c9407a26f31f473268fff45f670852e486c41fe379f92ceb528dcb0e4a321ec6129c6ff8b95ca7a87bfdcae1980c6c0d2d08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/th/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/th/firefox-59.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "b9152da49d77ac480845e505fcbd422bc81ac04ace5e1cf51110cb43972b54c60eb1e08a57dbe7ce4628ebd302da213440469d3ed3a6fc8c61408e14d59ef036";
+      sha512 = "937bf57038417d3c7febbea70f24e46f9f100c7011feb0378bc1a3dc96ff31e17e871397dde0ded12d4622fc8d54d998b2d023fa9699ec9dc4ddb8e851199d99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/tr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/tr/firefox-59.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8b6feca15b9a73f9ae2ec101a8d82cb83003041d57536a0a5fb461cd28d9a1bee7e7dfd4abb054e4944a41f5316a59f496c6bb68ad04dccd4e721cffe370eadb";
+      sha512 = "16831107d2509d91cc8d1ffeee84c52c2811978cce4cb77b3c9fa593e498c4f435fdddf343ddb1a54788d8e47abbc0aedaa825791f00796a118a90794da3f76c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/uk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/uk/firefox-59.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "28fcdda0280e362942788dd87c0c5ae960a33ce676d286660ef123c344fca40771745eb6b0351843ed969f8262c4e1f39a4b28f802a45f443e20a13581aa8859";
+      sha512 = "29208025ad68738e581dcff8bcdbb677de2f99943a6331dafd24f6aba2abe06f91764bb245b4bc2a8124e156d2d4f117e433afd92aa1d199bead6e6d61595f45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/ur/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/ur/firefox-59.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "54d96e58c99716b4268f4ad4c9d2e07ad21755d793840902dcca9c4aad8a4df34d1e8b15d08627f0dc41f7c7b1e23aa6485563dc40b4b538be7d3bc7a507dc9f";
+      sha512 = "0c76265d5249173eafb68c7c8e1a990849f5ef5603ff2838faa9f4b2d3d88dec20a89d91ed820848a0da5c6f48221bb16a6462723370a6e13851e601571cf4c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/uz/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/uz/firefox-59.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "e3cb090eb23eaa08ed37201518e40c2375c9b4df91874fdca59182b19dd4973855795024e0cb08821d61035fad930258d434cdcf752efe85b6705ef2e92ee3b8";
+      sha512 = "556305278e451230d5fc70564555f0656b7bb0aaa1dc42e8df5d1b723376bb53475f9f45dbff8c75f3e14ed9a86e1f0c63d38e436a9d2b4a8793984e3b5e369a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/vi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/vi/firefox-59.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "cacd6f810cd5c1737082519fa489ca0b67c355088b064000dc03ed54724678231ba7586943947d1a35025a1608f938600b7bd10ada47e994d6918a29667b912b";
+      sha512 = "ce111f606697b78ccdbba8f520a57d6cb52d61e057d0436660425e3d3f24e01e0bdec1e4afe4938f087a3df623302e6f03400a2655a53fe15d3632d1364a960f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/xh/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/xh/firefox-59.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "305706a89783ba89a51c0d838d7e99a80017a9fe05d46376102ac7141d300ea8612982cf32762b55922645aa7252cfbb0b213d6ff3b3f0d64186c1c596d0ce55";
+      sha512 = "aa0f3a5c81e7005552dee82d49dc31a61f3f5655023fb254d728b14382df8d06f6c0a5dbd810529dbbc0c2c0a167b00a8769428424c48904f91c4cbc494daa91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/zh-CN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/zh-CN/firefox-59.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "afea7e354fe29d301bbd1a6ca6067c37a741fcf0cdf58407b284794591b189be365800511f8ffc0ed2d4f0d9da23d2da1f06c0d667cb048bf98c4e54a8d08311";
+      sha512 = "ad56a5daca13e804b3b04d6ec72fae309e6f38e6507bd761b3da08725f98f6d71792a4bd02f3e05c8687c7b93dbe92467e0380e0260626415928b0e1138de64e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b9/linux-i686/zh-TW/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b10/linux-i686/zh-TW/firefox-59.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "318d839841b0bf4958b65b53746c2b4414e2adab2f84fba73638be88b1c32c74468fdfc1b626bf1e81dd1a1f5128ee27332abc3f49869ff50d02812dab71d181";
+      sha512 = "02405cfd0886bc63c2369411ef208c1208e158e641d54f3d5d9592bf6eb71f472e6864b0fc4b46429d41fd7afaf7f36fea7ecf7fc66a3efb14ecd7661e70afa0";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 39a1a7225d64..196757d46d03 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,975 +1,975 @@
 {
-  version = "59.0b9";
+  version = "59.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ach/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ach/firefox-59.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "f79f18b17c3aacc1bc94c2ff9e46f56712a60e4dd34c36032190bd566cf3f46e71f186b12b42e371e4503e03f7b601a6c59ab50ddcc5111d10d07bd849b28b74";
+      sha512 = "a02e06f2973649ee7fb7178baf97bc1a7811fd5c87280fadd12612a1340837a665fb9772e421a48999df5d3d9dbe05096f34f3437c0e2e46c001de567f318431";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/af/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/af/firefox-59.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8c380fa7156dc0d206b5861ae2250e4cc7e6010975be62b369b838b7dcb0e05f3083e3d455a24698d0ae39291e2498afb32c103881084aa4e27b36ae083c4f84";
+      sha512 = "21c47d80718b056490d23516b6a1efb726ea276728987ccd813030b6d2d5cc3dacc337d61b688c65a13482004c122c491d09cdb0a28a17297479030c2cfdedcf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/an/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/an/firefox-59.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "10218e9a5c7e0bae6f33856fb7aa923f5f9de055f45d57112820428ba7a20714dd8e86e4b316b44a0ac0d33a4cbb82b333a7af2e2d013bd8b393c9cc09056c9b";
+      sha512 = "95f5f84931cc91b6d27fd29ae49f128076544d5d8190de1df1980199095faeedd7a51af28748c440253e9e0d1bec5f7e928dd522701555ab8b95ee9a01248b96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ar/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ar/firefox-59.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "15927b3818137bca03604da5122b2330da423b4f3d603c82c516e12c9557427bdd3a7d1ef25157ec29720fe1cc54791de6baec815552bfbe6d8df26275d94c19";
+      sha512 = "e20fe429ddee0bcdedc7e277373043ab87747a356948fab13928051ab1b8c3d76bb4823a11e2131e10c49c44d77059f39c4926abdc5941a60f57528bef6da684";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/as/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/as/firefox-59.0b10.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "dc661ec289c3a4d047e149fe2868c0c8a2a2cd8f8de9d4aaec9d584bf8a11573e6f45fc9d7abafde0f6be933a49420d5b6ddd34d5c2d3bf4582454854ced4e03";
+      sha512 = "f09c7d60a196d96276b694d804d1707c8305f0d7e2b3b2f6abfb1e4816da61d98be753a5514524fc23b325f0afff55c471fe400ed31526b428ef63d1b491c1d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ast/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ast/firefox-59.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f4d56be3eb7bbd4e64f0c563fd9cbd22d97c9fa8bfae0e97d99b5de481be3de5c7f5b8c05cf760ef6059845ed53b91cca792ba36008d17731ffb9d6341d7dbdf";
+      sha512 = "496895716235dd60f10c1f88f6005b57c010cd364cbb62ae1d40ef8c4d5ef999c321a49b01fb1172b77ebe57052cb23d11b16b5b9f9eb74492bb721bf142a4ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/az/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/az/firefox-59.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "9b11ccaa42f898aded3e4e1c64f5c3bfc85a39674d02b4728eff783f1e053e41041ff0415f44c992c9c489a92ab97381c1899c6656154d9ae557fd33a1af5473";
+      sha512 = "94bde786112f6bf1bc5ec6d1b5e52cba04ca65a32204b374aa8c264af2cda5d1c2ff9ab1d4b6224cd756bac769867a5f184b2ff5a497c4fe81feece6465fa64f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/be/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/be/firefox-59.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "abd7441d3d66670bedebe288770f360705054b1fa9c3579b465d58efa2b9a8849c9388046c108510af862b798000f48f44e13d11c9c8e8bcbe88a0671a908675";
+      sha512 = "8616053a1c63706a6b57703d601e2a135dab74c895c9f1ae4351a07a46be901d8621dc07c9a9edc3f8ba6f1ed1bdc53e51efae16fd9ea9f66cab088e4318a14f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bg/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/bg/firefox-59.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "0ad70dc2d21a3a62efa55125715c888fbb1809016c53d9718fbb92ddf5cb1874c092f50ec556b00a20b65404936bca520bf9206384941cd2428d1212d007781a";
+      sha512 = "93dcd4b831762388ccf3d43160fb87997dbc27f714996955129130492025bb3b2d22af489520ea86c8fa4883f80342df4db5d8ce05c8418c06ec635d2d7ee948";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bn-BD/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/bn-BD/firefox-59.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "ad5547a09ab746f0c547b5fa4ae2b07943b833bd6076d80a3424c044a9a45f84d8054f403b4c6633cff6a6ba96870e8bad8324608c8a136d46330a2b983a7e2d";
+      sha512 = "4931cbd81403cbd3acbae7f6156a8161a134dd62583beb5cc9ed05ac24a919b325e21d7a4bc6a366cc1c0871e70cccd6e7fc08a147012f2b42b3be5546df096d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bn-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/bn-IN/firefox-59.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "8116c0f47163f602ba7088be28566c6535be319e4573f471f4eee4ab3519cff34e283171d50b6d3a594a659c6b4b0b383255ac4061f08fbb036d562ecbea60bb";
+      sha512 = "3cac1af1467f16935a0b4cce7231925acd1174a366ec25e41722749333257aa63e36528b597ac470ecc904b44920b619cdfb1bfe7b71c4936cdbc4eb761ef493";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/br/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/br/firefox-59.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "aa8a1a667f01ad5049cb85c4c7add81ad9b164878bfd13d945ce1ea44a2cb8e262d5c9d0a959497695ea6dd9dc391c40bd3777fc0f6f90b6ec402a5f0f0fa8a5";
+      sha512 = "a359d951a18d5f5f2c7ebfabcc14ed654e3ed61f37d81cb91c7746abef65ccb9d040a376a43d295557908c6bb2bf5651b0759649ce83eab167e19767529a222c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/bs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/bs/firefox-59.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "666df119858f714a9602dc7d6a0a658ebf8ad24a32a9b44d2b3d8dda61735adeda5785ad143c1631e42e8231cf7d34e4789c512ee644f16f5b060aafa97a86ba";
+      sha512 = "9e4c0529c37c42321497d035a4192e1a9dd97747761977a278c87544f02641f8367ed0d5190512a62bb806108f040cdd53cf1dbf534a843bf86d238c02ecf061";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ca/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ca/firefox-59.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "fb706397b98a4fc538561db01cc7f029de8bf6abb95d438ed9313c96fb6a68e45ad70926027cd2b4722f450d42bede3ed00e1681d94dde538f42b39955b35494";
+      sha512 = "a34aca95326a34d4523d0445215dc03e2e55fabf64cf23a94deabccdefa67f40180a26cb222ce7eaf19c79f74713bd0f8124a33a3a93c6d0f4c2f0f3b3175229";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/cak/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/cak/firefox-59.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6b535fc25f2756b100f00c60b12d9eca3f4972d5d02c5cb2ce7f1c2e2f3b4675c36ef99e9bb227101fa6e50e515f0608dae9c901ffed08a8eb75d1da2ee74e54";
+      sha512 = "4bba8d5314bd92f52c8f46780d8812315b75496b0d739b653395e032329768436cac5024adab370167330a198d8e293abece0d31e6616109297c957668fe65db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/cs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/cs/firefox-59.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "c657a938873bb9af219b7328546621999077cca6f5d71143d55ae34048714b0e3a296c1c0f44eca499f22d54f591758aa945478d28eea37b662882b10b9a70b4";
+      sha512 = "c608430e2367da13e0ccee0e6d8b1aca7d58784497f9e614f8c0a5e76fca077064c074af6af71321c2723b32dd202657f6bd5b9e71191ff5750fc5aed11f61b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/cy/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/cy/firefox-59.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "38037a46300b824625e356e41aab2fe98f99312c763ec0e5c0423273018c1a15744da3f4b60f9ad8877711309ecd3eaeebfc9f39590ccac239c2e05f4128bd76";
+      sha512 = "4f485f47ef4816b47612a330555b7e68c65d1ff125a75410bb4ae8b2237d3dfdb7a4bc3b32c8b9c955850c8af14cb1012688beafd841b3e06107eed16ae16cfe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/da/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/da/firefox-59.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "03f4a4946328f407dbd0212ba6e9b54119d23bd7434af2cbcc3cc0af97223e7681f731f54c42643db612d728d70fc564da1e78c459c5afeed3d794b96ef1130b";
+      sha512 = "66767b49722fff856e4e491c1b70aa6c7194a21e5389a7ed9ed42f152af230d5d7e24f71a099df4353b8dfc2aa99fe68976ad699e492986aa46a44b38e8f4a43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/de/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/de/firefox-59.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "aed265b3d00c9898b373669deff951fb5622e3d4519ebf49123136e3006abace922f28019ef3ce669b80ddfa8a2ae69d4a8a5206ff31c6bdabd647c2922d8731";
+      sha512 = "125000fc2d4848fdef690e2d0cec7e5382c52ffe090e52a0e60d5f1d163a06af039a8935f5e0fb7b657fabde51e0e9ef0c654c5c71f60a5611d79e7b22f61012";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/dsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/dsb/firefox-59.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "81672abe102040b86bd0bad90e054e9372f56ac0239d8a801da0a6961c1bdcfe298bc8f1f6b458d22ef41d9f1e8178a4e419121326195a165d1b7d48610ebdaf";
+      sha512 = "156955e481196e42cd140ac4dde4cb99f60ea28146eba684b6f98325201cbfc7cdc649f393ca4099f0e6070dd4a7fca8176d73cb2a5521430e46d28c32bf26b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/el/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/el/firefox-59.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "a2336c16140cfe5665661a46641441c72e84c0c6bcec1455af4c33ebb504993efd50cd7ffc398f66e14c26d471e565566835f2c0b6be826b0e2b1dc4470b9b82";
+      sha512 = "ff785580521d1c3db342540ea69ec1f634bb6cab30e750bfaeee56caaa890a4f4251b0d7989bac5d85e4bb117e97ab8895138c803348226f2d66e3207dbf6936";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/en-GB/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/en-GB/firefox-59.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "888e5c0d0ad754857f9307c5bb1779a16081792925a535ffcb2788f78aa571a987d2436e43b66e2ea22d4ed33593f51e9571bbc783c8f05c3798272e29e8e66b";
+      sha512 = "bd4403dd225db0afcbf26d1c2b36cfaaab205782f25f3438d68f8f53f3288ae29dcec2bed963daf0af733f59a158740fb9476f5e0738257adf6aecefd8f2c9e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/en-US/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/en-US/firefox-59.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "51580f83eb2913d662faa040f5c9c9aae0ebbe38a7f36b641f740e6e1898a5d751b053a5b876fe1680ba704c8dcab5ac0c2228fc253215aaedfba30a3a6ce5bd";
+      sha512 = "9eafe94b601823e39b74879bc5368a52816f611f83ec5a0c6e373546b2315a12720f38c305b46e7e2de7a817b55b3442400923111b035fffbe6aebf348e55095";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/en-ZA/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/en-ZA/firefox-59.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "743bc804ee7bc38dad5453a4749d34bd838bbeb1a02b9ba25d06f4bba511e59a3f4fd90f7be8a35f418544a96786908730c417e5c560605b98f35c80a79f30a4";
+      sha512 = "56073ff19fa0811fdf6b8e0d7dbe421349be01d80e4f923fd4a4adf08fad32b608157893bb6aa4fbde0beeaeba63887a931fe607e8c442447db5ac76c4203725";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/eo/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/eo/firefox-59.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "75da101a6282eb49362d6a6e42e0a2a88ba20b408bd6bf55914ef87e4941b01ab1dff5619c54545e0bcd252cbc7f7d6fb93723a76750b0d7a12423865f057c3f";
+      sha512 = "091de3c3ebb76c016f3e6defe62ea73078450d9a23fd3d1cc29e192dfa99bab7ef1b770ff1741b36deb6a27baba0e8d2477018c2b12bff8ec5cf53980c8aa771";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-AR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/es-AR/firefox-59.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "bd95836ecb1aca653ccc086007fd745138cc117d585343951ce633d4b5c55f692c0ee7e8ddac51781bc0ef3cad71d4a3880b080c89644313092913cfbcc39e93";
+      sha512 = "2132d5a600b1010a8ef2d9668cef5cf90c6be6464dd2737545f190eaecea380607287d65e1537a6bcadf31aa2387c4f3a34d38915173f8efd0dbb35228507cad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-CL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/es-CL/firefox-59.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "73d5da905def6a1b48e3dedb9b50c7a38feae0ec59523707f9bca9aa31824b820809cac27adef4814571a0edec279d8ff5f4ff1e3d3e0dc5eeb424e0da1bd06c";
+      sha512 = "474999ace09149a0b85c81443b061e75dc4b98af663cb8541b2589eeca44616e4d3a71562381a40e66c246adc369506f116468ac7da30d88384e94b21c8df516";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-ES/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/es-ES/firefox-59.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "21a23ddf2d2e1fe71404607b60add5437f5ee604404777b105e82ad425f780d27b879d049ad6d8dd4b7103d1ec77ed7a777981846713aec7150eda6fe3ac001d";
+      sha512 = "681af57227209d14e35549f4e3cfe3ea11091026dbfacd526564a50f85d0f7960dc21da66e99b738ca83b0e496e188ce2bc40eb3b5a5bb948ee0af1a57a60bd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/es-MX/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/es-MX/firefox-59.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "be36db28266ec188552eff73719bb866dea7f4d25a4ce5f5992042c0d91f64536a607868cf084951bf270ea84bce73fd1075c69bce9c1ed46ad7119082d3fd4c";
+      sha512 = "927f1b00c07f74a9ccef48ef929d9e0005beb86813c04daa9e8fb8c9e1ca9a4ae5c09c458b17cf79b436470d26f95b17ca7920cb320fa65d42a322dc2eae1fb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/et/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/et/firefox-59.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "4e5d48a1cbdf36f789ab325b6bb7d4e47d525a7c77877f572040999000101145793a48c2985fff846dbeb7b2fedc43144ffb246dc5fd278226b1ae01f845f7ba";
+      sha512 = "e1779c465d4579f96850dc7fed568482d62080b0fb4e0d240b90564e1fb0546f4632182d2756456197260f0f52ec77b5603d4712730e1c8c4dff5743dc041476";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/eu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/eu/firefox-59.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "582fa690504c1f7502a01c2773d698d8513e3769d15a9b10bd27f9e945ce8c76782b26a0a05df8644c5dff2a8d31a30ebed1ffa282ae065ea51fa400b93051d9";
+      sha512 = "5d6a5bd083b5ee5cf212b66d395023355718f6d4daa0656eed7584d850a59a23faaee8428b657c2345c0fd321cdc6468fd4d07cf9e79a306402dce74c35a2e8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fa/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/fa/firefox-59.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ad34dde1a8f1c1aac3f08894b3dc5f4c7e0309793254e4eca257ded6b3d961e408f6e036ba4e347f5075e23b1257330de1649c932754c0b9218c3685d4acd190";
+      sha512 = "6e59a52bdc42b616d543940a272b7b14fa8d4c332ce9b9e13b373975a198ca2318b9a4e61c43d8da78946fd38e84064ef7e6d7af3e937968ea99889091f8ef13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ff/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ff/firefox-59.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "4920d85f8180225fceb9e167b65bf5777e9e10886a963376df82383523c88ed6c90def6b95e153ebd3be442944f46b277a99b798988a4d902da85fb504421485";
+      sha512 = "54bf253443454021356097a432ac576bf1b919dbed4beaf118302c75bb27c7c1176339eed9f5d4b60ed9376d8a0935745335e6098a1ef563507de32515e9f6e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/fi/firefox-59.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "053531f894f71ca4b435d02edfed0afc5b0c68624da93c50d3955def7b85ba72b2fa26b801baddcd77afdde16ad34e3aa63d8d9cf58a764413eba0c9beac81ce";
+      sha512 = "c491b91635456a2d0ca496a6564908467602867c99580de361b7a7d31b13150a2a417695410200f531380153a95922d89f016f4f56a9cfbb61286ddd5d9d7cde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/fr/firefox-59.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d8f049e01868f5da4c721d1447d8fe829c1a2b0082c8f2003bdb2040f0c951650aedaeabec848c163fb9c23cf7197db10f6503abb87768262d195c7e3152e8b4";
+      sha512 = "93230cbb0169db132a3c124fdde42a56df7838d97b9e9fbd80a6c996f39089a7f08f53ddc52a86f3aab6d92f5877555668b06c5586f80fdb308b24d43b611294";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/fy-NL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/fy-NL/firefox-59.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "cfd705a059231b10f4e9d8e137ba16041b218e58e269c66931e0bbe828804b83bebbfef5cb08f22116de0052bed0d7c9d2d860d178cf893baafc594ebc31c311";
+      sha512 = "a7a36096bdc97d94dd2e991051d5e0f75b2185dd2f211c2aae431461905665f45dc55fbb05f68b4d5673aa83de330b510059ab3a22572b746f393502f533a0e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ga-IE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ga-IE/firefox-59.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "bda2388829d1b6e7058eeb4a96c18026dff1795490e7d9a5893cd4e835a2f303cf1053ed16d59df993d96d26d7e17916e25722c9ed006e4d5a5ce6ecc813a31e";
+      sha512 = "1cf58b8dbe643994dd7ec07d7c775e5e6201cf25630786a0cbfdcb814720935f68c38f9dab2ab1db933aa6b1d2560755dc4561daf0a5c555a35aed322882cd4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gd/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/gd/firefox-59.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "c7649115373e0546dde15b88db328c73157998631200a6d8a22c69bcbf0c12f2f97912b4d18ab004ee44edc763ad9b94ca3c2a1626f1f9ba008f59fff0a89bea";
+      sha512 = "33248065ad54ec808c6f5133207879b128cac00c541a8c95bacee74cfdabecd0104be89122ecadcef205c00741878026676409bb3f39e9e5176629799104d947";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/gl/firefox-59.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "c065548613c85e4d3500b81df997a2bceb0f128c2ecc7cde2a8df871b0ca7c456652ac8c9d41f435b94411f748c1522edac891219f9414671b6f4061cac4e4df";
+      sha512 = "d11ec6da32c4a58dd07dbe7bc036b8d393dcf39ee12d1a1b4f8f0b3144e30311af425830bb7cb78b0ff3e4a6da0316134168d1dae4f7f48500501e22ad743165";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/gn/firefox-59.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "114f9f9992bd350275f20ae0e1e6a751383bb8c95113c3ee40e44fa31d46fb0cf510d0c3367ed3d49187d5de811e8b86e3d8fe043f65ffb418899365d7b6debd";
+      sha512 = "bcc5df7766de310cc2729a28750932619ab2709a1d5f43ced905a9a47931ba1f45d31e069366652646b9091b1aeb70196236af2f7576b8531d6193b0e2b10da9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/gu-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/gu-IN/firefox-59.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "a2fff289a40aa72a5de11ae8b336c2da8585cd8b4d0a825ad0f8c44c50de7996df3ce6f06f2b0b56c68f80d9f94e3f3753f58dc9e77142b227f8ca488ac91348";
+      sha512 = "7d6b1885b496183b85c3a2bf492fefe5c5caed1092db752aa47c3f5d575b7f0225189dff2a8a1711ab6b88feee2dcfb5a33aff1b86e983bf54cdc563c9bbac05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/he/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/he/firefox-59.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "2d280405c992faf12156a6903c90d3ff3b0446894e65f58926463bbbebd0b27dc85c96c9d51bf5151ca4a97ab21c863276de3104b642b56614a51066d5cac8d7";
+      sha512 = "1802ce0a795d55194f463dd4b2b1b7d729ad6d15caf21f2cccbde0fc8c8818dbc850443c5a5a8a0654cc74f30e88c3ab31f8c1a91fbb4b89d25cc37da1b4d175";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hi-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/hi-IN/firefox-59.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a3ff1d09cda26932603e094ad3685fa6ea5fd343bede244ac5151004be367c91a35a339ec156a30878ac3a1a97aa0e708bf0228d0d96e64d9186fb57c3c18bcf";
+      sha512 = "1e5b1ed39de74b6d724fc94c345e7a3d0b1411ffa98d57d16f673ce16686bb24b7f58d60527006655e284a76697e6a412af8ee621ef5168ec7e1a9be98eb9732";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/hr/firefox-59.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "0dfe708a3e569723af81e6dc7d4367243d43d130ac25d3d333d2b107e84a4926dd8ff22fdc731e55bfabad0bea09b833fb576d7e69dcd4fed9f520993b79cf1f";
+      sha512 = "4488992fb950eb472321071659882abcfd5974690fca2c7c7ca3c3408e6246a98d68cd241033222f42806cbeda9a70bc4390072388e890f0221c5514e38b06ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/hsb/firefox-59.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "41296fae3a6d61ebf952afa336401024c9f7b5d9c29e5b0c42a5705e997a3aa05c304b3a96beb172de72ad38a70281ce049d3142bd03bfb8abf4e126e8bfca64";
+      sha512 = "a4dd66db61f134ed89e73240a06f474c71c8f00a9cde986e614778e5cd6f18ea5c25fe6838f3a2a27633e30a2b5c31afeeb82a1d00bbab54ca021e954cddc144";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/hu/firefox-59.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "6ca0711cb7b314300a5747bf162177d80f6540747810bb4b234718115a62153d57119df545910c6ceb8860b256d443350fbdbb0733241ffb8b7f02223e8459f6";
+      sha512 = "5c21587bd0d842d3536a3eb85c4769aca7e744b9f4ec7694cacc21d5872929470faff135bf8bf35dbdc2a678e7c959441cd6f855c1f3fe70f1b3e2b956dcca21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/hy-AM/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/hy-AM/firefox-59.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "c0313347fee393102e220dd1e7e14b4e2192ffae6357402e93d201a82147474ba4ff4686d3cbf2bd1459f0b743ae8509200af4cd708e184143a0cfe273c4b665";
+      sha512 = "3af60a670efd0dd168bfbb37be7f191035e8c36c2d4ceaa50ecc6f35dc00604ca74fa46099333bd195588ebaf3ab5f8a9f8c9c5d5ccb5583e8531a90c9f29c26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ia/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ia/firefox-59.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "3805b1e6dd955ebf7244ca6900c6e435d0fd06c2f36b49f08e4afbf9cb799792862a8f77324e11705d68be66df7d29f23d23ca103a07712545defee690c3c477";
+      sha512 = "8db8b9633cf226ed404df04243456b900fd67e24d29580efbcb75c429efcdcfde676b47d31e6a50f6d921b1b4a708a9c8bd1232aed55a23996bdeabd75b390f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/id/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/id/firefox-59.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "7720f35ce0d6f4abcfb4ea27c59e315e030f8655d27ae978f2978bd22e8e92848bfcbf516e5e452ec1dfc8489ee475507e9a77f7fdef9d2d4fcb6d2e342dbf06";
+      sha512 = "a16102251158140d62433953cfa94c138b9d26cbc85ade3f4d30935e37245792f38d8939ad731ddf9e0a73e00d6e3a952198a41fa83774c1649151f693f7910c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/is/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/is/firefox-59.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "bde4e29fb7623ce2058400c0c826fe222aa63613da5574f22973f005c946b18d7fef7a54b0b31d2ef8eb01f93eaefe6a6cc2ffc9e0545e8e247844e592f105c1";
+      sha512 = "f98560c2612a77d42b23421fdd24348492df9db3f462745778b46a84eb9886285ff784f8038f7595f2e942d5707f54ccd1f07dcfc39c8acbefbc048c0ab57e71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/it/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/it/firefox-59.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "ffea57a5fcfb42af408a76e176d92a5d3579237a1d59f4f6eecd6294d12e50c33bd5a3d1ed29c9417f75c3ff152280ea7a0e034f9697e2268a861a428ed994fc";
+      sha512 = "54c3c5a84acc6542a3d37621ebc460ec0a866a91b8ec436ca8080f6047aed5f057ba71793d88612c6294375ea6bb739009e9b15a7f77a7f5587562777dc987c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ja/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ja/firefox-59.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "eb7ccbf29f51f011fa2b6c4bcab62c077a681f500dca66bc5ee739ac8583721cc07a440f1f72db6b64dda98b0f90e19d00aba8f8e264b86ce4640e1acb8a7823";
+      sha512 = "7c0f421fd1bd7f8730361c5eecd2da8a8f2f62f6ed61d48fc886c8d74a51d9814a0031d9a99ebd2136595e2c4b71ed67d1eeab268e5e20a16886dc756c06fffe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ka/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ka/firefox-59.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "5f450891622327d2e26f1432df42e462da7727414cc1ef0d034f1adcd472e7403c30a05411a8c094a8a3fa7e68c90e86aca0a2c5ca91cabc734e2c6853fa53dc";
+      sha512 = "fc1367f6ee0a385aeb589a771f1a27e7b8aca0db8cd08cf085e12674ad628da6b826965b302e758a24fd9e759ca87fa4ad014931589a3725e0765674b1651c5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/kab/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/kab/firefox-59.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "68b124386573828ce9efd2d0ac83fc591ac7dd149a290cac55a0f6d8211ffab341b99cf43f22ac9825133cb5bd4e95bde2233fb9f5acdca9e7b7f5381d4686ea";
+      sha512 = "44e3bbb5b24c2223309ba5cdca45b3d40a583b7e37305db05fb254180f43908831296f91d75ec9e809f024188544960144e3aec85bec6f4fe0e2c056da18a5d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/kk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/kk/firefox-59.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "030a64f6191ade2a037ce84ada7eb22cc2ff03677a273d47906a311d41430c1b8107bf41d98b50b824d39773efffbb81e79c54e32a6392cc51189171cf4a9e32";
+      sha512 = "7602c829d0dd9b625b64b1115ba47e5297467c36a9f7cd4640fccb63343d64ec7f553f951a4c63fb3f5dbc16ae52b1323c19066cf766ce300b86bc748a5bc303";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/km/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/km/firefox-59.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "3db0058d254928b509cd61a82d3ae5aa8e0909c4f2ad71b0c53d86144747a6f4bb32bdbb9e9ac7b171c8827f424cc255e491473bf8d88c1117eaf606551a79a8";
+      sha512 = "a391441527a1c3769eea3f58495ffab9a1b97abb152b8339af66d6d51f2e7ebe40d8da1807193516ced7428b440746a0e637bea9ef720256115591e245aad53e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/kn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/kn/firefox-59.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "5122ece64598d92045c17b8e7bd43415d27253049c7ba5626c92777ae9ca248cc1d4fe9a99239fe8f1acc0fc0913d8c5551af0a00c7e2f513913d770206b5658";
+      sha512 = "d664a309a553a6b196369d7c2b17882ed4696274c9d5d8bfd6fa16dbb561c0fd9e10760fc654697e2b3895201789ade803e9ece9f2a4a93883fcfa9d1d4cb626";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ko/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ko/firefox-59.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "89ebaf7d01d7f78e93764a23c5b34ef9b2b1f2b7a943acb5cdf11fd0e3227a08efd6b5255d2d8411a6b8de25842ef480c256591e95f790a48e6a046c16587ca6";
+      sha512 = "b66ae4194f2d711b12bc11df7fd3eeb534e05f7a76924aa37b330334623a13eb2cbf604f0564d83ffd9781876d195a25e96272d79fbd2d5ac1a2bcbf0ee085fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/lij/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/lij/firefox-59.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "3d9b105318102b0b46062e0a51f34b4ec019373013ee8bb5db027e662f28c56a5c5562db3ada621b24dc3b93d7fecfa453b362b666affeb31e5108312beb2821";
+      sha512 = "35ae9ee35b3576924270b39543bda906910f81bfec80197e1db312613f0393619b666622216fde7614fbd906d73b687d3d24a3bfa2c38af1cf1b15fb5082b772";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/lt/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/lt/firefox-59.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "5766b601925af62763ae0a3f00725255910758ac019c457a27dcc94e905300255e2eaaf5cb92f263ad9182d2925311e649b57732551c5dc2983a1c2ab3d7340b";
+      sha512 = "3001fcedfabfbe72a9f2259dd7c843e55db42777fb35c1d8ac53d15a52fae78db6a502c82f576f6decfd922500027d9137b4c6859d180fee8975628529d75e93";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/lv/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/lv/firefox-59.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "243c545fefd8856a5a6afb915b3b7460a38aa57656ca173b02bff1a70a7f2ad9550e9eea60a5f72551d487597d94ddb6a93cb4b833bc558b265a37c2d01b9671";
+      sha512 = "e74262aed330955b1889a35154ef283745f22d16300b1696f4297d9e6d21581b915f85d5caec3a56867c412c829bcd9a6c6f2783f896a0c8ab363d464628190d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/mai/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/mai/firefox-59.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "ca4ca3fef3413a58f1b724b3654751daa3ecae2f4dab175258c47dc3a0dd6ef6a7595a9c94e4f8d5cd2316af54b3c42d037670e46747eebad0a7943ccbd344a5";
+      sha512 = "195ad889bb42394a856e4cd72c27dff4aaaa0a20f17adf61623874babd9c9495e7e98dba0c4fd723479d1b1e00f3b5990f689352802a810b6c408dd6a50fb012";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/mk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/mk/firefox-59.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "ab12a990fdcbef69f90a546114f299c93936290cc07e6f205c8ee7122021a6ea5bd648f74a38ed6113f6f2bb65f273b9270715f40252ba80c3aa775f823b95b9";
+      sha512 = "c1b9ac78e972b520e0a5bfa3f32bb4457e95a02d0f21ff374c30e971c5607d6e0de27b3fe1e8e629875d92ce185359990b2ab4e52d180932c1ba18c62c9eadff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ml/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ml/firefox-59.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "641cee2b75d89f7be38a57686fd7adb4c9028a576d61e07d0c1114e296cc486a2b992a52722b2b368d3ac16ab6bf45b3d9fefda38e64ff67e61aa06874a47d83";
+      sha512 = "1b852df15f5feb1f94ad3a69f7f7bedaffaa3e68c726624742a1dbcddedcff678f1b0b67477cf7389932f76ce6a7527de81dc093deaa2c416131ae283dc1f65e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/mr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/mr/firefox-59.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "20e02fdef1b47f4ebe2ab2b0faa719b419c992ad43a8e04dff6b25b58e8d2e8028d53bf4624a101c887d8e817caf3cafc5fb8d78ef5544db1b2c1295e74412ae";
+      sha512 = "d5e63c6157e5a68c768b91883d15114369c29764ef8831b18c5b980d0f2d59a4ca4b6829b63f778d2ccf13f4975e64ade1c5e806dff544da4439d1f432fa85d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ms/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ms/firefox-59.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "9104e0787e898baf8b915810b7d39d574eb47f361ec5e36fbf0fbf62b2c86dca5c745e4e9c0d9eacefb0e140c38f589e91773956450cd2314a0f3a4b88e7d970";
+      sha512 = "4f7dd4dfb2bd31a1ae759904cc3e105159cdcbbe8beb3c64c08a86caba44dd46831460b49f3d727184cf330a00ae8a9f294b4331e398a1f6c478579cc84cc243";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/my/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/my/firefox-59.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "d1734782ceb8e9b9b4bfcaa33462c33da6f22ec13f71db2f91966b8480684290654b12de8a15b2f2450585f43ebd6c3d9244f59641cb9d7132db663899686302";
+      sha512 = "f867cda4e68fa0e99fa9cde92b77772aaeb49993535b636abd042e0ae9b18e05d9b16ddc59ee4c040cb56f29bd3e2a8aa5cdd96918082b6b484f0ea0cc7c4a0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/nb-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/nb-NO/firefox-59.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "34f8ab467bfa03f3fa2ba5427c09bab633a356dca97495ea644fd9c1e691a0132b260fd7100ff37cd8f633fe1d822b76ad1ee22dd14a42c50c8d28d81be3efcc";
+      sha512 = "7047cf6319e609be56dbe7821bdf391f65eaa5ae3ae214445957caa672727bccccb2e641e4779390aa1561ba3b71cc3317c6d3deeb8a2ead1d93ad4a2286cf57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ne-NP/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ne-NP/firefox-59.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "068b6f917de942d72b31fae5ad6ae2f01a376077132687080cd583f2a9e02d62f8795a17f5fe59a58f24437dc2b2a6133628d2c21d4f9d26080969c33ee35ff7";
+      sha512 = "20ed2963f1481df39b46e2a68960d2678e296ab457373b1fc75a1e663f0c67362c97c840005115947c5fc8c489eedf4c40920aefdcdd2e9a3352f0232145b502";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/nl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/nl/firefox-59.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "ad51ecdf1cf6a3219e242618fed8797cc2de4717da0972940fa3ed21aa11974015f31c8b26c0a098d4db2484f033d304ad1bef755108a9a16aa9d64acc09ddc4";
+      sha512 = "3aafca0bb05534f568884a84d71b955a777ed7e3826a8d3f33fd1c22ada6590dbc6acb734a5bf22ae5aeb2a39fc167cb565b47f0ef6990c5bcf5203b4c156255";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/nn-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/nn-NO/firefox-59.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "85a965e137e050a8a127c7aaad34fa9e3c02cbb9cf97d61ea674e27d437451950bedc2355bbc5d7e2d6364481285d406748d8bb539061f01ca8ac1daac98c5e2";
+      sha512 = "cd05555006e4c3771633e1e060e819a0e5117fcfaa79444486cf446d9ecb924dcfba6e7b3f3251a0e3d629a900cc1acb5dbedcd7517e138a68db6c493077b193";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/or/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/or/firefox-59.0b10.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "0ec72f677c5eea74bf24d9130d0a2b45a0ba1e45a9be957a308a3cf5325583aa982e0424ec8b0cf018da5d0084844f978905c0a34fd9312e24e1c1bfe2ba91c4";
+      sha512 = "1bf0f6b2ffca35aa5ceb961c93cab5f8bf0240be89ff066e5d990240c9c4c6d37247bd3fdab183a644e7a0e32cfeab77f77bd37f5d49dfb8f3d06d0abd72792b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pa-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/pa-IN/firefox-59.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0e14fccb544fcef5ead3628ffc3214df906ca83bb97ab278754fb92240991cdb944b72456ac80b8814713ed8a2eb4b5deb38c06cde13666c528808e7bd9fabc3";
+      sha512 = "2a1512be9eca07295d5a0cf734555d93329edf81a49b75485726f74b7abbcc397af5946a1d1a26ec93c9c84c70ea332b4dbdac236ff29a32c4ef36852fdae808";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/pl/firefox-59.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "8a487558a858030e204cd7e118f450c467a034ae3efa7684e5c888876bd279407f1275a496248049fb4d4708629984bb71480645f1e2ac15f981ea8b7e869364";
+      sha512 = "9200a6531af5ba83229f4c896140578853ef839964cd54e61b4fc9cb8a02544eb974cc0f49e5910885f858306d0c3d0649dd1ddd6fb619d7a694a04afdd4f9b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pt-BR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/pt-BR/firefox-59.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c01bad11611c6b960d84a0a5064453103ea664d87108e73ee5865111d3950399426bc8dc8f9c5a69265ec585d6a99287dfe03facd1c02fd26195eb7f7f4faf0c";
+      sha512 = "652eefcea1944f9c5ccc548acb400d89df865dfd1df79e1e1dd72157ad893a298866afdd3b0bc8ec0114c84571e4ad3b1c965ae9debace03d6b08431e4ed5c3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/pt-PT/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/pt-PT/firefox-59.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "5f6062c929a29a08a7fce372a135ef7853e4270123dc11a0f24ea6526c9689e1d69d394f7d7b7d75b1a6bf0d04fc88bba1cbaeb8eb4306be589c49ab8e9a3416";
+      sha512 = "f364c8f93fc8ad277ec7fcc4056d9ea6ee3ff3802b85be1bfc39d50e1d33103eac87ff0d6d7cf06f3e860ec964000fa90803de63c4eadb6455bf3081b53f851e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/rm/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/rm/firefox-59.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b1910c968e2e16673e117f3af83b9e09757c00f4b1e6e1decbe97d0ad18d3c4688efbf0ae1832ea7b046e0e5689317a0081c163b467c20ece239e2f860a994a6";
+      sha512 = "0110fc858603170f363b1fa3b9e962b71312169d241374594849c4b40fbf6c17718bb4cd96a8a30c111580cfc2a9a47a5acafbc8e2076d099a1c5458e1f40b9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ro/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ro/firefox-59.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "b8e3309bab60c923901af42c7c00676ad849dbc83abb0b5eee2fc3d1ab034fc74e268e634f8a1db64274aaa6554e5c91ed934a5bcaed653b89af63325d5583ab";
+      sha512 = "59a5e691ccee31ff4b73a73c2798f37c88dddea443663b76c48c02e9e61bbb66b50ad33344ec980d72801720e26e64ffe5d0455c21a878f858f8139d1238ba45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ru/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ru/firefox-59.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "80f24f999213489db46f6cc2dc374ac1e2cd2ba4f2c3b4a29ebab87881a4bb2aa8272df4b4bdeb48fa2ffbfd667ac07b35f3ee521e4d3ba4d583200bf265fa50";
+      sha512 = "cb75954ca26a4947ab6f1f28414a05cfdea05d3232ee85c9f3fc2fc7d8511238c897f04afc07822e6a650faef8bd62c4f8c5c6af34a4bd262caf8a2559ddb6d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/si/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/si/firefox-59.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "a169026825ef057b19ba42f5e4aa107bdc98719366874bf9ede8dd67ab634dfeae317e850e92c6705ee701b0e82cd66289486f15ebcaa1031ac30276f97035f9";
+      sha512 = "950638156c9a5564ea09b9337ab8af38fc7f431d036a06a6b0b0e0d234f977a7d139c4e5b79047ef6bc3b62944f1ac5aedd5398f3e78e91e85a91a3e9a15b587";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/sk/firefox-59.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "e68e8a264adb37d84db65814371929dca7aecae65f870861bcb8938bfe96749467246d9985e3370688791650e434914191c6e5ea3edefd3f8012ce1d5e929853";
+      sha512 = "48514034a25b9d4b154ead5806e5c5520b60ca215f63e38e2e2ea9522528fa54d8a8d83b6b2ce9d54763c2bee6118ad02b8d48486628d3e85ab11eba3f1af63c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/sl/firefox-59.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "82dc42228f9e48ac8b71545452a5d23bdc54f1bf127e8aed76cbaff531ed8155b2c8a1a1ba4ebe2b41c1a4880f95f5effd5500f245044d31eb974560fb45fbf2";
+      sha512 = "1fa02abc539a6ac2445b7bfc3e4ef8630576a3d96230074156ec29af9630058ad7c05fd65edca253eef58b8fd439b7d2bca010dbf3d761a807a60dad1f1d1f29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/son/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/son/firefox-59.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "ef05653691c5691c3a41f9d66a7c508b982e4379bb2a46ee90166a295f1667323364c66855e1b0b74a0a0b951c136ab66d18df51bbc94ebbc146e0dfb4d42ca1";
+      sha512 = "ae77b0dac934ae20bda6edbce0d0cb34c9a66315c1fdb1d0c93267eece386728c8ff7b3361d08cd09f66e73321c14047d8ee1f86538ddde3a0c836841564f9b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sq/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/sq/firefox-59.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "5379a3cdc5fa7ec597fef79dbc2c2059f298548b1ea027c8d57ba1988f7c2321dfdf5b117e9173e0269c07c8f21a29091f30ac7c0a69c575b2c2e54427d40490";
+      sha512 = "d83cbaf7688afae6499f25e6dbdab257c8caa7199941fdf17bcf499b71e2c0cbeececf12f906f29391adb4701f09f02efaa171d034227afc0e010766a94fee07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/sr/firefox-59.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "23dfdbed936b8b03dcc43b3b486a717aca6e302ff16f32144d7e4601995510ffcadb9bb4ed6a76ccac301cd235e5fa394b388a7c1dc13d49529d0f67852334c3";
+      sha512 = "75661033b15f0714202775f7aab165ee202eeeaee2e676d5f68edf04c92361eb7648a4ee0fd5d992b97b8cfcfe831598857b9f59258ecf0f5253c8657735ad0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/sv-SE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/sv-SE/firefox-59.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "0a61bbafa70984db998e0ba9e7798a5946fdd914562b3bbbc3809b7c5e1757ce40ec5b0b585b163dcd7acc18833dd1eab0bb355332e83033088691c56760cbd1";
+      sha512 = "8582a81566da9bf512d8535aadb8875531276be6ca7cbf357ea7590c6914947604e93a6b8f00e39ab385b8d0153632b714111ad0e62fd5460f3fdfe67f066842";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ta/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ta/firefox-59.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "25105fa99f1dd1b66bc730d824768d590dbf0765ce916dc15daba03d7c2829a603d55204b639bd65b49099e544e9c05ec2b5bf7426523d91fafcadb8dfc48a94";
+      sha512 = "1df21326bd256e8dd680c2bcc7513b0fa38c24809195b4787856af07170a29ebc3bf88597f4d6199059ccefb0356f3e1511dfd76fb1f1f85e5adc122b7f25e87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/te/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/te/firefox-59.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "8d7d84c6599e96d4ac0b3713c625bc65fa41423a876b799a4d9f90499b116b041451fc39f0ea3fe386e091845f88c7d8fbd920f3d114008d9cad6350fedf8fc5";
+      sha512 = "03e97e05c9f0f8bd79bc015f125c76356553c7b0bd0bf011efd2f60af97bfcd183124af3d724207ea95cfe064cf3798079e26e1aa44b5e4073332e0511ce997f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/th/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/th/firefox-59.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "51f48d747176f7c98bacbf28386a21551ebba7d2f3d9af706b421826387ba3f0d9046a1fe8818cecdfbf0b7e87e70710a662c3af53705f0be2e3c4bc1b6ef457";
+      sha512 = "f2b4a3c9c3c33b56a127feace24c39fcde7ad50324b0b4b4c4574801d9e703f884cf46004498340f4c6f8bdb82a64b7d1942476bfc6715f3de8b3c376ead087b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/tr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/tr/firefox-59.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "cef8767c353fb0496e8bf15d2044a9cc28ea16ef6928799fe1bab772c6a87b84e80225512cd465b69b4e1f33d0721bc1c43b2b16f694b44d2634e9968b2203ea";
+      sha512 = "62c34cf2fc3493280edd1c0efa27684dabd204a44f914f99e6efd579a3034539e7cd46fb7883321ceabf8c69f87e2d05abbb659a7f19de0ad1289bdc28a20a3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/uk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/uk/firefox-59.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "de1ed906e7b591d77e1e9aee28d4d593c5b0ce1aacd58df57e9c5e8f4f64876f5a2ec9cb58e655f429caea19091734fecac73ed9d133bd6bf98453559f33112d";
+      sha512 = "90d663c558c6452f6b6435db440d492299439a5d0880acb5081b6c758313f0d59d1c3d8f0348d0e073994efec0d2d1ea2606c2db84001acb23de1ac02a508d92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/ur/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/ur/firefox-59.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "37b5dca13427565d0c07478421ad201f9323cb6fcda02ab0bf187b53a716dd9d9d9c049fb7688a77f9379da2352aeaa3f8974cf64a3b8de153060c3b7a880a22";
+      sha512 = "769b135531a35e3282e153de56808be712587a354cac42ea69bbe1b4151460c142701ecc3cd69db2ea710bf40240ffdf520571eeba6bfcebdac2efbe0e74a444";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/uz/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/uz/firefox-59.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "75cdf2b5e0b8412377e4c37fe459d55bee5182ca30e048c76250f746e39d66a713ccdec5399b274ad46ad000b272164394db62849436ad14d9f704b3fe18324c";
+      sha512 = "a10638ff8dc8cdb037499f20229d72c39fbc9398724d0f0934d5a7f841c3f34d3e5722406e78cbd10658c6046d54720fcf1b3bd813c2554dc0ab6f43d541e078";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/vi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/vi/firefox-59.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3aad5f888f5bcb16e269eab0652944b4cff3bd557d93a60d1d6b03c3dc0750cf49a39f7526d4db9ae47b28efed4225a55a6fbbb4b8f3b05cee1d5c4ee40729d6";
+      sha512 = "5599bfad70aed5d07fe88b7471fcce4862d8f5a2aeebbb553077f2a24d609177661514bfce852789ffb73b25172b64068589ef37812316b21fb7fdec55f68926";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/xh/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/xh/firefox-59.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c48ce50cff576fd77e511d6f924dcd0990c84e3df117eeb8fe2cad40f0d802989f10e445986b60bb73a63abd1d9f9ec26976ee167e7dd74237b3a46dc034b82a";
+      sha512 = "70866656c826c38027484d6ddf28b6480ef19b9aa3016cf7a021e31a17cf48d8912134fabf158d7c036d057de6447928084ad4d83dc3689e432e49a93086f6bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/zh-CN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/zh-CN/firefox-59.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "be6ef0ea1047d53b3fadeb842a7874ce43a56ab21f93235dee8f13b5c6b4078c19245ba5920bd68e517f53eb2a476a026022d896dcae3236fc5009eed6389198";
+      sha512 = "cfc60ed79733a0b96cbb0aa969d9a2d5dfc5e5b27cf1da17dc5fa59f7c1915fa3e3ba531f0c75d82c55070fba4d164dbb6e9fb22d0a7ef27d68d1935e2fe5791";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-x86_64/zh-TW/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-x86_64/zh-TW/firefox-59.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "92fc867ffe7cd1491a6f7c6b4a4dbd20a515de0d77d02f17b9d7d1ce5f50f97d28bf0b3ce6cb74c2fdb670ca1f8ac35b6a296a99dd7d39f3cf36321213b4487c";
+      sha512 = "210fc063eba0edf8237ed7c42a4dfd6bc7f37605643c6d3751c8ca843b6d13821a7a00a19d57103cf789523a42e8d8b89b3a4f1b20a5a33de55022a4aeaa02fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ach/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ach/firefox-59.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9394863e8459a12acca2b5d3beda97547928177c5f448ec2d657de66589915145e9a92e5c69b6f152d92caf30defd2de2ea4a7d63c0c5cc1f3210edd32603954";
+      sha512 = "5d16195a4124e596fde26c22b8cbc968cfbaa70347a97c9abd6cb00ac94cd2c5f537399e1beb0a946091ec2aee9849d80beee242d3ca7b45f4f4a044366dd6c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/af/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/af/firefox-59.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "9bb896d984dab375ee00a883bc4bcf5dc010b662664d6b990173ab4ee0877bd5368d3c3561fc0f86a939dd2761edde29d2d01fb17994e5f807f1bffec52e3f5b";
+      sha512 = "cf11788cdce96b91049f72b1b68fb8b8e7c32789121be07332acbdfb0b4a7359c6b0b432698342485a6878f2db409c297760439757b92e10e11a71a6a21b6d83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/an/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/an/firefox-59.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "6817cb770a554c5bcc4b967b1ab02ce9f5c0c3f8f8d119574b895824df88ae2c3f7148b9eb642865f2663f778ca58b2530cbee187922eb830178a41fbf55c482";
+      sha512 = "59f9a4943827d58028e10b9b4f419d1a40b4f51f85fc5dfbfc361db6a802a9e9587b5ffe9cc7187008d5cea554f4aa8a3ea76a349e92eae5ac6aa6ee8c115ad0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ar/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ar/firefox-59.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "d3f8cf030296017295f2cb32b0653e5657393e38b47ead24b24d274e42efb3555d870072782ae648dea2f1da8d65a0aa573bbb0e33d715c1c14aa52d54cda8be";
+      sha512 = "2a5cc6a69bc54227bcc4f52aea749aab2728e8844ac17629b97fa2f868825c934fab07bf916d3abd60ae0819c50578f67f365e517e1085e96986b8c3a1b0208d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/as/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/as/firefox-59.0b10.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "7388810d9db0a29d306cd63c4812e33bfa0c8dee68908a3217b5f634149c2b9d7ff2674dc678106e9964409cb8b31ab1ad1d1a2a2687dd4c82b4defdbfdabba1";
+      sha512 = "323cd7bd1b70f9dd133d7c1b4ed382b53e40e047be74196dd79687095b003890fd7d8ffdf8c642e24a1838f9140e99ee3668228057254a7a997f86bcd573ef0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ast/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ast/firefox-59.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f98a6e81b4628c60f0e082f7a0a2ddc193ae75005bfc5f07cac493086c9772dd6a4d45fd85ec4bb05551d95250cb0da0de93c898221fe6a883554649c7671e17";
+      sha512 = "6de3b4852abb9a0ffa3bb135cec95ee4685c109f794a090afb68f3c0b1f21616eea7f5e8133fff1e5819ccdbb436242f3cc6b84a768ebf1d101d26a21e0db3ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/az/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/az/firefox-59.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "899465a9d9de16995890a18899df752ffb871d3533b691ec964707c95e5008cc5db278495ab1ee96c73b738f6a384d24434786da81b50add0dfa10af1774af6c";
+      sha512 = "9161c67b9d9e671b5b493af0ea8c1d5aa603626e618192c530e819a7a0d3bfc6ba0f85c6385a6d6e631748eb8c48eddfe50216cc386d3cae332dab6a10e9cc74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/be/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/be/firefox-59.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "9727a425a867c5b020a71d9341e23ef93751ef03dc2fe4dc80746155f7a7ee7220a682cdc624945d83132dff6f4b9d604c1916364fef1fa5b4c0c693d637e276";
+      sha512 = "723f811ca543945d6d8e4a0c169d62d2fc6a0b2beb2507339f7dcb155c705c562904eb16b2908adc0bdac76edcc17246fec1e1bfc05487662591f7adddbe1402";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bg/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/bg/firefox-59.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "ed7f88373abdb170301b8f44042c2a2a6044ba315378eea4193d742f4faef3695148648268904a7e32cf446592088355db00eceff98840edbb2e96edaf337156";
+      sha512 = "a6e89c4a4efde3c342f2e3fd090e599bd32a02f99e93ee438a7278ef31027a2ff74669a02fd2137658f7b943594b361a97774d674632bf2be5fb6e22b5dd1b28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bn-BD/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/bn-BD/firefox-59.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "62b4d5d9d6172edc3f131f68f092aa28424db5f6e163e0a0d5b243d6015721f16afe0c3a7b1c49978abdba3b5bd7eebb8af06d9fcb107bc1199b9158bb2af14c";
+      sha512 = "d94c20e68132822858dd27504b789a666c050a508c6c3f06f77c9048f21812cb04c4aa183027e50e487562a34f7af333906aad4eacbdd0f137ce1e48b545fb39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bn-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/bn-IN/firefox-59.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "1cae0dbd5c320c6a0290af25ce25b27d76f97b2e2201205e07dfca024fcfb42b586969c7c3dad11cd01fef9d617453714485117b33c40d8b910d5b9049b5322c";
+      sha512 = "6b365dd55985045f2c00007c2cfab34fb29534cfa1174da4c5e92ff76844f51247bfe9adae15207ca557a3db0f77fdd514c03a11c142b9794a7212ae466f749c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/br/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/br/firefox-59.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "5192dd2a8fa9a39767e677a202443b532e67ec463f55062019895e5cec26966b8545562b593a28f86a7f6de502c9ddd994e28d5a6a3e06094ba8d6fadaa04346";
+      sha512 = "8b55f40021f4a0a396699ecc389aee59036ab7cc5b27118397e2ff1b2219df1feb1818dd84f9a2dcdbaea47dc9e20e72d082231358ce4e4a9f434d9594348e26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/bs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/bs/firefox-59.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "2800b2ff9303fc52b8c48a17717595bc5d713da47696ea4778bc2998556867e1acafe082e200401bd70646385c3272aa543f9cbc769457191cbbf097f199b957";
+      sha512 = "bd5cb06ac9f7983f160bbe2ea311a8050917a8eef5b3dc040d9a7e5932de53136732114509d493547d8c7206eadb781c36f4cc4abe1b8e151dc264b2fbe46cf4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ca/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ca/firefox-59.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "6a645131267baf7b3607a1ff600f6ec8a608de1fde3e188cfcdc6f4f8bb31ff52bf94f52a6a46fdae581f50762c52bc218f848b8808487c4c5e3b524863e4e39";
+      sha512 = "45b95841b860c7ad62e997c07a7dca67c78f63fcd513ea0e893a0edc8dc247beb45fe7420c0c864d874469e08b24fa336a3c9f122ed8cb7109ed09c0aa9c7560";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/cak/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/cak/firefox-59.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "639f0c8aa05b346b81e7e82ed2fcf6ef583fca7f5fe8005583cfa6ea9390d54c8e119b9189492ee732ae1af343a47355ddc8bf12d6aa33c6c3ae1bdcb6d64e14";
+      sha512 = "818a5f49b8c525d99792b6a24adc4e22a1b309bb02c69c546266f329b10cd840d84595eb62fb09772e00fff3812bab901e5d214e83ee7ddfc505785a0ee055a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/cs/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/cs/firefox-59.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "89543022fbbf8ae2ba713b4a8dfe566593bf21c07d464bad98cab6d185162eb29af68a69e1a1c9896780b8ae3bb781fb5941aa1c9fc562b1fc6c6a7d16f06c5b";
+      sha512 = "6babcbb54a0d2a34116943414e1a2daf49b8bd0f8364a6ff88d77d8edc686f29845fe590043050f32840986d47987102339d5ea796556cd11eef1867ea146944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/cy/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/cy/firefox-59.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "fe07033400aa8feac50a35c2d799178b6847927e25cf8a4b93f4f8f2b0a3590dba69940bf5d37ae50d49e8f9158fa6e4f4641c79cf36afb6700b435fe67d8e94";
+      sha512 = "43166ca4d8dc5fbaf339ea7d0ac60b15d4a536f8c881798c3f49e40612a5655e17d7cff665068bbc398e7efd13a81d41febc9479f8c41452a78a240f5c05e860";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/da/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/da/firefox-59.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "b8692fc265d595c24b5ac992cb7f6bcfd1f21ad9ecdccd41222427217e110b6440a42f6bf5de627b2f09a26cb2d2acbfa0a1bc9ffe429b5d06c59122b189ac60";
+      sha512 = "cdea2668276f55ba6e76f5a8f3082c6ab4f2e6611b92e601b9fa948b8982c9df21db4c56249c178bdfd957a3878d1c031db3734ee1557318851442bcd1a8d4e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/de/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/de/firefox-59.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "0bc1aca4e31fcea6eff45fdab2cb608c2bcc5bef13814370d9804b3905f9092883b4f99020d79b58eb1a4efb39a9098b470af310d04ff9114cbca6b9227a4a73";
+      sha512 = "ce0be3c10c4c76e960d360b4351a48cd1969ab8dd5cd92bcc71a91575ddfb9279af265c239134fe823c1d856255b398bb018594c26431b0fafe7a329291bf251";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/dsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/dsb/firefox-59.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "612e691fc261397b9b8cfc0ff5db422ee745c439ee94077acfe88a065efd81f1b554507bbeafe013d6dcd716f85727579844921e4b39a28039cb883b7fd7ab27";
+      sha512 = "c471b8b27e67ea3eaf096f34ac25a0fc9cca871e789f04f11c69acde537f2dd2a0540f0d329d6a22eb3bbb9c311a194b4430da11c4b8cd7fce9fde0b215169ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/el/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/el/firefox-59.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "322c3f68c2eb01587d28bd7510c923119cea07f91a8f12e86be1a49392620b1af2f45c88d2e71e51e0ba4414dbf65048e4c4e3e679905a138ba16ca88b63ebb3";
+      sha512 = "14bb443d6cf6817bf9078beea4201029ee073f3ecd36cea5af7c0269dc472cae7b51d4860310caba6ec12b23a0a6ea49cfb58c4ad9e98117aa6f132fd253b877";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/en-GB/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/en-GB/firefox-59.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b0e5d67f95565d2df209440ff2e36ea88db35ebb5effc03b848d5feed01d5265910666d580297ec696b2a99fa2464ef32c2b85df6639ef6ec721cc2468d34b18";
+      sha512 = "2a1b1c186212f1001f36c8e7e895d0e4dda6407bc5a4f9d1dc335f3d283eb2e6cf0bcb1f422e547502c1ee8a20613fa2f621d035e0c72f6240240920617c2aee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/en-US/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/en-US/firefox-59.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d306f8120fae7e76c36293732687ab9ba14fdc86df1341813846416ce16896fb8c888a049284da1f22c9a9944a3a75623937f6aec8f4635f7858ce55a6559b4f";
+      sha512 = "dd406303622e42f1627fd7f761a1bc239219fd09903478d7a26fcc96d18af111996ef3c92a669e95df448f2dcbd1952d39550ab9e183294c9109a53cd9b654dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/en-ZA/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/en-ZA/firefox-59.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "24ef351d23e63356354c26ffc266c86790db819654f6372e09431e4e999b71bb1cf9d60cdd169136c1d5f49b17284e24da02c2e0514edf87f10eb5d463fc65a3";
+      sha512 = "bf14c01c250a1e97df9f7862cb967c1a815a8485d4ed5a7141db76bfc93491b3b9cccf3b553f2d7a1d33c5e24b79bdb958f8785d97c2ab735d63dc13473b31ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/eo/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/eo/firefox-59.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "746a1a49b8ed341742e1330e0a2c56163f1f033f0fc3c5577028eb25c8adfc00d18c8a3178fc387b2385f8687f7e230680d181bc7e66d0233009c3e519097a64";
+      sha512 = "6f4d8835da70196214363789fca8c335a96a5ab08ea5c56115e41ba8e7f4f0b8f471df53e26ef2aefb4dd3b03583d91a50dbdf05944e0256ab77d05cbeea1941";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-AR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/es-AR/firefox-59.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "38a8ca393cda8418c63126888af2ce589672d96c7c7154c1b09e73eba5a4d6e8615d5621a3e5f4291517a8582727792050fbc112b3d5d4b5704f13625e09843c";
+      sha512 = "43a6e9de26f2823351f000dc383952a53eb92d88e4dc6b6eaab91c1047e3cf4ba190a52812edd8f43795153235f826174f38010dc25ee914668b7406798c5d8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-CL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/es-CL/firefox-59.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "9cf9d141802124165c4838012a92f50bd3cea3a90d3b94349c4d1513eefbfe0e1b87f010d6323373913b7ede4848137c999961ee2bcf7aaa79d0065eb7cbdadd";
+      sha512 = "2d954c8e3985ade085f628af298fe13ecbe5f4af16032d49795b4f785450ce2eb4355a7994429ba87d54371388fa8db3e70383ef43c76f35ed75f0c0d32340d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-ES/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/es-ES/firefox-59.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "3795996e046f1bf199099ebbf5d9fdadc6b079da79deebacabde4aa9412649c8e01940d14ddb88ac4164251349158f6bec6cb6a35629c5e9c69effa4fc58e2a4";
+      sha512 = "47dd00681968f151d606ecad674d37e077f66bc9226ce405233fe4a156d6fe70210038d5b95959b6282ec3cb4d3c627b28bb845d65eb03043163bf94ef2a9df9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/es-MX/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/es-MX/firefox-59.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "f077a716b8e6efe6c65f62e6877898e0c4974bdae7d95f861cfc49f2bd0eabdde7fe80260925880a25611803ec015f01b937c3cdae41e5af160a2921cb72ba8f";
+      sha512 = "60fab6cc374351fe11d1df19926bde93db0b78468410774e4ea46ec83f4551e5003697340a3482fd87391198addab4be311be602a8c23e9b398aa15e6fc3de11";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/et/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/et/firefox-59.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "7af0c1c615865d62b5ea1f8f1c50d282142a0ff948d5282ac1817c5f0528a16110fc4420e47ec1cf93bcd9db2dab5a0e9952861e84e1a52be433d5858f47b44d";
+      sha512 = "9fd2883cdbd8639b681870161f7b8c77f4a0a0e6eba2c86ad9332137151f18cfa46025f984b9e855654392fd5fd676d3970c6863c088bd93cc31c570596f3160";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/eu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/eu/firefox-59.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "ea12896bae6b614336b57033c24eb0dcf306168217fd4b974f2afd7f482b00f7905aa48ca5a1340fbca01f7842dacc6b4440cc8d5ea402519bcfe9d7cb8aa4f4";
+      sha512 = "9b0a7ba76e2eeed3556e9b1c6bcfc4c44d9edaf2f16ca753de82bd853176dfe38c79ab542c71d7a692ca68c02de9d14607fba604c0334695b7732d623bf0125d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fa/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/fa/firefox-59.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "84dc8d39055392c781ba4a3efd3b0237f8b8f77312fccb8b7ab2f624e55cb8a1cd2f29130cb7ccc6e5f1fd3050a8c0f7e5209dc2d55d42a6f83d66e87c9db73d";
+      sha512 = "62cfb44365592c89e5cbe2d4e4a85bf9dec73523b46693b396983a522d910622cacdcb3891a937fe08828e4ad6b294868923488734e78778e686499bbf064699";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ff/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ff/firefox-59.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "c8d0e3f502f544e3508a716de5f6585fde15d48701d437741881a8c669dd893e4f28caf94431d5dc65dfe56bcbc0f465bfcac9338bc9cc483467feca511cc433";
+      sha512 = "72e01d0e1dc69e0a1c37880e626166a929f77102436c35847400712d56c0a1d8979db692670b80d948ac240e45ed8fa03c6c55a7d15185e54dc57413d8080e95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/fi/firefox-59.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1694f8d3c051752e1a515c7cd8097b65c0b98fc9d9a9c4a79203ee46fb8985f5f59f664aa86d9965081e625a8d5fe3397a0da1eec5c053c881dda654b1f162d2";
+      sha512 = "298c2c7b4287b3a53c7464d37aca0ddf6aaee122ec3638947b5e690c43bebc6091b124d266b3623bb8ffd827e8fbb141345a6317ea0e915524727c2bd24dc4f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/fr/firefox-59.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "a525783f55bf894a65ae4cb17031e37863fad6b9f4512c8663e49737114161ba532d10565ca458dc9f21e4c5b06fac13767234e86a9c9d0bc9667d5a2f95a489";
+      sha512 = "eff4a4c8124bb16356bf6723a085d3484798465f728ca92f184bb82253dfcb14811c06e8e1f20944c0d21d0e1802c1e5b9e1255d26d2e01986d463a0454895a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/fy-NL/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/fy-NL/firefox-59.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "42db8068bcaa4b7725fbd4e8525f4473dfd3081ecdb5e53d4d927638fe95429273449eb3ca9c3a4bf1e8d3fbca05d65becdfffedd740af8761be563c4f3667bf";
+      sha512 = "61852dedbfcd1a58c901ad1e2b0429a9c4eb9be99d46651fe893ec6da03228147a24fa4ad9826cf1baead558017d32ff09908348603432f85cf02aa432e3f72c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ga-IE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ga-IE/firefox-59.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "faf4f2abb020d5f3e9147de6d33b2cbcd819c172cadbf1d12569a3779ebcaa40ed469b40bd77293e68aceb72f773b8895a2f5b6d83c996af3fd0e9c662f8dd1b";
+      sha512 = "313fdbb7eeb877a2694772ea0c190cc8d977b4d78b535bebcbd653ff833315827ae3425e02ddb64b2df48dba695220966d57ac26822ce0a982202b5d485680a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gd/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/gd/firefox-59.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "8d3f662d27f727930ee5cde2c066044b90de424eb167d654eee9f6b9c79fffc67f516eb0fbc664d88e1f49feeac1a82f7cba185622164bac7f8584e0bd7b7ddd";
+      sha512 = "f4910765005876155cfc3038449d2abe92e2a1617ec2980041e1255e733be929ae3b12302aec47016050f40a9de19c289e599c9b2d403d22d74294ef83245c12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/gl/firefox-59.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "eb6c41a56c96cb93b2533c7b7750b9d7699e6296e9541397525a4f535316c232dc48936f7113d52f723f7a2aa0c1efe4c0c29f92528e32113a41eca68a9d0e89";
+      sha512 = "9ecbcead2cd85d9d55d1788e6ac19c8e67ed044227ae21442b755058584cdec83f183740ff62ffac0ff6f21fd81186afa7a135e7f2898de1be3cff503b622f57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/gn/firefox-59.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "73f1db522616841dd7a36296f4e5133fbfe2c32e2a0b31eba052b737b48730108765667449dc75dc87f7491ff62b1c3391949f5e825e321fb8d9d9ae7e80f125";
+      sha512 = "649e87f91d30943ebe6808472d7dad79c07adff8770f15d33eaafb1a776696160bbf112a317a86c780b1bb86787ec8868c5d675dc6b8f74ca0739a04ba5f1dcb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/gu-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/gu-IN/firefox-59.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "369e0d80f41fe7f8c6586a634496e4ed1b12f01355b9da2277dbe3dcc2f3e5219d88934c1170843bf7c89e905c810bd670ac21a7f9556d3eb7477a7c899575e5";
+      sha512 = "b4a50e8484f5d40a3f7f5289d95539012d52b9beea25876a09cbbe35e00820cde2baf717cbbfdd1520a08e637b6b72a9b4add17101df92c5f527c8a31889ac22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/he/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/he/firefox-59.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "2d557737afd4efaa2c8d400e1a4af3dae7c67b4c88eb0b34115236a2eba12612538dc8cfc61118fb2e9cf5e81569a895eb36ca80349d8a0087c5f3d08303c42b";
+      sha512 = "37f065dd985f0541530f02edce25d704d1ca43629bf5072600be1f6aff3198c6b7d0830b2a4ea45c83a46e7a571f8f339d1124c718fe84c250e2584b867fb432";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hi-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/hi-IN/firefox-59.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "8259a5b722410b5800158937e85c996f083efd14c193c078dfd839767aec2357ef70ed5ad270c83d9e405e1bb9c7637a4743e49a8104f87f0bed4eac8d1f81df";
+      sha512 = "5ad42ef21ce2172b17b0af20559e8e1f7698112efa1407f73613b430caea1ce15a8b80eda482210a927c7dd65c3191affc3f21e6d00211fb138114da1de10d90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/hr/firefox-59.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "55a539c562edc8f75c388d0348b329c3d0e96199d9726f496aed4874f30d452600ecffdff8be78e9620301fa3e354dfd43130d3b39994f895bffa3ac9d685f4e";
+      sha512 = "18757982dfa56082eee587056771a074ca7662efcc9ac0a1a6221d7bceb134358fbb751d3feee2809ec1d0813f3f837176b9e4e142aef1445001243f7092b7dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hsb/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/hsb/firefox-59.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "db63012675d589f38e462a68ce7947d7de992ca649e37cbee73a84b2762319c7d037172869717ad5f6a7e685983f702f5cbb44352c6a5dbeff8fa94a3721c3b3";
+      sha512 = "f787dccebd96a6df217352cb8c84ed7ed6368ee4164ba66d972e09e585313c02a94fc7cb46fb38a8f809f81660122b5e8f314d6ee5a4c379b171eb3ed723437e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hu/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/hu/firefox-59.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "be7995425076aad97886ee769da37fd5b120d8929788854e3838e6f1d89e2f480b0d8a6d8420c45c35e2983b462f56a7824313d90d08c8315f46e87eb2108bc9";
+      sha512 = "85cdcaf8d03df18b2037758c0def5d30d12dae0b1204725d9f71caa66368a326c29e219c9fa30e24a2c84105dd7919593ca96db7374830f2ba101666a1525127";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/hy-AM/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/hy-AM/firefox-59.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "460ae88c733f5cb557ce32dc604f07433c6c1a2618de59aad01f1442d58af0ced9bfa5515de3b9404f52f124eed63ce5d3fb4422bf4040c9cc82ef875024681d";
+      sha512 = "ca17d2e583131a42c74165e5a2fcf808976843eece16440311175ea10c03ffa24c3230dee7b6f236b555eb97a030b7703070777fd509dc3be8dca0628e57e3ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ia/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ia/firefox-59.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "2dbffd4253b4f5f76c87c34fad89cc277b7b46e1b042b714523e54ea9216389dc6b4987104bf717e99a0d967e8e6aace91b34fb1f54b764ce592d33a13552b29";
+      sha512 = "79b144158b962351899c9af9fe83f60381c3d257570a64d4b53d0408fa062cb9aa05765bc0d179907b175f2c81983eee367f7ef51c22f91ee70d2197fdf80d08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/id/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/id/firefox-59.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "f8a29ff306fde814c4f928baa89c43fac30a64d341a9d2ddaf0e50bacd0726cff3992142db4c037da08bc89c24bd14246a696eb3bfc8602a2bc60d726280066e";
+      sha512 = "3e745bbd9f5ee2031f58d6982edb670d63572b57deaf75537848a5c2a31f8c6ab80f0bcf79a3362912dee6e727a952dce733972ebd1d1b800bfaa14685165bd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/is/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/is/firefox-59.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "7725603b6844aec94e5b5b66a2da33043f5b10143b85c8e845b5888a0f6e4c9e417f20d48de5565e2c75147c4ab98754b53486e61489432989e1983f78e7054d";
+      sha512 = "2d122a224931c5b0f7e9842407c9fbf023c6ab6a7394c309dee2dc4ee539cfe33e2f4a8548c1e4de36b93ba71d5a89d920d7636175aba76169649615e19d8642";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/it/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/it/firefox-59.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "fcfc5fd9ef1e81642497a5108e8af4efa1b34e206aa00295522ba439a8d4db6d7c35d6e816f04a228a4375d1c02e02ac85627c05df6a781f6257bea5ab5803cf";
+      sha512 = "849fc8d1bcdb8ab47fe02c2b174aaf5ac5535f47740b4d5cf830c4e3cd0495b9b6d921dce509ecc4498470dc84828b1d9482427ad2f8a03d20964f214a5bc06e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ja/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ja/firefox-59.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "ee23c1c8a41aa07659edab9ee1ed40138c60c16f4dda625a4c37cd90b4ab3be3a6fae213dd6ba90451dec79fb55009fb41f95943384620c113245c9c210c3f72";
+      sha512 = "4b405b3b8c71156e56ab315fc5e4e80519e14e11f4f232b85b3bc4bbaed5ea62aea0f75a628fe4717cd10455b01b7c653481c4c52ebe314ff7d953a7cae70aea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ka/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ka/firefox-59.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "1361630278daf002466d223080311db31ed58abd9b2255ca7c66c073639b84ada919240ae2c2f34d27ad57b4b633ddd2629b6f5fdfa022254c29937263b769bc";
+      sha512 = "35fe315a66b598de2d34b9e6ef7102bb4b4d6505fbc4c813f2198ade1dfc12c6dbeb702baa8a35248c54d16f90e4445e4367b533b5fafb0f7c10ac768ebd827f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/kab/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/kab/firefox-59.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "874438b560aaeb324bcae0dc7171ab5394f0fab93c49d45fd1c54e87b16962c0cb1f6ee3279c69fc9fd9173bf4edfcc1813c697e88bbc93e2af376a9dae1adec";
+      sha512 = "4af5dda15c10f60f52a0b599b3adcfd2f9f41f0ffb3e150ef957c409f1b7d464bb0c82fcbab1879d1b1e955efb76ec7d11684f3abc338c52779fdc4b90ff1154";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/kk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/kk/firefox-59.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "6f09ade7005bef3db6840e50ed47037b140c368270a2b302bc463a3f1d1114df978676e459e6a92b90a4e793cc64a18c47096ffeca216df839c6087de044de59";
+      sha512 = "bf8c0d14b5267386a1ae6310b7e7c140419bede889393b5a0c656d09467918be52cf5baf62aef0a7f83f41515c579f175f5dfa8e97ad127b32c5f7c25cf89991";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/km/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/km/firefox-59.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "96e7ee1b83d28a2cbabb106aaad4e900ea69a42111a53c7f360741e51e0e829bf7ba130e8477a67a1d98c4c23e29fad6e2d2704a58a75bca79fdabf0b3bbed84";
+      sha512 = "22176eb94760ff4c7f43a669679dc16dee30e3fd7c57a69025817f1fe15dadcd557c177f5e30aac13e85668aa5d6db39971632fe2419375b86076da152fe74d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/kn/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/kn/firefox-59.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "f431e3e66f46d50b6c7af75514534fd4d9d71d7b9cfe98b04ff99f80bc53d896d3e7f5e87d9fd81ceefbbda64779a73431ff29c3072af5ea29dee98c1f66c224";
+      sha512 = "1116b719d437b9b04b32640666fc4149ad562282ee7e1ffe713281a39173c97f961c15803dede2885ae73675b9c8f85242041f6c1f12b1fd0dcd50aa7f96b10b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ko/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ko/firefox-59.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "297b5ab13f213fd1113fed8195cd124a28836d600d59f1e1464f456d782eb39988e17f3aa032877072b4a843cb2c8790377f1842825344917caabf659a716309";
+      sha512 = "df00d9edb00614006ad7b2d23739acfa9c410baa79a03debc5ab4adf01926751897922559ee8194ee64fe4d36959ae00ec334a4a771c3343f41c22fecc86414b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/lij/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/lij/firefox-59.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "fe44c403b0294f0f7aec93727f2c958b416a5adb6d677af0edfcf0fb7e08310527ba295f5640d2fbb7538841e6157bda0e1db9165e9a6e7655bfff3ad7ced85d";
+      sha512 = "4f553520c508f169795e60e157279f751256f9fb6ed843b15ff28b877daac04ec6af7cd8000d0d377c1b873c23650e8e03cdc117a54d2c38edbbb8bcb187a8ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/lt/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/lt/firefox-59.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "7791a8562dead380253be7b18b0f67b27346c868ed7638df9d53f112295d6637448a7092bef5ea7e82b68ad662f6b69fec93f6cc419d073d9374176f5fb46773";
+      sha512 = "794cb51a843ebfa57d30a05880fe3f93e12feea03d592b04f69a6ee191a9527f534192f57c906a220b6623e320acc0ec16b6e4623229733b2cf5ab2025ffdeb6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/lv/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/lv/firefox-59.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f012bc53e80a3de602ce04e60206758cf8b991c68db22cdb822a056cd562c4762fee03d3ae14bd54e1de24bf09e16dadc33b54fe408b6698e6a584ec6242edeb";
+      sha512 = "efd41df955e67dcd34025c4c7f832cd828ea4beee92c1aed242bd97342517c25331f50b6670c93324277e888edeaaa255e1d6829b7c784f3b6899b01ec84b8ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/mai/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/mai/firefox-59.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7266993340bf341d3e7207e0832d8b0d0e47f0737185c5a1c0f1e3c23e75686835dde771c8a3cf1e41fdec384673c22fc2514f057b07edf0eaac84600c30a23d";
+      sha512 = "1cf0522e005f905b5340d3fba542978c5f4dec1d3caedcd03972080671f60282bd7a4336380dbe3d5fda8717db2666252e8d4bf3d2f6fc1a69fd18220db6fb74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/mk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/mk/firefox-59.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "011c66bfd975e0fa5dad697030cc77327ece7fb0560ab2bfb07e976b1fbcd8ad017b3998247fb0800200408679e8f8ea209428c2e8d8f1f0fc71f073e6ca4252";
+      sha512 = "2589e34deaeed2b3ed30c5240dde7400c9baa1a85856fb4f7b56e6342c83ae071495c0065c0a7c6f0f69d1910c60399c74bfe2417a954787d5724065e081622d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ml/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ml/firefox-59.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "13efb21bc57b2f915b54b631fc29aea78c4160cee247b714efeda1111494da9cdd82e338446220ca566e7ed2f136496909c38f1095006c8abedf9accb885f4a3";
+      sha512 = "0bd483500bf12019a50dcde839ff4b4ac3c50f9d80957b9a7c8793cfba69e1c6a759bf6036bb680b1390fa1cde87c2181fec6f28da57b60d58f98262f82aaa5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/mr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/mr/firefox-59.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "555a023464b88f35ab0d194eb51c7a6f2b8cf1246130f04e24465e20cd5c56b59fff0a9513f39e2ab66538cbb0f2bf2414ae2909f3494bb2e75b16e9efc475da";
+      sha512 = "04295223214c470936be349b46749bc64c25364c92db7603de2d9588da463554a9c57c51edc5a203ed43123f69833c8c01a76ac71cea6cfa954a7eb433ab1944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ms/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ms/firefox-59.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "9c738b808d7173f1bc67f2e0626e135bed034096f727f2b29154645db858b7d60716664c7d9f97f583e662465ed86487effa31d45bb2177af238aca07fe3234a";
+      sha512 = "895ae1c630a54f5e8cf5e8b2dc21327190c957bca29d9be3262e6daed770976d98896f5b213ab90ee1ee3a286ed08a525e9727d44078805e5fec68b2ac9a82d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/my/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/my/firefox-59.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "e870fbc6fa6091904315e2e2e9cc57fd982a96c75a882f2e6c08aab2c1d6ae895f9e4ad1bc396282ae664b03661da0e5ff3dd11f21b9c05cf3e6167e8263b96a";
+      sha512 = "59ef832b004def931d64bbadbaab9bcd1531770da6657562380512a70f4e52e5b429846e576b7a3ab59e6203ee6c185496d7427003afd517b1dccaef5b6e4deb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/nb-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/nb-NO/firefox-59.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c1507d300fc41adbaabb7db2166f8968a68da47dc99372df9d0ab60b3af75d0ce5a9e353fef2d38f2f14dce6c0490a9e5bf551546977836e7854b26595848204";
+      sha512 = "1d98dcc59cf2b05c56807a6e196fa212a4967e28b5f9955748519edf9c1590cd8551a90c17e558e8407b5977c759218798299d245af542b5e5e1a9a360538659";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ne-NP/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ne-NP/firefox-59.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "0c5771c97bbce4cf361efbea22dd707c6675d0cdb22d540fe5d7b914cd4517ddd7699ca21f446c8a2a74457356d51ed2cc70d677bcbc1d5a5d4f64e05f20ef35";
+      sha512 = "1db1285da815edf0c6c43ea31f15cf109a54475db1491bdbf7af06d24a20de332db1ce4b275d3da440cc9269e874c107849ef7f4ebb1f9f67bced7857328d450";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/nl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/nl/firefox-59.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "317c66c3fb2acfd2acb7e0148042824040474dcee07a45a26c4b372f283eb0bddbd58d030943f8e4ddd3826fb74cf486cf3c4b83be56d91369c6fcd69b464184";
+      sha512 = "e515afda419c0f52e26cc6f256b7f39ed0d34cde434ad0d33824ce08d5df9fcd4b46c2cab64ed3873ab661639f503dbd01c27fbbd41a513c795b9fe905ba19fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/nn-NO/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/nn-NO/firefox-59.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "1145977f9fdee6bbe64732544066c894e8b2f8c28bd6e09d28dbc655bbbd5c777d3844fd20f5893eeea653152a46697c9108db3a83c3c94683e3796a3ada21d4";
+      sha512 = "65bc0b9bfc07289b1bb2c6f7fb013ed28f7f907b8e4c7c19cfc7d0b493a32104f08c92e1f36fce28610499414b347c241e7ba4c8b7c200f7258b60301f4acc7c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/or/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/or/firefox-59.0b10.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "0a6cf1c8df3a9ed98470b58fa4c7e0ef9f993c8eb97d113b8b0a1f6bca45bff0c8a8fa3155221f73f2027a58de7c049b391e9354dfa853c334928010e619904c";
+      sha512 = "f8bc51ff98d242ca76300ca69a22b36c38bf5f246724a3a733e30489b63ee9455dfdf8145f9910029d9853b41cc22a96950fd1e9617c36590d068b57e1533fb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pa-IN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/pa-IN/firefox-59.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "3cc42839a5831a97ce300c959dbb40cb91d1fd689aeb8ff0e162a726b36cd3eaa474d544e40291cf049cdd624e776f548b9e0e3642254f43355856a31f2d90f4";
+      sha512 = "126a431b851f4911e507f27d19cd292e301bd0f229e30a50d9e970003780a17f53280b8cd98970d6395bbf1d892784c3fc87c7282222fcb77a0606aa9b14669e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/pl/firefox-59.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "b5088ed353c3e539b5eb7606dfb1d9dbdf312c77c63d8b290e4cf2b3bc5442300f76b786965f850084e70b8f41ee7dc49c77cc8213cf44e7c7a5204627c1bfc3";
+      sha512 = "01c051da631844fc706ec31424108abc77c609f4f5f0b25d874c8a4a007312f278981209a85610299d940fca2fd5328e9fc4815cf3bced0ea5ee97525141e4f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pt-BR/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/pt-BR/firefox-59.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "c00b77260782976d795eb523e35034caddac8aa227725179ab87d0db17e9e77a94ffa444410486833ece208e97b6f7060cc7d674f1f6fda68501c8b9cb10b1d7";
+      sha512 = "b4c4944c271cc6a744101d745c188df2ffde5a0ec9c7581b728f30d6c6bd3775fa5d1ba759625aa465b91e402b1a7756f3dbebbdcb2c11ffb77a8151744c6c9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/pt-PT/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/pt-PT/firefox-59.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "6811c1dde13b92179d5b51f0773733e4499e92b6d73082c7cf669026ba06889b8475f6b3133d2093666b087120bd0dad7c23a86066498c7e344239a67ab76bf3";
+      sha512 = "e25a883c3cc68a6cd63a67a798fd196935cc412402d5442c49a6a427f1fa03d62e9332210aef19666f2fce5247b1418b87b1300dad4a1f0674324fa66703f831";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/rm/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/rm/firefox-59.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "f9aa79280b3a73999cd9e054982629779eecd2c65c38b369d041084e0f936d08139137239951d6c02f2fc340584132f0dd9054388c26f72b6b80081e3ea76894";
+      sha512 = "863c664fa83e5b259753ac45e8ee8cfaa1303fbc678f8c2f69eb25b8d6393e797c22708eaa310100285dcc373abc0cf95c53ddcbf84bb5e5146234dad4430d1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ro/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ro/firefox-59.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "721e05651e1f93f74220dabd9d8624f573de1c3cccd2cd01fea510d6ce511e915e6dca06ab7c1c44610b82d9bd024048a680d3d6b6808e8dbadc0de44eb6ac3e";
+      sha512 = "39e8e831da007ddcd436d4f5bfb05a478b47667fd0c417b72f762854b6d8d80873e2ee1a2174cd28200a37a9ccd6fa49e95565a6b4dbeb8a768dd4564d5a020c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ru/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ru/firefox-59.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b854f3ca801e52a45d34f9c79abe39c365417c612b53ff5929763da3417f0e41e5f9164ae474851d20024e7f7677b92802d1acce53291c7cc54f9cdd61c6c226";
+      sha512 = "bdfb3c12e5f4f3fb42651a2c5b780fa12fbc108c74b4f4f132fadc3bc1c03a1bc4d5c7179d74040e768c7243a329554fb53854defe3264277e1933e1c0a5defe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/si/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/si/firefox-59.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "af2e9f61395caeef167f689119f552f850e41233a4a794df669695a6bf422c2a6b450e6c7aa41bb5799912c5ce3da14e6819747affaffbe54f396c895897faa2";
+      sha512 = "462a0772313d835bcc3c769901a6ca576697b05b0048724ebb59e182507d325e750c69eba6ef39bc6de18fba9196fbaeecaf57e4c1cd161b54c1207bb7ef33d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/sk/firefox-59.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "d730e3f88a8053fbf9e18d0d7a3e1b86fcd1a0cee6a1ea854ca713809485217df6585da918448cea4b0942c0add7a7b0dbcbf38145c9287fe58b5160baffbce0";
+      sha512 = "70443379a1de64e6bd70441bfab530217ab3905bab50c5fb7b47c1eee0dba0ac06e4d697a2ac102cc178aa20ac6f1a12fc8209af2ea63975f00f36a996c54178";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sl/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/sl/firefox-59.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ccbe23bbc6da716ad5025a8be3cad89c6c37af7cb740d7da8317b0fa5aeebfd9e1f2b726f04c990675d5fe23af698b5afc09e567b73315ad316a65eb5589246d";
+      sha512 = "e1897f31e936a73aebe0ae9f73a08796ec9e2bc3fa0e7b805322d9187b86643efb8ff9febb6053a6afee03afe0f892649eb858697e323e1b2f1747c4d10e86da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/son/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/son/firefox-59.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "6db830f248e7c1477ce597d3efea55eda7fb7826097b923ac3e27a2a60300043f56efe2060b13b8b9c98938561310bd9739d13676960ee271a4b42b7ea4c09b1";
+      sha512 = "f81741dcf41d86c6fd6d7dcecede236d200f2f17e07aab07dfccc6b08092d7d3f34bd6548c6813b033e59da62d224f657561b9c0e76bd7698979295e3f9cf539";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sq/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/sq/firefox-59.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "0b1141dbdb96dafd23cbd2a0bb962ac9d41fdb74d915f0480352ca12f1494a5d4eb8465bf2cb44a706fc812d91279095cf6b44abc877e008a4e4dedba5838426";
+      sha512 = "e1531083321d55dde8cfc212e26a220e4e290a4078a18f97d8931ac06a74ab5d7b0e0070eea03090e9673dd0f2c7dfd48bc5167594004aa54184f50010abc66d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/sr/firefox-59.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "11b2bd7fd025ea46f34703bc000541d759111b39dc0b2359f0f173cdf1f86aad6ff68bdcd346c41281e69e60ce290806f931eaa12598470dc43157d06989d9c2";
+      sha512 = "592fc5bc8fa034f7e5f5fc558fad4b7da2bca234660fc39582cc52dbeb6eec65bc42f5edd8415bbe646e6b790775a813d42e08f0f4a4a11f5444cdc6ebee2ce1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/sv-SE/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/sv-SE/firefox-59.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "83942b1ec1da58199ee5bc1ae3adc560a8add9505396c8e4fa053a9d9cbdbf6968b436546d3c6ee226f987f6e9555e93d5807138f3801db158349fb11358206e";
+      sha512 = "e61893861b6890d6b3f4c8c158c74a72fbdbd0a334ee132d6aa8704cd1fa848242f83ad362bb8a8ed853eaa5e96e963c382c58d27bdfd41cf1872ca43b9d1772";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ta/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ta/firefox-59.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "89590ff0ab933826cc4f48b086c0d9515ed8b1cc35f97eb43de1b6cfde1a04b1c60b357c552ff15f6125b0c5103df0d7493a9d4cd62a7a636713d9708d048be6";
+      sha512 = "74ad9cabd262937eb53f058e0382face2d4c18ded0e3183de4cb634523bea6a0506e272211a509a3756cecb0c8a78693e8b6eda574f439fe910febfb81907f0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/te/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/te/firefox-59.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "741ab5f836ffb3156a89bafb2e507713a007c5107f3307e50ade2ef700e980cf4712cedb7022111ae387d3dca2bf6787b9bfa3a0e1d92b6993aed55c08f70b8b";
+      sha512 = "d843944d52b92154607b01b48afbc782d1212e534ee7133b7016687e349e342f1b4c777b3543ba8a4e4f3b5b7d6b71f574ce546885b8e6a9119fc1b5f387fb35";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/th/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/th/firefox-59.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "02d32ee9682cb161127f578c23e8a6cafb2acaec2faac5af57eb158947b9cd00dcc47564eca1142c6ed240ccd591718e5557bef608c8614ebd7761abc6da696f";
+      sha512 = "385ebb13c27dee38b8e5f8f1f2f8895a035b8e888ddd6d39a1e4441f6a9b38cf47ffdda5a1939ce0ee21c0520088aaf484f16d6bb1d8930ec4d04dbe65f987a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/tr/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/tr/firefox-59.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "821d3ce320499f6ae048223bb45abfb962d38180edf44e4958c82d3cd3578015c10fbc9a12dbea2a19b9f9bdce81afa2e084ce1b2e1ae4f150a409c168097ebf";
+      sha512 = "ccb3332c8a36e2f09e5636083102e879ffaa7fbaf542e841ac32c7a9abed23416c3f204c4929dc948db57922325beab308daaf358444a829c861a3dd69014b2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/uk/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/uk/firefox-59.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "b01917536ac7329cbd8560830d232d0ae4cfba71470a6ba7bdddba0acb0a2315cdae7592b6be2014691b0a9ec932460cede4de97bc65827c2e992aee25556c87";
+      sha512 = "da76609d8f2da6e218e06b14884d854cb18a6f83a2b8fc0a06cc9ae94ac841cc5f921f63285ef4955f2321a804378a75a6673b1b9d8bdbde84c205ad56cf3e7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/ur/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/ur/firefox-59.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "5ddcec95a40fed0b9144aa47a2bcd221c1024dc6499442a6bc2a8e9d51d1ba1e14922153c6b1b8eb8caf6d130cecaded8cd3638bf2f162d236e4fc14c99e92b0";
+      sha512 = "ecc1734737683a12f8455a22350a47b1e20a826c67dcf88531bdc3e91821d79343a25e2463fe4a4cde942c8c3fc6d026a803a85185e06113077702b323c8123a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/uz/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/uz/firefox-59.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "d818d822ca7beadfda32a85b0f27861975a34e82b261ff4f199268e9401e2d4418457c26fc8f718bdef776785a9060b0a2f482787efc9ad08cc59d12650d908f";
+      sha512 = "47ef7145c5b33991b23933e6d9489c62660e821af20dd4ff3b50ba9fb6b0ee6c0f6d576f74a35957b6b4b79958225de38e0f65741bb3e469714971a9f1cad4be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/vi/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/vi/firefox-59.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "4aef450810df8dfaf9231e6c226bb0eab357b4aa81b7b3b9854865adb4cf09442c790c1a0810975527e39d5ccc7d9f28f7da367810b7b3755ed5f0046f0a38ad";
+      sha512 = "7f1307cf711a7f7c5f3dd36a91388cb25965ddca9916fe6ab7c86042075189ad42498600a87dd677acc8aed3e848d772ee3cf41d9a63fe89f5416f156e7af006";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/xh/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/xh/firefox-59.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "bc8a2e6e7b9950f07da39eeb37a0222a8c1b44bd3d652f757b07ae73d6a9afe0a4a9cbdc37d20ca831e6a0b12e9626b2148ba615e037f16fb7bc77754d85324e";
+      sha512 = "5efce39bfdf2aa21a2a8dc62a84a6880f498e580549c4665a7572a350c4a2f2be8e4171b2b2208236363c09abdaf77fb8bd1ebe18670e8cd84c70494d1b3bb4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/zh-CN/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/zh-CN/firefox-59.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c61183482ee9ed60ce99e1efe20aa90cf7c8ffe0873f884880ed1f47f4737f82746ad47eedc060f6bf2b4b13b2eda01bee668d4edabba5312db828a5e7a63e5d";
+      sha512 = "b11951e197f750c85544b557b34e8133cfbb962e432b92ce400d49e733f10203febc1d5ad33898193aeb3122be4e2f857b128934e84a6b6f8826645eec622cc4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b9/linux-i686/zh-TW/firefox-59.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b10/linux-i686/zh-TW/firefox-59.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3558599544d654652d4dfdd58d628134093a7142a22a0a643668a07bd2a773fa0ee350f6ce18d81bbbccf474a26ce643a3a910399687da61461c336e6e08c6c0";
+      sha512 = "fa4ae6e79f2358426727b9c167a227ceb42f94c5326daa0bccb87abf8992efe2fae7b25b7f00c8bd401a2979974e1f4ddc20f30017cae42f50d494627bf60b97";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 4cb997031cf7..44f4b014d70b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -12,12 +12,23 @@ rec {
       sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f";
     };
 
-    patches =
-      [ ./no-buildconfig.patch ./env_var_for_system_dir.patch ]
-      ++ lib.optional stdenv.isi686 (fetchpatch {
-        url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
-        sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
-      });
+    patches = [
+      ./no-buildconfig.patch
+      ./env_var_for_system_dir.patch
+
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1430274
+      # Scheduled for firefox 59
+      (fetchpatch {
+        url = "https://bug1430274.bmoattachments.org/attachment.cgi?id=8943426";
+        sha256 = "12yfss3k61yilrb337dh2rffy5hh83d2f16gqrf5i56r9c33f7hf";
+      })
+
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1388981
+      # Should have been fixed in firefox 57
+    ] ++ lib.optional stdenv.isi686 (fetchpatch {
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
+      sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
+    });
 
     meta = {
       description = "A web browser built from Firefox source tree";
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index b1b1132f22b0..17c285d9bdf7 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -5,6 +5,7 @@
 , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
 , dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk
+, kerberos
 
 # command line arguments which are always set e.g "--disable-gpu"
 , commandLineArgs ? ""
@@ -57,6 +58,7 @@ let
     liberation_ttf curl utillinux xdg_utils wget
     flac harfbuzz icu libpng opusWithCustomModes snappy speechd
     bzip2 libcap at_spi2_atk
+    kerberos
   ] ++ optional pulseSupport libpulseaudio
     ++ [ gtk ];
 
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
index 7f17bd57c194..73a28325f52d 100644
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoPackage, fetchFromGitHub, ... }:
 
-let version = "0.5.0"; in
+let version = "0.6.0"; in
 
 buildGoPackage {
   name = "kubecfg-${version}";
@@ -9,7 +9,7 @@ buildGoPackage {
     owner = "ksonnet";
     repo = "kubecfg";
     rev = "v${version}";
-    sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93";
+    sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf";
   };
 
   goPackagePath = "github.com/ksonnet/kubecfg";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index e8686ade5900..e2f431e2a5e5 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -8,8 +8,6 @@
     "cmd/kube-controller-manager"
     "cmd/kube-proxy"
     "plugin/cmd/kube-scheduler"
-    "federation/cmd/federation-apiserver"
-    "federation/cmd/federation-controller-manager"
     "test/e2e/e2e.test"
   ]
 }:
@@ -18,13 +16,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.7.9";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi";
+    sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 017f9c0c95a0..4152c2772e10 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -14,12 +14,30 @@ buildPythonApplication rec {
     sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
   };
 
+  outputs = [ "out" "man" "doc" ];
+
+  postPatch = ''
+    # sendmail executable is called from PATH instead of sbin by default
+    sed -e 's|/usr/sbin/sendmail|sendmail|' \
+        -i rss2email/config.py
+  '';
+
   postInstall = ''
-    install -Dm 644 r2e.1 $out/share/man/man1/r2e.1
+    install -Dm 644 r2e.1 $man/share/man/man1/r2e.1
     # an alias for better finding the manpage
-    ln -s -T r2e.1 $out/share/man/man1/rss2email.1
+    ln -s -T r2e.1 $man/share/man/man1/rss2email.1
+
+    # copy documentation
+    mkdir -p $doc/share/doc/rss2email
+    cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/
   '';
 
+  # The tests currently fail, see
+  # https://github.com/rss2email/rss2email/issues/14
+  # postCheck = ''
+  #   env PYTHONPATH=.:$PYTHONPATH python ./test/test.py
+  # '';
+
   meta = with lib; {
     description = "A tool that converts RSS/Atom newsfeeds to email.";
     homepage = https://pypi.python.org/pypi/rss2email;
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 3fd7317ef6c2..24050314c413 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -4,6 +4,16 @@
 
 let
   pythonPackages = python3Packages;
+  aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
+    (oldAttrs:
+      rec {
+        pname = "aiohttp";
+        version = "2.3.10";
+        src = pythonPackages.fetchPypi {
+          inherit pname version;
+          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+        };
+      }));
   aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
     (oldAttrs:
       rec {
@@ -14,6 +24,10 @@ let
           inherit pname version;
           sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
         };
+        propagatedBuildInputs = [ aiohttp ]
+          ++ stdenv.lib.optional
+               (pythonPackages.pythonOlder "3.5")
+               pythonPackages.typing;
       }));
 in pythonPackages.buildPythonPackage rec {
   name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
new file mode 100644
index 000000000000..0bcf3493d29e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
+, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
+let
+  fullPath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gdk_pixbuf
+    glib
+    gnome2.GConf
+    gnome2.gtk
+    nspr
+    nss
+    pango
+    udev
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libxcb
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+in
+stdenv.mkDerivation rec {
+  version = "1.8.18";
+  name = "stride-${version}";
+
+  src = fetchurl {
+    url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb";
+    sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym";
+  };
+
+  dontBuild = true;
+  dontFixup = true;
+
+  buildInputs = [ dpkg ];
+
+  unpackPhase = ''
+    dpkg-deb -x ${src} ./
+  '';
+
+  installPhase =''
+    mkdir "$out"
+    mv usr/* "$out/"
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${fullPath}:\$ORIGIN" \
+      "$out/bin/stride"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Desktop client for Atlassian Stride";
+    homepage = https://www.stride.com/;
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ puffnfresh ];
+  };
+}
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index c543825c9f28..97838312fd0b 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.1.1";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0y362v6ncgs77q5axv7vgjm6vcxiaj5chsxj1ha07jaxsr1z7285";
+    sha256 = "09a9p1yfg0m3w7n2a4axvn8874002ly8x0b543sxihzqk29radpa";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 8704961270df..6413c1407dc1 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, which, autoreconfHook, makeWrapper, writeScript,
-ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl,
-lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:
+{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
+, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl
+, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:
 
 let
   muttWrapper = writeScript "mutt" ''
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20171208";
+  version = "20171215";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "1fn28q4akfz0nq3ysp8n53j8yqp2mx6yhbvb59c4zm6zgd4qzgp1";
+    sha256 = "1c7vjl5cl0k41vrxp6l1sj72idz70r2rgaxa2m1yir6zb6qsrsd8";
   };
 
   buildInputs = [
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which makeWrapper
+    docbook_xsl docbook_xml_dtd_42 gettext libxslt.bin makeWrapper tcl which
   ];
 
   enableParallelBuilding = true;
@@ -51,18 +51,14 @@ in stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--enable-debug"
-    "--enable-gpgme"
-    "--enable-notmuch"
-    "--with-curses"
-    "--with-gss"
+    "--gpgme"
+    "--gss"
+    "--lmdb"
+    "--notmuch"
+    "--ssl"
+    "--sasl"
     "--with-homespool=mailbox"
-    "--with-idn"
-    "--with-lmdb"
     "--with-mailpath="
-    "--with-sasl"
-    "--with-ssl"
-
     # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
     "ac_cv_path_SENDMAIL=sendmail"
   ];
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 652de194a5e7..3cbc03e8d73c 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
     "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include"
   ];
 
-  postInstall = stdenv.lib.optionalString (withGnomeKeyring) ''
+  postInstall = ''
+    sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \
+      $out/share/applications/nextcloud.desktop
+  '' + stdenv.lib.optionalString (withGnomeKeyring) ''
     wrapProgram "$out/bin/nextcloud" \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}
   '';
diff --git a/pkgs/applications/networking/syncthing/add-stcli-target.patch b/pkgs/applications/networking/syncthing/add-stcli-target.patch
new file mode 100644
index 000000000000..58ac15253aed
--- /dev/null
+++ b/pkgs/applications/networking/syncthing/add-stcli-target.patch
@@ -0,0 +1,17 @@
+diff --git i/build.go w/build.go
+index 7d400d6f..1b5e1d25 100644
+--- i/build.go
++++ w/build.go
+@@ -175,6 +175,12 @@ var targets = map[string]target{
+ 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
+ 		},
+ 	},
++	"stcli": {
++		name:        "stcli",
++		description: "Syncthing CLI",
++		buildPkg:    "github.com/syncthing/syncthing/cmd/stcli",
++		binaryName:  "stcli", // .exe will be added automatically for Windows builds
++	},
+ }
+ 
+ func init() {
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index f5e8876e2b34..64c0b31a2a4d 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,57 +1,103 @@
-{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
+{ stdenv, lib, go, procps, removeReferencesTo, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  version = "0.14.44";
-  name = "syncthing-${version}";
+let
+  common = { stname, target, patches ? [], postInstall ? "" }:
+    stdenv.mkDerivation rec {
+      version = "0.14.44";
+      name = "${stname}-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "syncthing";
-    repo   = "syncthing";
-    rev    = "v${version}";
-    sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh";
-  };
+      src = fetchFromGitHub {
+        owner  = "syncthing";
+        repo   = "syncthing";
+        rev    = "v${version}";
+        sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh";
+      };
+
+      inherit patches;
+
+      buildInputs = [ go ];
+      nativeBuildInputs = [ removeReferencesTo ];
+
+      buildPhase = ''
+        # Syncthing expects that it is checked out in $GOPATH, if that variable is
+        # set.  Since this isn't true when we're fetching source, we can explicitly
+        # unset it and force Syncthing to set up a temporary one for us.
+        env GOPATH= BUILD_USER=nix BUILD_HOST=nix go run build.go -no-upgrade -version v${version} build ${target}
+      '';
+
+      installPhase = ''
+        install -Dm755 ${target} $out/bin/${target}
+        runHook postInstall
+      '';
+
+      inherit postInstall;
 
-  buildInputs = [ go removeReferencesTo ];
+      preFixup = ''
+        find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
+      '';
 
-  buildPhase = ''
-    mkdir -p src/github.com/syncthing
-    ln -s $(pwd) src/github.com/syncthing/syncthing
-    export GOPATH=$(pwd)
+      meta = with lib; {
+        homepage = https://www.syncthing.net/;
+        description = "Open Source Continuous File Synchronization";
+        license = licenses.mpl20;
+        maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ];
+        platforms = platforms.unix;
+      };
+    };
 
-    # Syncthing's build.go script expects this working directory
-    cd src/github.com/syncthing/syncthing
+in {
+  syncthing = common {
+    stname = "syncthing";
+    target = "syncthing";
 
-    go run build.go -no-upgrade -version v${version} build
-  '';
+    postInstall = ''
+      # This installs man pages in the correct directory according to the suffix
+      # on the filename
+      for mf in man/*.[1-9]; do
+        mantype="$(echo "$mf" | awk -F"." '{print $NF}')"
+        mandir="$out/share/man/man$mantype"
+        install -Dm644 "$mf" "$mandir/$(basename "$mf")"
+      done
 
-  installPhase = ''
-    mkdir -p $out/lib/systemd/{system,user}
+    '' + lib.optionalString (stdenv.isLinux) ''
+      mkdir -p $out/lib/systemd/{system,user}
 
-    install -Dm755 syncthing $out/bin/syncthing
+      substitute etc/linux-systemd/system/syncthing-resume.service \
+                 $out/lib/systemd/system/syncthing-resume.service \
+                 --replace /usr/bin/pkill ${procps}/bin/pkill
 
-  '' + lib.optionalString (stdenv.isLinux) ''
-    substitute etc/linux-systemd/system/syncthing-resume.service \
-               $out/lib/systemd/system/syncthing-resume.service \
-               --replace /usr/bin/pkill ${procps}/bin/pkill
+      substitute etc/linux-systemd/system/syncthing@.service \
+                 $out/lib/systemd/system/syncthing@.service \
+                 --replace /usr/bin/syncthing $out/bin/syncthing
 
-    substitute etc/linux-systemd/system/syncthing@.service \
-               $out/lib/systemd/system/syncthing@.service \
-               --replace /usr/bin/syncthing $out/bin/syncthing
+      substitute etc/linux-systemd/user/syncthing.service \
+                 $out/lib/systemd/user/syncthing.service \
+                 --replace /usr/bin/syncthing $out/bin/syncthing
+    '';
+  };
+
+  syncthing-cli = common {
+    stname = "syncthing-cli";
+
+    patches = [ ./add-stcli-target.patch ];
+    target = "stcli";
+  };
+
+  syncthing-discovery = common {
+    stname = "syncthing-discovery";
+    target = "stdiscosrv";
+  };
 
-    substitute etc/linux-systemd/user/syncthing.service \
-               $out/lib/systemd/user/syncthing.service \
-               --replace /usr/bin/syncthing $out/bin/syncthing
-  '';
+  syncthing-relay = common {
+    stname = "syncthing-relay";
+    target = "strelaysrv";
 
-  preFixup = ''
-    find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
-  '';
+    postInstall = lib.optionalString (stdenv.isLinux) ''
+      mkdir -p $out/lib/systemd/system
 
-  meta = with stdenv.lib; {
-    homepage = https://www.syncthing.net/;
-    description = "Open Source Continuous File Synchronization";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ pshendry joko peterhoeg ];
-    platforms = platforms.unix;
+      substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+                 $out/lib/systemd/system/strelaysrv.service \
+                 --replace /usr/bin/strelaysrv $out/bin/strelaysrv
+    '';
   };
 }
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 9ed535cfe639..fb75a9dc6097 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -21,6 +21,7 @@ let
    "8.6.1"     = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
    "8.7.0"     = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
    "8.7.1"     = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
+   "8.7.2"     = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_strict;
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 79c3b74e496b..44328eeb6bbb 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, which }:
+
 stdenv.mkDerivation rec {
   name = "eprover-${version}";
   version = "2.0";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ which ];
 
   preConfigure = ''
-    sed -e 's/ *CC *= gcc$//' -i Makefile.vars
+    sed -e 's/ *CC *= *gcc$//' -i Makefile.vars
   '';
   configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man";
 
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index 9940e611124c..a527770adcd7 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -3,13 +3,13 @@
 # the modules identified by `rootModules', plus their dependencies.
 # Also generate an appropriate modules.dep.
 
-{ stdenvNoCC, kernel, nukeReferences, rootModules
+{ stdenvNoCC, kernel, firmware, nukeReferences, rootModules
 , kmod, allowMissing ? false }:
 
 stdenvNoCC.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
   buildInputs = [ nukeReferences kmod ];
-  inherit kernel rootModules allowMissing;
+  inherit kernel firmware rootModules allowMissing;
   allowedReferences = ["out"];
 }
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index 8a31c760da07..8287c1672d06 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -33,4 +33,13 @@ for module in $closure; do
     echo $target >> $out/insmod-list
 done
 
+mkdir -p $out/lib/firmware
+for module in $closure; do
+    for i in $(modinfo -F firmware $module); do
+        mkdir -p "$out/lib/firmware/$(dirname "$i")"
+        echo "firmware for $module: $i"
+        cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi
+    done
+done
+
 depmod -b $out -a $version
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index d599f9bbb65f..642365bdeb5c 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -26,6 +26,7 @@ rec {
 
   modulesClosure = makeModulesClosure {
     inherit kernel rootModules;
+    firmware = kernel;
   };
 
 
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 5922f3f30cf2..ae2d023a0399 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -74,7 +74,7 @@ fi
 if [ -z "$newHash" ]; then
     nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
     # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
-    newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | tr -d "'" | awk '{ print $(NF-4) }')
+    newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash \(.*\) when .* was expected|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'~\1\2~" | head -n1)
 fi
 
 if [ -z "$newHash" ]; then
diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix
new file mode 100644
index 000000000000..4bd77d894e4b
--- /dev/null
+++ b/pkgs/data/fonts/tex-gyre/default.nix
@@ -0,0 +1,90 @@
+{ stdenv, fetchzip }:
+
+let
+  mkVariant = variant: { displayName, version, abbreviation, sha256, outputHash }: stdenv.mkDerivation {
+    name = "tex-gyre-${variant}-${version}";
+    inherit version;
+
+    src = fetchzip {
+      url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/${variant}/${abbreviation}${version}otf.zip";
+      stripRoot = false;
+      inherit sha256;
+    };
+
+    installPhase = ''
+      mkdir -p $out/share/fonts/opentype/
+      cp -v *.otf $out/share/fonts/opentype/
+    '';
+
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = outputHash;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.gust.org.pl/projects/e-foundry/tex-gyre;
+      # "The TeX Gyre fonts are licensed under the GUST Font License (GFL),
+      # which is a free license, legally equivalent to the LaTeX Project Public
+      # License (LPPL), version 1.3c or later." - GUST website
+      license = licenses.lppl13c;
+      maintainers = with maintainers; [ jtojnar ];
+      platforms = platforms.all;
+    };
+  };
+in stdenv.lib.mapAttrs mkVariant {
+  adventor = {
+    displayName = "Adventor";
+    version = "2.003";
+    sha256 = "13wnb04z9f766ij30x8bpkn4xzv7n466g07dlbimx7qvglxl605g";
+    outputHash = "1cz0lkk2a5fg8r8175h454va499hzln3s99dadxhh147nx1914pm";
+    abbreviation = "qag";
+  };
+  bonum = {
+    displayName = "Bonum";
+    version = "2.004";
+    sha256 = "0qbrs98knx4h0b297c5n3vav4mkal1a95ai2dzmdc10pghfzl8vv";
+    outputHash = "0bid8gzwz50ylmm8jyqf9s4nfvy6cp1x34wbyrh4gyk1ki6hf3z1";
+    abbreviation = "qbk";
+  };
+  chorus = {
+    displayName = "Chorus";
+    version = "2.003";
+    sha256 = "1b0zak27fzmapwbf2jasvsd95vhnqyc92n985d1lc1ivwja1zgfa";
+    outputHash = "0fqifd45c1ys6y98b66lmldfbv7wjb2414fs9swicv4n7xvl3cp1";
+    abbreviation = "qzc";
+  };
+  cursor = {
+    displayName = "Cursor";
+    version = "2.004";
+    sha256 = "0ck3jm33bk2xsxp5d2irzd3j24zb49f0gnjvd1nikg1ivk8w85ng";
+    outputHash = "0i76835xqlkrnlx303mx63m0f4899j056c2ag2fl6p9qk8s4rskp";
+    abbreviation = "qcr";
+  };
+  heros = {
+    displayName = "Heros";
+    version = "2.004";
+    sha256 = "1fj2srxxf6ap913y5yd3dn4jzg828j7381gifs39nm5lnzmgw78y";
+    outputHash = "16y76ab46fxm9k8wfmwx4w0cl96yrmjywz587lyr08s0agp1v3kf";
+    abbreviation = "qhv";
+  };
+  pagella = {
+    displayName = "Pagella";
+    version ="2.004";
+    sha256 = "0b2pjhw1ihnl951slln6d6vafjd3i6p4i947lwybvg8081qfvd9z";
+    outputHash = "0c6s0r14qax3b4amvm9nffwzby8mm4p7r2hfb8yv9jzhjwa5z8rd";
+    abbreviation = "qpl";
+  };
+  schola = {
+    displayName = "Schola";
+    version = "2.005";
+    sha256 = "05z3gk4mm0sa7wwjcv31j2xlzqhwhcncpamn0kn9y0221cdknyp8";
+    outputHash = "1yqq1ngcylhldrh1v35l439k72szq9m4gx6g0wh235fk65chb2bm";
+    abbreviation = "qcs";
+  };
+  termes = {
+    displayName = "Termes";
+    version = "2.004";
+    sha256 = "1aq3yqbgkc3z20dkcqyhicsyq0afbgg4l397z96sd8a16jyz2x8k";
+    outputHash = "1igw821m601h8937pix6yish4d8fxmz3h4j9hripf41bxsiafzzg";
+    abbreviation = "qtm";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index dd607e01caef..e2ae74931030 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -1,21 +1,41 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_52, pango, readline, glib, libxml2, dbus }:
+{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobjectIntrospection
+, spidermonkey_52, pango, readline, glib, libxml2, dbus, gdk_pixbuf
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  nativeBuildInputs = [ pkgconfig ];
+  outputs = [ "out" "installedTests" ];
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
 
   propagatedBuildInputs = [ spidermonkey_52 ];
 
+  configureFlags = [
+    "--enable-installed-tests"
+  ];
+
+  postPatch = ''
+    for f in installed-tests/*.test.in; do
+      substituteInPlace "$f" --subst-var-by pkglibexecdir "$installedTests/libexec/gjs"
+    done
+  '';
+
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
+
+    moveToOutput "share/installed-tests" "$installedTests"
+    moveToOutput "libexec/gjs/installed-tests" "$installedTests"
+
+    wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
+      --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk_pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
   '';
 
   meta = with stdenv.lib; {
+    description = "JavaScript bindings for GNOME";
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;
+    license = licenses.lgpl2Plus;
   };
-
 }
diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix
index d3112f02f8ac..d42b2e845585 100644
--- a/pkgs/desktops/gnome-3/core/gjs/src.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gjs-1.50.2";
+  name = "gjs-1.50.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz;
-    sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3";
+    url = mirror://gnome/sources/gjs/1.50/gjs-1.50.4.tar.xz;
+    sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
new file mode 100644
index 000000000000..c576112d57b9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-extension-appindicator-${version}";
+  version = "22";
+
+  src = fetchFromGitHub {
+    owner = "Ubuntu";
+    repo = "gnome-shell-extension-appindicator";
+    rev = "v${version}";
+    sha256 = "1gqw54d55hxjj2hh04p0dx2j40bhi4ck9hgwlz8f7j4v7r37z0qw";
+  };
+
+  # This package has a Makefile, but it's used for building a zip for
+  # publication to extensions.gnome.org. Disable the build phase so
+  # installing doesn't build an unnecessary release.
+  dontBuild = true;
+
+  uuid = "appindicatorsupport@rgcjonas.gmail.com";
+  installPhase = ''
+    mkdir -p $out/share/gnome-shell/extensions/${uuid}
+    cp *.js $out/share/gnome-shell/extensions/${uuid}
+    cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid}
+    cp metadata.json $out/share/gnome-shell/extensions/${uuid}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "AppIndicator/KStatusNotifierItem support for GNOME Shell";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ jonafato ];
+    homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 6243d1b1d5f1..a912fb1c98b2 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -8,11 +8,11 @@ let
   majorVersion = "0.12";
 in
 stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.0";
+  name = "geary-${majorVersion}.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
-    sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff";
+    sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 07b205f6dfe8..51392e23d8cf 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    sed -i -e 's/8\.6\.1|8\.7\.0|8\.7\.1)/8.6.1|8.7.0|8.7.1|8.7.2)/' configure
+  '';
+
   configurePhase = ''
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
     ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index de3544a3a638..094cdb06b698 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -3,9 +3,9 @@
 , curl, tzdata, gdb, darwin
 , callPackage
 , bootstrapVersion ? false
-, version ? "2.078.1"
-, dmdSha256 ? "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2"
-, druntimeSha256 ? "16jv40m073cflpkyl0vmg1g58cianybfcsgcvwli7pfryxbgsbrr"
+, version ? "2.078.2"
+, dmdSha256 ? "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls"
+, druntimeSha256 ? "0nfqjcmwqc490bzi3582x1c3zigkf306g4nyd1cyd3vs8lfm6x66"
 , phobosSha256 ? "08ircpf4ilznz638kra272hz8fi5ccvw2cswj5hqckssl1lyqzs8"
 }:
 
@@ -111,7 +111,7 @@ let
     ''
 
     + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
-        # See https://github.com/NixOS/nixpkgs/issues/29443
+        # See https://github.com/dlang/phobos/pull/5960
         substituteInPlace phobos/std/path.d \
             --replace "\"/root" "\"${ROOT_HOME_DIR}"
     '';
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 01463f091c29..7466c85ca6ed 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }:
+{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs, makeStaticLibraries }:
 
 # TODO: distinct packages for gambit-release and gambit-devel
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
-  version = "4.8.8-427-g37b111a5";
+  version = "4.8.8-435-gd1991ba7";
   bootstrap = import ./bootstrap.nix ( pkgs );
 
   src = fetchgit {
     url = "https://github.com/feeley/gambit.git";
-    rev = "37b111a5ca3aeff9dc6cb8be470277a8c1e80f24";
-    sha256 = "14l7jql9nh7bjs6c822a17rcp9583l6bb5kiq95allgyf229vy50";
+    rev = "d1991ba7e90ed0149964320f7cafa1a8289e61f0";
+    sha256 = "02harwcsqxxcxgn2yc1y9kyxdp32mampyvnbxrzg2jzfmnp5g6cm";
   };
 
-  buildInputs = [ openssl git autoconf bootstrap ];
+  # Use makeStaticLibraries to enable creation of statically linked binaries
+  buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)];
 
   configurePhase = ''
     options=(
diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 9bd23aebfc43..f67582385e6f 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, fetchgit, gambit,
+{ stdenv, lib, fetchurl, fetchgit, makeStaticLibraries, gambit,
   coreutils, rsync, bash,
-  openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }:
+  openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql }:
 
 # TODO: distinct packages for gerbil-release and gerbil-devel
+# TODO: make static compilation work
 
 stdenv.mkDerivation rec {
   name    = "gerbil-${version}";
 
-  version = "0.12-DEV-1030-gbbed3bc";
+  version = "0.12-DEV-1404-g0a266db";
   src = fetchgit {
     url = "https://github.com/vyzo/gerbil.git";
-    rev = "bbed3bc4cf7bcaa64eaabdf097192bfcc2bfc928";
-    sha256 = "1dc0j143j860yq72lfjp71fin7hpsy1426azz7rl1szxvjfb7h4r";
+    rev = "0a266db5e2e241272711bc150cc2607204bf2b78";
+    sha256 = "1lvawqn8havfyxkkgfqffc213zq2pgm179l42yj49fy3fhpzia4m";
   };
 
-  buildInputs = [
-    gambit
-    coreutils rsync bash
-    openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb
-  ];
+  # Use makeStaticLibraries to enable creation of statically linked binaries
+  buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
+  buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
+
+  buildInputs = [ gambit coreutils rsync bash ]
+    ++ buildInputs_libraries ++ buildInputs_staticLibraries;
 
   NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
 
@@ -30,6 +32,18 @@ stdenv.mkDerivation rec {
     find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do
       substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
     done
+
+    cat > etc/gerbil_static_libraries.sh <<EOF
+#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING!
+#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING!
+ZLIB=${makeStaticLibraries zlib}/lib/libz.a
+# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
+# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
+# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
+MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
+# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
+LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
+EOF
   '';
 
   buildPhase = ''
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3b36c6d6318d..86daa60817dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -607,7 +607,7 @@ self: super: {
   };
 
   # Need newer versions of their dependencies than the ones we have in LTS-10.x.
-  cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_25_0; };
+  cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_27_0; };
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; });
 
   # https://github.com/bos/configurator/issues/22
@@ -1000,21 +1000,13 @@ self: super: {
     '';
   });
 
-  # Add a flag to enable building against GHC with D4388 applied (the
-  # deterministic profiling symbols patch). The flag is disabled by
-  # default, so we can apply this patch globally.
-  #
-  # https://github.com/ucsd-progsys/liquidhaskell/pull/1233
-  liquidhaskell =
-    let patch = pkgs.fetchpatch
-          { url = https://github.com/ucsd-progsys/liquidhaskell/commit/1aeef1871760b2be46cc1cabd51311997d1d0bc0.patch;
-            sha256 = "0i55n6p3x9as648as0lvxy2alqb1n7c10xv9gp15cvq7zx6c8ydg";
-          };
-    in appendPatch super.liquidhaskell patch;
-
   # https://github.com/nick8325/twee/pull/1
   twee-lib = dontHaddock super.twee-lib;
 
   # Needs older hlint
   hpio = dontCheck super.hpio;
+
+  # https://github.com/ucsd-progsys/liquidhaskell/issues/1238
+  liquidhaskell = dontHaddock super.liquidhaskell;
+
 }
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 488d3206c78c..b3990fab7615 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -106,13 +106,6 @@ self: super: {
 
   ## Needs bump to a versioned attribute
   ## 
-  ##     • No instance for (Semigroup Metadatas)
-  ##         arising from the superclasses of an instance declaration
-  ##     • In the instance declaration for ‘Monoid Metadatas’
-  JuicyPixels = super.JuicyPixels_3_2_9_4;
-
-  ## Needs bump to a versioned attribute
-  ## 
   ##     • Could not deduce (Semigroup (a :->: b))
   ##         arising from the superclasses of an instance declaration
   ##       from the context: (HasTrie a, Monoid b)
@@ -135,16 +128,7 @@ self: super: {
   ##     • Could not deduce (Semigroup (Traversal f))
   ##         arising from the superclasses of an instance declaration
   ##       from the context: Applicative f
-  tasty = super.tasty_1_0_0_1;
-
-  ## Needs bump to a versioned attribute
-  ## 
-  ## Setup: Encountered missing dependencies:
-  ## template-haskell >=2.4 && <2.13
-  ## builder for ‘/nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv’ failed with exit code 1
-  ## error: build of ‘/nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv’ failed
-  th-lift = super.th-lift_0_7_8;
-
+  tasty = super.tasty_1_0_1;
 
   ## On Hackage:
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 14a8a628b58c..71b2d1288a01 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -191,7 +191,7 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
 stdenv.mkDerivation ({
   name = "${pname}-${version}";
 
-  outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"));
+  outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc");
   setOutputFlags = false;
 
   pos = builtins.unsafeGetAttrPos "pname" args;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 773664efb428..8a9e0470b19f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7495,8 +7495,8 @@ self: {
      }:
      mkDerivation {
        pname = "HGamer3D";
-       version = "0.9.0";
-       sha256 = "09psrdhlrxhj8459xjr3j8fwv1mxjrlsn9nkfx0srz5sf0s4sj69";
+       version = "0.9.5";
+       sha256 = "094jq36n6j8k6gxyqm6gpkn1qxadj93m3bn3nrkg3n0nkqpcjcsb";
        libraryHaskellDepends = [
          base binary-serialise-cbor bytestring cereal clock containers
          directory filepath fresco-binding text vect
@@ -8951,6 +8951,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HaTeX_3_18_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hashable, matrix
+     , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
+     , wl-pprint-extras
+     }:
+     mkDerivation {
+       pname = "HaTeX";
+       version = "3.18.0.0";
+       sha256 = "13w1kn85yg8hmhk5m0rv95nr6db5k7z4ycy9s32gs2m3f0v338jz";
+       libraryHaskellDepends = [
+         base bytestring containers hashable matrix parsec QuickCheck text
+         transformers wl-pprint-extras
+       ];
+       testHaskellDepends = [
+         base parsec QuickCheck tasty tasty-quickcheck text
+       ];
+       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
+       description = "The Haskell LaTeX library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaTeX-meta" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
      , haddock, haskell-src-exts, mtl, parsec
@@ -11534,20 +11556,18 @@ self: {
      }) {};
 
   "Learning" = callPackage
-    ({ mkDerivation, base, hmatrix, vector }:
+    ({ mkDerivation, base, containers, hmatrix, vector }:
      mkDerivation {
        pname = "Learning";
-       version = "0.0.1";
-       sha256 = "10sdnhi3pr3x3fjj90nwz1lij64wjxss805xcskqqad2j4lygwxz";
-       revision = "1";
-       editedCabalFile = "1z5ka7gjkv0ir6f011rigzndsjrh05i9zryn4m7855dsk3bxysab";
+       version = "0.0.2";
+       sha256 = "0gp8c2xwpsnwbhvdwnpiv3pzmg2i12fv4h1x1fna9q4smgnpfjpb";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base hmatrix vector ];
-       executableHaskellDepends = [ base hmatrix vector ];
-       testHaskellDepends = [ base hmatrix vector ];
+       libraryHaskellDepends = [ base containers hmatrix vector ];
+       executableHaskellDepends = [ base containers hmatrix vector ];
+       testHaskellDepends = [ base containers hmatrix vector ];
        homepage = "https://github.com/masterdezign/Learning#readme";
-       description = "Most frequently used machine learning tools";
+       description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -16605,32 +16625,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ShellCheck_0_4_6" = callPackage
-    ({ mkDerivation, base, containers, directory, json, mtl, parsec
-     , process, QuickCheck, regex-tdfa
-     }:
-     mkDerivation {
-       pname = "ShellCheck";
-       version = "0.4.6";
-       sha256 = "1g5ihsma3zgb7q89n2j4772f504nnhfn065xdz6bqgrnjhkrpsqi";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory json mtl parsec process QuickCheck
-         regex-tdfa
-       ];
-       executableHaskellDepends = [
-         base containers directory json mtl parsec QuickCheck regex-tdfa
-       ];
-       testHaskellDepends = [
-         base containers directory json mtl parsec QuickCheck regex-tdfa
-       ];
-       homepage = "http://www.shellcheck.net/";
-       description = "Shell script analysis tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "ShellCheck" = callPackage
     ({ mkDerivation, base, containers, directory, json, mtl, parsec
      , process, QuickCheck, regex-tdfa
@@ -17722,6 +17716,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "TORCS" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, lens
+     , monad-loops, monad-parallel, MonadRandom, network, process
+     , random, random-shuffle, time, Yampa
+     }:
+     mkDerivation {
+       pname = "TORCS";
+       version = "0.1.0.2";
+       sha256 = "0lkp8qcglp2l6hq4py3i3kc1p1s6wvydrszh9dwfm6vk41cjwmnw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory lens monad-loops
+         monad-parallel MonadRandom network process random random-shuffle
+         time Yampa
+       ];
+       executableHaskellDepends = [ base bytestring Yampa ];
+       description = "Bindings to the TORCS vehicle simulator";
+       license = "GPL";
+     }) {};
+
   "TTTAS" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -21446,8 +21461,8 @@ self: {
        pname = "ad";
        version = "4.3.5";
        sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw";
-       revision = "1";
-       editedCabalFile = "10azjkyjx9gxz8pp6aapx2jkniyayns5qqdapb5vi7i7ykx6j92n";
+       revision = "2";
+       editedCabalFile = "0307kxvxzfsp9jlkhj4rcc6rncndq2ih87b8vn9h55fzii868j74";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
@@ -22170,11 +22185,12 @@ self: {
     ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
      mkDerivation {
        pname = "aeson-picker";
-       version = "0.1.0.1";
-       sha256 = "080grn544k035kbinrimar2d2vx6h59dqjhl7irll708dvpfphcv";
+       version = "0.1.0.2";
+       sha256 = "0m14ykp894s8nbg89v2f83yyb344ypxwchmyww0nq0mcpzk3v95b";
        libraryHaskellDepends = [ aeson base lens lens-aeson text ];
        testHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/ozzzzz/aeson-picker#readme";
+       description = "Tiny library to get fields from JSON format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -22853,6 +22869,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "airship_0_9_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-trie, case-insensitive, containers
+     , cryptohash, directory, either, filepath, http-date, http-media
+     , http-types, lifted-base, microlens, mime-types, mmorph
+     , monad-control, mtl, network, old-locale, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, transformers
+     , transformers-base, unix, unordered-containers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "airship";
+       version = "0.9.3";
+       sha256 = "0nildnm2f8n87sy6lrzkfxjypf72vy3d8yknl9qcnzv6kmyq6m72";
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring blaze-builder bytestring
+         bytestring-trie case-insensitive containers cryptohash directory
+         either filepath http-date http-media http-types lifted-base
+         microlens mime-types mmorph monad-control mtl network old-locale
+         random text time transformers transformers-base unix
+         unordered-containers wai wai-extra
+       ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-quickcheck text
+         transformers wai
+       ];
+       homepage = "https://github.com/helium/airship/";
+       description = "A Webmachine-inspired HTTP library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "airtable-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hashable, lens, text
      , time, unordered-containers, wreq
@@ -28135,8 +28182,8 @@ self: {
        pname = "arithmoi";
        version = "0.6.0.1";
        sha256 = "0dhr55r5vi10d9wqr054fy8rxp7h9z0kfpwvckaly0j90d6gvkqm";
-       revision = "2";
-       editedCabalFile = "1z16qjjz7qy0jribxzxn394f78b71lddv2sg199s2k8r8ndzkp0c";
+       revision = "3";
+       editedCabalFile = "1ah8b17pxa96gdap3sr7872km29lz95bqjwswqzfkirig2njlf9q";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers exact-pi ghc-prim integer-gmp
@@ -28215,6 +28262,8 @@ self: {
        pname = "array";
        version = "0.5.2.0";
        sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj";
+       revision = "1";
+       editedCabalFile = "195c914pc0vk1ya6lz42kb4gmhkam7s0xi7x0dgzhpb5gkcrs5qx";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -29591,15 +29640,15 @@ self: {
   "ats-pkg" = callPackage
     ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary
      , bytestring, bzlib, Cabal, cli-setup, composition-prelude
-     , containers, dependency, dhall, directory, file-embed, http-client
-     , http-client-tls, lens, lzma, optparse-applicative, parallel-io
-     , process, shake, shake-ats, shake-ext, tar, temporary, text, unix
-     , zip-archive, zlib
+     , containers, cpphs, dependency, dhall, directory, file-embed
+     , http-client, http-client-tls, lens, lzma, optparse-applicative
+     , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary
+     , text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.4.0.0";
-       sha256 = "1dhspgnyds4r08jqnabaal12xv6vvrk7mkgwhiwl4z0mb6zi0kry";
+       version = "2.4.1.0";
+       sha256 = "098bnm6s52jkyhxrf3bi04mws6rnzjc3j12g4dpirpgvkm3f1r1z";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -29610,6 +29659,7 @@ self: {
          optparse-applicative parallel-io process shake shake-ats shake-ext
          tar temporary text unix zip-archive zlib
        ];
+       libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/atspkg#readme";
        description = "A build tool for ATS";
@@ -31573,15 +31623,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_1_2_0" = callPackage
+  "backprop_0_1_3_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.2.0";
-       sha256 = "1f4q1mj0q9721i85fccl8wpi1mkcr8m1r8q67wsg2s7490zdnjvv";
+       version = "0.1.3.0";
+       sha256 = "0x1vp48dl0dlq1bwaq0fy9k472rpx571i7klrhnwnqf6nb52mh1w";
        libraryHaskellDepends = [
          base deepseq microlens primitive reflection transformers
          type-combinators vector
@@ -34145,6 +34195,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-tree" = callPackage
+    ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq
+     , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "binary-tree";
+       version = "0.1.0.0";
+       sha256 = "12bb144il2ra4l0zbd7ydvdjv9rpbldp2dn80mafx96782ybhikr";
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [
+         base ChasingBottoms checkers doctest HUnit QuickCheck
+         test-framework test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [ base criterion random ];
+       homepage = "https://github.com/oisdk/binary-tree#readme";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "binary-typed" = callPackage
     ({ mkDerivation, base, binary, bytestring, criterion, deepseq
      , murmur-hash, tasty, tasty-hunit, tasty-quickcheck
@@ -35751,8 +35820,8 @@ self: {
        pname = "bits";
        version = "0.5.1";
        sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5";
-       revision = "2";
-       editedCabalFile = "1c209vyxxafr1pf1zqcydy85w9v5gvfjy64i5i6v9asfld6jppig";
+       revision = "3";
+       editedCabalFile = "1xvrnswmny4j0p1h30hfgf5h4p128zn578bxzr83v6drmd74az9k";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
@@ -37734,8 +37803,8 @@ self: {
        pname = "bound";
        version = "2.0.1";
        sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9";
-       revision = "2";
-       editedCabalFile = "1ls2p35png3wjbldvgknkpsg1xsgxzgkb1mmvzjpbbgxhfhk8x68";
+       revision = "3";
+       editedCabalFile = "1ivq22ks8y4c086q6w74bh8jvgvliwzdayqw0h5zycx8wg7vcgiz";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -38273,6 +38342,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "brittany_0_9_0_1" = callPackage
+    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
+     , containers, czipwith, data-tree-print, deepseq, directory, extra
+     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
+     , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
+     , safe, semigroups, strict, syb, text, transformers, uniplate
+     , unsafe, yaml
+     }:
+     mkDerivation {
+       pname = "brittany";
+       version = "0.9.0.1";
+       sha256 = "1ndmnakzq6kiyxlxmgrjmzzpknrn4ib5ck5vxxr90qw8rw6yqi88";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra ghc ghc-boot-th
+         ghc-exactprint ghc-paths monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       executableHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       testHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation parsec pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       homepage = "https://github.com/lspitzner/brittany/";
+       description = "Haskell source code formatter";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "broadcast-chan" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -39138,8 +39248,8 @@ self: {
        pname = "bytes";
        version = "0.15.3";
        sha256 = "0kfdw1c13y3kxc1s9nzyavrv1ccipzrmqlwmigj3gnwjcjvddp6q";
-       revision = "2";
-       editedCabalFile = "07j20bmhysp4dawy8am1j4lhg21s5c2i8ckqby0iykmfgrlsrcv0";
+       revision = "3";
+       editedCabalFile = "13dwn6srx7zgiyayx5yxc14425asph9mylbi21yw30g04ahrbkxv";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytestring cereal containers hashable mtl scientific
@@ -39710,8 +39820,8 @@ self: {
      }:
      mkDerivation {
        pname = "c-mosquitto";
-       version = "0.1.3.0";
-       sha256 = "0l7vyiynn7wzsf4yvm2f6wn9qmhvi3aj46vwxvgwk33bskhwkr64";
+       version = "0.1.4.0";
+       sha256 = "12mx7ms24ri1aymapykzm4sfazdsziq3hrr3b61ay3h5j287jw16";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40015,8 +40125,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.36.1";
-       sha256 = "1nvf3virir795bq4a00b8mzhhsbkdfzasw31bwb4rh1s6gqm058r";
+       version = "4.36.2";
+       sha256 = "142y8ng64qcykyjp1yz989ksznhippgij3m5qy5rgh77kdncbpb1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40776,14 +40886,13 @@ self: {
      , containers, deepseq, directory, distribution-nixpkgs, filepath
      , hackage-db, hopenssl, hpack, language-nix, lens, monad-par
      , monad-par-extras, mtl, optparse-applicative, pretty, process
-     , split, text, time, transformers, utf8-string, yaml
+     , split, tasty, tasty-golden, text, time, transformers, utf8-string
+     , yaml
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.8.1";
-       sha256 = "1ahdqyiw76fixk90bi1b87ym5ii09fskpk0q9f9csbdmjif945x7";
-       revision = "1";
-       editedCabalFile = "0pq2cns1q7hbxd7gpyy643vaz8pcc7l96vlw23y30hpdgcnn23d3";
+       version = "2.8.2";
+       sha256 = "0m3k8prp13n6n74ghy2m05bj2c940nscjnv6h8g45ygxid8jvxc8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40797,6 +40906,9 @@ self: {
          distribution-nixpkgs filepath hopenssl language-nix lens monad-par
          monad-par-extras mtl optparse-applicative pretty utf8-string
        ];
+       testHaskellDepends = [
+         base Cabal filepath language-nix lens pretty tasty tasty-golden
+       ];
        homepage = "https://github.com/nixos/cabal2nix#readme";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
@@ -42582,8 +42694,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "catamorphism";
-       version = "0.5.1.0";
-       sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq";
+       version = "0.6.0.0";
+       sha256 = "0y1p6xayf4n6y41hmcrxg1zc0xm07vgirvipcm5zj7d5bphddn07";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
@@ -48180,6 +48292,8 @@ self: {
        pname = "comonad";
        version = "5.0.3";
        sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57";
+       revision = "1";
+       editedCabalFile = "1i72zgxjkbldkwz0g2awf44cm9466ahll89j5kl45vszx4iz0anl";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
@@ -48761,8 +48875,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.1.0.2";
-       sha256 = "1r6i0b9kphx8pmmlkna50gdsqwsmsc538nxhax3imxydi2lhxsdd";
+       version = "1.2.0.1";
+       sha256 = "1rb7hy5xfmpv8hr4ik49883ph027g9kskfc77yzwrx29q3jmq3gj";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
@@ -49974,6 +50088,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conduit-zstd" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , conduit-extra, directory, HUnit, test-framework
+     , test-framework-hunit, test-framework-th, zstd
+     }:
+     mkDerivation {
+       pname = "conduit-zstd";
+       version = "0.0.1.0";
+       sha256 = "0psy03s9w9gw5s4a2grvfk9xwjd3g63qch7w4i2kvl3cf9yddsa0";
+       libraryHaskellDepends = [ base bytestring conduit zstd ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators conduit-extra directory
+         HUnit test-framework test-framework-hunit test-framework-th zstd
+       ];
+       homepage = "https://github.com/luispedro/conduit-zstd#readme";
+       description = "Conduit-based ZStd Compression";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "conf" = callPackage
     ({ mkDerivation, base, haskell-src, HUnit, test-framework
      , test-framework-hunit, test-framework-th
@@ -59092,17 +59225,16 @@ self: {
      }) {};
 
   "dependency" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, composition-prelude
-     , containers, criterion, deepseq, hspec, microlens
-     , recursion-schemes
+    ({ mkDerivation, ansi-wl-pprint, base, binary, containers
+     , criterion, deepseq, hspec, microlens, recursion-schemes
      }:
      mkDerivation {
        pname = "dependency";
-       version = "0.1.0.5";
-       sha256 = "0b1v2vx4yyn90195f02i6dj4phzrb0a1wfb9mj1kq568pl02w3q3";
+       version = "0.1.0.7";
+       sha256 = "1jyx99iz522an33yq0knnplpinlzrs6609mv9brbbi2mmr28cjkm";
        libraryHaskellDepends = [
-         ansi-wl-pprint base binary composition-prelude containers deepseq
-         microlens recursion-schemes
+         ansi-wl-pprint base binary containers deepseq microlens
+         recursion-schemes
        ];
        testHaskellDepends = [ base containers hspec ];
        benchmarkHaskellDepends = [ base containers criterion ];
@@ -62555,8 +62687,8 @@ self: {
        pname = "distributive";
        version = "0.5.3";
        sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi";
-       revision = "3";
-       editedCabalFile = "17qqdl8p04vy314jp045100989lh84cbhqv6ghizm87xpk7ck4j3";
+       revision = "4";
+       editedCabalFile = "1v6b2vnharppjn6w36lxfy0dvl93jzjq7fcyq9cp71650f1g9ai5";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans tagged transformers transformers-compat
@@ -63328,6 +63460,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "doctest-driver-gen_0_2_0_0" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "doctest-driver-gen";
+       version = "0.2.0.0";
+       sha256 = "02irp8bwr8172m5ix6jgpbhz3nks5khq31v03b5xlrh58nk5hqaf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base doctest ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/Hexirp/doctest-driver-gen#readme";
+       description = "Generate driver file for doctest's cabal integration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-prop" = callPackage
     ({ mkDerivation, base, doctest, HUnit, QuickCheck }:
      mkDerivation {
@@ -65463,8 +65612,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, transformers }:
      mkDerivation {
        pname = "ecstasy";
-       version = "0.1.0.0";
-       sha256 = "0hid87vwyzxf1fsp0y8yw69wpsxzljyjr27bm1q7b79r9zsg63vj";
+       version = "0.1.0.1";
+       sha256 = "1xaril40m8yi4lg4489v1rqs3b6d6k23xhh27fv9ibkvy78qdkdc";
        libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "http://github.com/isovector/ecstasy/";
        description = "A GHC.Generics based entity component system.";
@@ -66499,16 +66648,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "eliminators_0_4" = callPackage
+  "eliminators_0_4_1" = callPackage
     ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
      , singletons, template-haskell, th-abstraction, th-desugar
      }:
      mkDerivation {
        pname = "eliminators";
-       version = "0.4";
-       sha256 = "1lsvz498db2vlaj4d9p4bi4pl4cnsl27gmmhw1ipfxw4kxmfdf4z";
-       revision = "1";
-       editedCabalFile = "188dnmw7gwfp4fxyljhb3gv78bj9gai4v2if8d9gcnss6ykp5mn1";
+       version = "0.4.1";
+       sha256 = "000x3gjwyf2s44ry16a2a9dk7cqjvl0dh21r5k85s19ljrxsxv1v";
        libraryHaskellDepends = [
          base extra singleton-nats singletons template-haskell
          th-abstraction th-desugar
@@ -66538,19 +66685,19 @@ self: {
      }) {};
 
   "elm-bridge" = callPackage
-    ({ mkDerivation, aeson, base, containers, hspec, hspec-discover
-     , QuickCheck, template-haskell, text
+    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
+     , template-haskell, text
      }:
      mkDerivation {
        pname = "elm-bridge";
-       version = "0.4.2";
-       sha256 = "1mcaic3xdll6bdv4yjp0j0861yapgfgb4wd0ckh7dpcmcnfnarhx";
+       version = "0.4.3";
+       sha256 = "154i3vwqw5qyam14x8dvpgffcgh2ljdl1hc9zw6xhiwb82vazy3z";
        libraryHaskellDepends = [ aeson base template-haskell ];
        testHaskellDepends = [
-         aeson base containers hspec hspec-discover QuickCheck text
+         aeson base containers hspec QuickCheck text
        ];
        homepage = "https://github.com/agrafix/elm-bridge";
-       description = "Derive Elm types and Json code from Haskell types";
+       description = "Derive Elm types and Json code from Haskell types, using aeson's options";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -69862,27 +70009,25 @@ self: {
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal
-     , constraints, deepseq, hashable, profunctors, QuickCheck
-     , singletons, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, aeson, base, binary, bytes, bytestring, cborg
+     , cereal, constraints, deepseq, hashable, profunctors, QuickCheck
+     , serialise, singletons, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "exinst";
-       version = "0.4";
-       sha256 = "0n7fk3gjwyvw8k9paznwfgc8bgg7aiz9brfzkcfl3q57hr84dwj9";
-       revision = "1";
-       editedCabalFile = "01rwd7q00c86l73pfkq7k1qvw3ijpiy66axckj9702s2xc962dji";
+       version = "0.5";
+       sha256 = "1r6hy9kkfn24zszb9jd4p6w3wa4nwd2ds8mvb3k9rl20gc3zzhhi";
        libraryHaskellDepends = [
-         aeson base binary bytes cereal constraints deepseq hashable
-         profunctors QuickCheck singletons
+         aeson base binary bytes cborg cereal constraints deepseq hashable
+         profunctors QuickCheck serialise singletons
        ];
        testHaskellDepends = [
-         aeson base binary bytes bytestring cereal constraints deepseq
-         hashable profunctors QuickCheck singletons tasty tasty-hunit
-         tasty-quickcheck
+         aeson base binary bytes bytestring cborg cereal constraints deepseq
+         hashable profunctors QuickCheck serialise singletons tasty
+         tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/k0001/exinst";
-       description = "Recover type indexes and instances for your existentialized types";
+       description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -70358,20 +70503,17 @@ self: {
      }) {};
 
   "extended-reals" = callPackage
-    ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th
+    ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th
      }:
      mkDerivation {
        pname = "extended-reals";
-       version = "0.2.2.0";
-       sha256 = "14wskq0m3sclb2c1m3aqsaj26rijbzyy021qkvxjdpzskz13higj";
-       revision = "3";
-       editedCabalFile = "14jmdqapr01l0gb0g10296shz01nfvv14l5bpbzsc8zwh5zb4cvx";
+       version = "0.2.3.0";
+       sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
-         base deepseq HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th
+         base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+         tasty-th
        ];
        homepage = "https://github.com/msakai/extended-reals/";
        description = "Extension of real numbers with positive/negative infinities";
@@ -71600,6 +71742,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fclabels_2_0_3_3" = callPackage
+    ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "fclabels";
+       version = "2.0.3.3";
+       sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
+       libraryHaskellDepends = [ base mtl template-haskell transformers ];
+       testHaskellDepends = [
+         base HUnit mtl template-haskell transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/sebastiaanvisser/fclabels";
+       description = "First class accessor labels implemented as lenses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fclabels-monadlib" = callPackage
     ({ mkDerivation, base, fclabels, monadLib }:
      mkDerivation {
@@ -71777,8 +71938,8 @@ self: {
        pname = "feed";
        version = "1.0.0.0";
        sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck";
-       revision = "1";
-       editedCabalFile = "19sckdba9c7pz7hhmjqv4hjm16bi5d1dsnknlh3y3f5n86ybj0pr";
+       revision = "2";
+       editedCabalFile = "1xrx0r63qr14vxqrsw9xmwnhna3p4gqngv46ysyv2r49raq6bz3q";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring old-locale old-time safe text time
@@ -74055,6 +74216,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_11" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.11";
+       sha256 = "11cgab1wyqdjzyx6ygh91yl03w70aivspmlavl4if6p9yr5z9rw7";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -89848,8 +90023,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.2.2";
        sha256 = "0h9wag599x9ysdrgwa643phmpb1xiiwhyh2dix67fji6a5w86yjh";
-       revision = "4";
-       editedCabalFile = "154xjzmzg14zcqxzhcf0kmdmm6hwnhx19x6kddakkrylfqap14j2";
+       revision = "5";
+       editedCabalFile = "0f1ml7dvwk4xrz3gsf133n67cbxzf0sz5frxfsx9i79x1yrg9zdj";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -98666,6 +98841,8 @@ self: {
        pname = "heaps";
        version = "0.3.6";
        sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q";
+       revision = "1";
+       editedCabalFile = "0k505k86zwfw1wmj5gr2qab7cq9q26f9nbf9jzfgw9qxwb17j284";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
@@ -105399,7 +105576,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_25_0" = callPackage
+  "hpack_0_27_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, interpolate
@@ -105408,10 +105585,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.25.0";
-       sha256 = "0nz8hrfw59pcd685qqkhikwwzrg5aaiynlxlsga8gqfzx0gsjwip";
-       revision = "1";
-       editedCabalFile = "0z4bnrikf4mnf9slij1f58y2lkayag5ni1s027rimayjgpdigds1";
+       version = "0.27.0";
+       sha256 = "1vrbf2b5bin9sdm80bj0jkcwc2d9zh29jh4qjhfvcpk4ggbl8iym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105480,8 +105655,8 @@ self: {
        pname = "hpack-dhall";
        version = "0.1.0";
        sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0";
-       revision = "2";
-       editedCabalFile = "15h2891c34qhxqj9rv90662fq8r7dsp4skmmxpk88gcqvs9fl084";
+       revision = "3";
+       editedCabalFile = "02pvzwqrs163mgxdydgv6pa1gq75xav68kpjycrxgdbpag6s9ynv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112390,12 +112565,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_0_0_0" = callPackage
+  "hunit-dejafu_1_0_1_0" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.0.0.0";
-       sha256 = "1xsfv8pdkmyplggzk0k17j1y10kbjrvb86izsnc9k2w0lmd1j6ji";
+       version = "1.0.1.0";
+       sha256 = "1vnxxyjycbz5xcfyyrl2hi2xkfqdqajlx1jbxvmq3d0w76p3zvdk";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -114415,6 +114590,8 @@ self: {
        pname = "hyphenation";
        version = "0.7.1";
        sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52";
+       revision = "1";
+       editedCabalFile = "04kn5pdb1f6yz959qjv3bcbqi3zs88fn6rwxv45m95lx6pzywhln";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -115701,8 +115878,8 @@ self: {
        pname = "imagesize-conduit";
        version = "1.1";
        sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i";
-       revision = "1";
-       editedCabalFile = "1gq749v6558zkvvn8iqkd4iqv4giiysxjqb2kncarnhghkkbgbaf";
+       revision = "3";
+       editedCabalFile = "0p4zmizr01pg3d7gb0q88j1alvvlzbdvzyf1wbgajng68a4g0li9";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions
        ];
@@ -117761,8 +117938,8 @@ self: {
        pname = "intervals";
        version = "0.8.1";
        sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww";
-       revision = "1";
-       editedCabalFile = "0im2m4acx6g638h7yz0x3qyaipfmri59q4zdq1w7n608r3i406dj";
+       revision = "2";
+       editedCabalFile = "0ia6pig8g2hg1nr0p46s3npv0gvd2cn9mkgm232slwynyb63qjkn";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [
@@ -124144,12 +124321,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "lackey_1_0_0" = callPackage
+  "lackey_1_0_1" = callPackage
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
-       version = "1.0.0";
-       sha256 = "0spgcfg2py1ff1zak211xsgmccpg56c9bbv14xsgjdig9k6cfyz0";
+       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";
@@ -127227,8 +127404,8 @@ self: {
        pname = "lens";
        version = "4.16";
        sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z";
-       revision = "1";
-       editedCabalFile = "0pgjpixph8idgf2wp8z25cbq6jf2bddigfs7r7nbln2a1v8yli1y";
+       revision = "2";
+       editedCabalFile = "1iwp8shnis8gk01ys9bp3bn5khsi6mp0ji9b18qkg1mpp7nvggcq";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -127298,8 +127475,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.2";
        sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
-       revision = "1";
-       editedCabalFile = "1xkxncl218ni4idq90g6bdd7vnwxshcpa1xk11fd3kc3i3j90pqs";
+       revision = "2";
+       editedCabalFile = "1nynlx0jyn5hfsjmzdd9pdj95hnfc6r7gfb3isdqs05ma8dihaws";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
@@ -127645,10 +127822,8 @@ self: {
      }:
      mkDerivation {
        pname = "lenz";
-       version = "0.2.2.1";
-       sha256 = "0w8imq8x5g71byjv8q00fp688mc02kf19n2i23b8474z6sk1mhg8";
-       revision = "2";
-       editedCabalFile = "1znj9hjyk8dqcmq2kjdvkpjrn2vqf388n7bmdhd61lkfhjqx6w3m";
+       version = "0.3.0.0";
+       sha256 = "17a3d91az0qv138q7x8wbka797z9pfxl3mbyydcr7i7p87dk48k3";
        libraryHaskellDepends = [
          base base-unicode-symbols hs-functors transformers
        ];
@@ -129191,8 +129366,8 @@ self: {
        pname = "linear";
        version = "1.20.7";
        sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b";
-       revision = "1";
-       editedCabalFile = "0ghmlkk5cy0pylx47rwr37p403ml7x6sg0sapz9c7534nzzhxq0g";
+       revision = "2";
+       editedCabalFile = "1w5194k2sqr508942xr9acfzk80avc4bwax347blw4js4vl5adwn";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base base-orphans binary bytes cereal containers
@@ -129217,6 +129392,8 @@ self: {
        pname = "linear-accelerate";
        version = "0.5.0.1";
        sha256 = "0khbh6z348pv2jwyfip50hvls7pqa91bwkzks4988vxh54mp2i1l";
+       revision = "1";
+       editedCabalFile = "1r0h6mk2ai11f9grcwfbq4a5j7s9zn32m4finrigar4q22xkxf2j";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          accelerate base distributive lens linear
@@ -129894,8 +130071,8 @@ self: {
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.7.0.6";
-       sha256 = "1sbvnj2as93dywh43zcsb23hr1mqlia5gr2sw08ynqh48dcx181p";
+       version = "0.7.0.7";
+       sha256 = "1b1pf6cgbgnd0lqn1r4lb8y6hm7qybyc45rr51kxnvqryvb9g9cz";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
@@ -129924,26 +130101,27 @@ self: {
     ({ mkDerivation, aeson, array, base, bifunctors, binary, bytestring
      , Cabal, cereal, cmdargs, containers, data-default, deepseq, Diff
      , directory, exceptions, filepath, fingertree, ghc, ghc-boot
-     , ghc-paths, ghc-prim, hashable, hpc, hscolour, liquid-fixpoint
-     , located-base, mtl, optparse-applicative, parsec, pretty, process
-     , QuickCheck, stm, syb, tagged, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-rerun, template-haskell, temporary, text, text-format
-     , th-lift, time, transformers, unordered-containers, vector, z3
+     , ghc-paths, ghc-prim, gitrev, hashable, hpc, hscolour
+     , liquid-fixpoint, located-base, mtl, optparse-applicative
+     , optparse-simple, parsec, pretty, process, QuickCheck, stm, syb
+     , tagged, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun
+     , template-haskell, temporary, text, text-format, th-lift, time
+     , transformers, unordered-containers, vector, z3
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.8.2.2";
-       sha256 = "0rq0fs5ydwiqi2f3pn9q4d1agbmz0z46ws2q5w8y7lrsb2mr4zf3";
+       version = "0.8.2.3";
+       sha256 = "1lqqna0ypl1r52miqr0bjhjmi38m4wip0v6y8qbi965jh2p5wzqy";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base bifunctors binary bytestring Cabal cereal cmdargs
          containers data-default deepseq Diff directory exceptions filepath
-         fingertree ghc ghc-boot ghc-paths ghc-prim hashable hpc hscolour
-         liquid-fixpoint located-base mtl parsec pretty process QuickCheck
-         syb template-haskell temporary text text-format th-lift time
-         transformers unordered-containers vector
+         fingertree ghc ghc-boot ghc-paths ghc-prim gitrev hashable hpc
+         hscolour liquid-fixpoint located-base mtl optparse-simple parsec
+         pretty process QuickCheck syb template-haskell temporary text
+         text-format th-lift time transformers unordered-containers vector
        ];
        executableHaskellDepends = [
          base cmdargs deepseq ghc ghc-boot hpc liquid-fixpoint located-base
@@ -130704,6 +130882,8 @@ self: {
        pname = "llvm-hs";
        version = "5.1.3";
        sha256 = "0swpc431w16g9yip5w67kd77ilc6yqqk526h7sl5n4sn7xlc9nnc";
+       revision = "1";
+       editedCabalFile = "0r8xgz6r2miw1l3az343jwz8f9jgzqywxnzl2xhanv05g3i462yh";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -131073,6 +131253,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "localization" = callPackage
+    ({ mkDerivation, base, containers, text, transformers }:
+     mkDerivation {
+       pname = "localization";
+       version = "1.0.0.20180213";
+       sha256 = "1dpmlmpmb4hbv9b5010l5fypjmas3hb4vfmcnfnrajm7wp7qzg2y";
+       libraryHaskellDepends = [ base containers text transformers ];
+       description = "Library for localization (l10n)";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "localize" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-default
      , directory, filepath, Glob, haskell-gettext, mtl, setlocale, text
@@ -131301,6 +131492,8 @@ self: {
        pname = "log-domain";
        version = "0.12";
        sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
+       revision = "1";
+       editedCabalFile = "0p2cmr9lpbakh4ml4mxgh4fhqmxdk78xpcnqblag1cllx9jrmk5b";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
@@ -132996,6 +133189,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lxd-client_0_1_0_6" = callPackage
+    ({ mkDerivation, aeson, async, base, bimap, bytestring, connection
+     , containers, data-default, directory, either, exceptions, filepath
+     , hspec, hspec-core, http-api-data, http-client, http-client-tls
+     , http-media, http-types, mtl, network, random, semigroups, servant
+     , servant-client, text, tls, transformers, turtle, unix, uuid
+     , websockets, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "lxd-client";
+       version = "0.1.0.6";
+       sha256 = "06w0m9h2xzkd6ynbb6kjvsaq8xj4zzfd64d31s83xb8al5pvnl4b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bimap bytestring connection containers
+         data-default directory either exceptions filepath http-api-data
+         http-client http-client-tls http-media http-types mtl network
+         semigroups servant servant-client text tls transformers unix
+         websockets x509 x509-store x509-validation
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base exceptions hspec hspec-core random text turtle uuid
+       ];
+       homepage = "https://github.com/hverr/haskell-lxd-client#readme";
+       description = "LXD client written in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lxd-client-config" = callPackage
     ({ mkDerivation, aeson, base, containers, directory, filepath
      , HUnit, QuickCheck, test-framework, test-framework-hunit
@@ -133315,8 +133539,8 @@ self: {
        pname = "machines";
        version = "0.6.3";
        sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz";
-       revision = "3";
-       editedCabalFile = "0cpy7gpli4xzlzmxfi2rpmlpb39x88zrsxrp6597lxb1cmvrixkh";
+       revision = "4";
+       editedCabalFile = "01j29cj62fvwj8fjpqqi2f8anrpqrfnfj5mb4zwpglawljw4kzdb";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          adjunctions base comonad containers distributive mtl pointed
@@ -134012,6 +134236,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "managed_1_0_6" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "managed";
+       version = "1.0.6";
+       sha256 = "1kbrw99yh5x5blykmx2n88mplbbi4ss1ij5j17b7asw6q0ihm9zi";
+       libraryHaskellDepends = [ base transformers ];
+       description = "A monad for managed values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "manatee" = callPackage
     ({ mkDerivation, base, binary, cairo, containers, dbus-client
      , dbus-core, derive, directory, filepath, gtk, gtk-serialized-event
@@ -144298,8 +144534,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "3";
-       editedCabalFile = "0z6vmdgz9r2fbgzh2xvrw6cy5h7m1jv911jah615s6xgr52smhrf";
+       revision = "4";
+       editedCabalFile = "1zppa1fcc7pl7ak0hs3w3pkx34398nrfiiwa3w689ib08kqkdpby";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -146581,8 +146817,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "1.1.0";
-       sha256 = "1d3xz1jsvnr0rg5y0rpkrlwzng589abq8w5ylg7d5pmr75ih2a0n";
+       version = "1.2.0";
+       sha256 = "0yfhipk0d7cap44ydva2aww72csz68j3rxn5kb664gc1wg5dp58a";
        libraryHaskellDepends = [
          async base binary bytestring deepseq monad-loops template-haskell
          unix
@@ -147123,8 +147359,8 @@ self: {
     ({ mkDerivation, array, base, containers, regex-compat }:
      mkDerivation {
        pname = "nofib-analyse";
-       version = "8.1.0.20160428";
-       sha256 = "18af70lpf60xhmfksmhyj22awcdmy44s1klm0kmwr9f5fxs88wi6";
+       version = "8.5.0.20180213";
+       sha256 = "04jdbbkjh0kmxn25hy7rqli8cmysvx8vbdqfnfxx35w93kpsndxf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
@@ -147344,6 +147580,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "non-empty-text" = callPackage
+    ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, text }:
+     mkDerivation {
+       pname = "non-empty-text";
+       version = "0.1.1";
+       sha256 = "1s2rzcaiilid2dv462hkr3mxg4gk1dqyyayvwhs5nl81y7a35krd";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base doctest Glob hspec QuickCheck text ];
+       homepage = "https://github.com/acatton/haskell-non-empty-text#readme";
+       description = "Non empty Data.Text type";
+       license = "unknown";
+     }) {};
+
   "non-empty-zipper" = callPackage
     ({ mkDerivation, base, checkers, QuickCheck }:
      mkDerivation {
@@ -148113,15 +148362,13 @@ self: {
      }) {};
 
   "numeric-quest" = callPackage
-    ({ mkDerivation, array, base }:
+    ({ mkDerivation, array, base, prelude-compat }:
      mkDerivation {
        pname = "numeric-quest";
-       version = "0.2.0.1";
-       sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga";
-       revision = "1";
-       editedCabalFile = "0bh9zzya42dbpc5c7j7fnyphm5nndib1ycbmanplgx0b707x1sda";
+       version = "0.2.0.2";
+       sha256 = "0agwfmbxyig502ac7xvf7208m0v7wdrcg7m30d1iw22c687ph5k9";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ array base ];
+       libraryHaskellDepends = [ array base prelude-compat ];
        homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest";
        description = "Math and quantum mechanics";
        license = "GPL";
@@ -148189,20 +148436,19 @@ self: {
      }) {};
 
   "numhask-array" = callPackage
-    ({ mkDerivation, accelerate, accelerate-llvm
-     , accelerate-llvm-native, adjunctions, base, deepseq, dimensions
+    ({ mkDerivation, adjunctions, base, deepseq, dimensions
      , distributive, doctest, ghc-typelits-natnormalise, numhask
      , protolude, QuickCheck, singletons, tasty, tasty-quickcheck
      , typelits-witnesses, vector
      }:
      mkDerivation {
        pname = "numhask-array";
-       version = "0.1.0.0";
-       sha256 = "0m8xgdizpw80dxhbdx45bhn8m71a4lk2zy6ckczrly02g272mqxv";
+       version = "0.1.1.0";
+       sha256 = "0qdlc8ipjb6p5hcp7kvjspa3yjjdsjah1k5c35w6njy0ld9rdi54";
        libraryHaskellDepends = [
-         accelerate accelerate-llvm accelerate-llvm-native adjunctions base
-         deepseq dimensions distributive ghc-typelits-natnormalise numhask
-         protolude QuickCheck singletons typelits-witnesses vector
+         adjunctions base deepseq dimensions distributive
+         ghc-typelits-natnormalise numhask protolude QuickCheck singletons
+         typelits-witnesses vector
        ];
        testHaskellDepends = [
          base doctest numhask QuickCheck tasty tasty-quickcheck
@@ -148755,11 +149001,11 @@ self: {
      }:
      mkDerivation {
        pname = "ocaml-export";
-       version = "0.6.0.0";
-       sha256 = "197d1sqnq7085jpynhbck0923hm1ci9sca59gklxbzk45siml58m";
+       version = "0.7.0.0";
+       sha256 = "10cvzzqnv7za9albnma112cx0pr4ranjqg3r38k5x6jmj4n5s4bp";
        libraryHaskellDepends = [
          aeson base bytestring containers directory file-embed filepath
-         formatting hspec-golden-aeson mtl QuickCheck
+         formatting hspec hspec-golden-aeson mtl QuickCheck
          quickcheck-arbitrary-adt servant servant-server split
          template-haskell text time typelits-witnesses wl-pprint-text
        ];
@@ -148916,15 +149162,21 @@ self: {
      }) {};
 
   "odpic-raw" = callPackage
-    ({ mkDerivation, base, c2hs, hspec, odpic, QuickCheck, text }:
+    ({ mkDerivation, base, c2hs, conduit, hspec, monad-control
+     , monad-logger, odpic, QuickCheck, resourcet, text, time
+     }:
      mkDerivation {
        pname = "odpic-raw";
-       version = "0.1.10";
-       sha256 = "0kbrlbnav9drmmm8h4228cgrml981cqmxf3dhkbiax3g0rh4gsv0";
-       libraryHaskellDepends = [ base text ];
+       version = "0.1.11";
+       sha256 = "0via5p0sfma91ny5rw87sirmp4189663ww25dfwi6jlha4d82hlh";
+       libraryHaskellDepends = [
+         base conduit monad-control resourcet text time
+       ];
        librarySystemDepends = [ odpic ];
        libraryToolDepends = [ c2hs ];
-       testHaskellDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [
+         base conduit hspec monad-logger QuickCheck resourcet
+       ];
        homepage = "https://github.com/leptonyu/odpic-raw#readme";
        description = "Oracle Database Bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -150602,6 +150854,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optional-args_1_0_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "optional-args";
+       version = "1.0.2";
+       sha256 = "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f";
+       libraryHaskellDepends = [ base ];
+       description = "Optional function arguments";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "options" = callPackage
     ({ mkDerivation, base, chell, chell-quickcheck, containers
      , monads-tf, transformers
@@ -152951,6 +153215,8 @@ self: {
        pname = "parallel";
        version = "3.2.1.1";
        sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj";
+       revision = "1";
+       editedCabalFile = "12sgigg7r4nmyhbfn1p09ajf4s576yca31b7daj5zpp1mxgb5x7i";
        libraryHaskellDepends = [ array base containers deepseq ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -153730,6 +153996,20 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "partial-semigroup_0_3_0_3" = callPackage
+    ({ mkDerivation, base, doctest, hedgehog }:
+     mkDerivation {
+       pname = "partial-semigroup";
+       version = "0.3.0.3";
+       sha256 = "1vsn82kpv2ny4yjj8gq8xaq8kvi55wzy8ix0k4lsppsda8j3s9rx";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest hedgehog ];
+       homepage = "https://github.com/chris-martin/partial-semigroup";
+       description = "A partial binary associative operator";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "partial-semigroup-hedgehog" = callPackage
     ({ mkDerivation, base, hedgehog, partial-semigroup }:
      mkDerivation {
@@ -155210,15 +155490,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "perf_0_3_1_0" = callPackage
+  "perf_0_3_1_1" = callPackage
     ({ mkDerivation, base, containers, doctest, foldl, formatting
      , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest
      , text, time, vector
      }:
      mkDerivation {
        pname = "perf";
-       version = "0.3.1.0";
-       sha256 = "1pr735gflp91ljfrlpba6il1l4zm260whdp4hc205jff0r0gv44c";
+       version = "0.3.1.1";
+       sha256 = "0zwv6d18sxjn7xz4z0mx43gj3bavm4vyw1sxys6zlxr6xfpka20q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155812,7 +156092,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-postgresql_2_8_1" = callPackage
+  "persistent-postgresql_2_8_1_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-logger, persistent, postgresql-libpq
      , postgresql-simple, resource-pool, resourcet, text, time
@@ -155820,8 +156100,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.8.1";
-       sha256 = "01mpmr51f0r4a00gbxyd0ih66czq1dlnr7h49x3wnlqdnwbsv334";
+       version = "2.8.1.1";
+       sha256 = "1ikjcd1i33nf044gcjfk2jxppjwl14vn7yd7jwjci5w0vjx6fwqi";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers monad-logger
          persistent postgresql-libpq postgresql-simple resource-pool
@@ -161301,8 +161581,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.58";
-       sha256 = "02nqrryi2mjp4zcail23rh0ysqnc8i97wzn77bq7ksimqwzynabq";
+       version = "0.0.59";
+       sha256 = "0i9blxkdjm4fm288qr6isl3jyjrw6x6x58z6lvaj62xr3y4rqd43";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161904,6 +162184,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pretty-show_1_7" = callPackage
+    ({ mkDerivation, array, base, filepath, ghc-prim, happy
+     , haskell-lexer, pretty, text
+     }:
+     mkDerivation {
+       pname = "pretty-show";
+       version = "1.7";
+       sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base filepath ghc-prim haskell-lexer pretty text
+       ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://wiki.github.com/yav/pretty-show";
+       description = "Tools for working with derived `Show` instances and generic inspection of values";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pretty-simple" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , criterion, doctest, Glob, mtl, parsec, text, transformers
@@ -168452,6 +168754,8 @@ self: {
        pname = "rcu";
        version = "0.2.2";
        sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk";
+       revision = "1";
+       editedCabalFile = "0kq7g4wplri8xnp6b1xvxd74vl60dhdkz0p3994swy7dbk8b7vic";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -169461,8 +169765,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "1.0.0.1";
-       sha256 = "1jd3dsns2ahsbkrzcp955bbq4xyhr0rmip3y6dvsgs4qjs0jlvbi";
+       version = "1.0.0.2";
+       sha256 = "1k7jjargdhc5q7ay2r07fwd9wgcs249p1r1rr48qlw6lsccrparw";
        libraryHaskellDepends = [
          base composition-prelude lens recursion-schemes
        ];
@@ -173222,8 +173526,8 @@ self: {
      }:
      mkDerivation {
        pname = "rfc";
-       version = "0.0.0.21";
-       sha256 = "1s3ni2gsvhxrxhmyahc22frrh4flzvwrnv33car14wv1jldbywfi";
+       version = "0.0.0.22";
+       sha256 = "0k3xicw8q135pnw5k4kgzyz44kvkp9c38gkvp0lfxfjdrrps0ymn";
        libraryHaskellDepends = [
          aeson aeson-diff base bifunctors binary blaze-html classy-prelude
          containers data-default freer-simple hedis http-api-data
@@ -173389,6 +173693,40 @@ self: {
        license = "unknown";
      }) {};
 
+  "riak_1_1_2_4" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary
+     , blaze-builder, bytestring, containers, criterion
+     , data-default-class, deepseq, enclosed-exceptions, exceptions
+     , hashable, HUnit, mersenne-random-pure64, monad-control, mtl
+     , network, process, protocol-buffers, pureMD5, QuickCheck, random
+     , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "riak";
+       version = "1.1.2.4";
+       sha256 = "1j67p29jnw6zy3294qwsc947akdk8xawa426fvnflbba5lmzxial";
+       libraryHaskellDepends = [
+         aeson async attoparsec base bifunctors binary blaze-builder
+         bytestring containers data-default-class deepseq
+         enclosed-exceptions exceptions hashable mersenne-random-pure64
+         monad-control network protocol-buffers pureMD5 random resource-pool
+         riak-protobuf semigroups stm text time transformers
+         transformers-base unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers data-default-class HUnit mtl
+         process QuickCheck riak-protobuf semigroups tasty tasty-hunit
+         tasty-quickcheck template-haskell text yaml
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
+       homepage = "http://github.com/riak-haskell-client/riak-haskell-client";
+       description = "A Haskell client for the Riak decentralized data store";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "riak-protobuf" = callPackage
     ({ mkDerivation, array, base, parsec, protocol-buffers
      , protocol-buffers-descriptor
@@ -174168,8 +174506,8 @@ self: {
      }:
      mkDerivation {
        pname = "rollbar";
-       version = "1.1.0";
-       sha256 = "0cad0920zs938la1p35a3pabi9il1yavnpswpvifb3qhhq8j81md";
+       version = "1.1.1";
+       sha256 = "0fwkmp55qddajbbc9dkd3y0z8x14ybvyad8pb5d7i0snxksksjrg";
        libraryHaskellDepends = [
          aeson base basic-prelude http-conduit lifted-base monad-control
          network resourcet text vector
@@ -175307,6 +175645,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "s-cargot-letbind" = callPackage
+    ({ mkDerivation, base, HUnit, parsec, s-cargot, text }:
+     mkDerivation {
+       pname = "s-cargot-letbind";
+       version = "0.1.0.0";
+       sha256 = "0mr55jh7jqmf8f15q4nnpk2bhynvc79ky844bh63dnirh15vmip7";
+       libraryHaskellDepends = [ base s-cargot text ];
+       testHaskellDepends = [ base HUnit parsec s-cargot text ];
+       homepage = "https://github.com/GaloisInc/s-cargot-letbind";
+       description = "Enables let-binding and let-expansion for s-cargot defined S-expressions";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "s-expression" = callPackage
     ({ mkDerivation, base, derive-monoid, lens, semigroups }:
      mkDerivation {
@@ -178530,6 +178881,8 @@ self: {
        pname = "semigroupoids";
        version = "5.2.2";
        sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4";
+       revision = "1";
+       editedCabalFile = "16pf83y17jbjbqv6rqlz4icdzsv6b10vjci6pf92y7cpizzjw0sy";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
@@ -179828,6 +180181,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-checked-exceptions_1_0_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
+     , hspec-wai, http-api-data, http-client, http-media, http-types
+     , natural-transformation, optparse-applicative, profunctors
+     , servant, servant-client, servant-docs, servant-server, tagged
+     , tasty, tasty-hspec, tasty-hunit, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-checked-exceptions";
+       version = "1.0.0.0";
+       sha256 = "1kdjhjgk9m6giygvpd2b79qs08phjy72q2bh07f7wxkiwjbkq1k6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq http-media http-types profunctors
+         servant servant-client servant-docs servant-server tagged text wai
+       ];
+       executableHaskellDepends = [
+         aeson base http-api-data http-client http-types
+         natural-transformation optparse-applicative servant servant-client
+         servant-docs servant-server text wai warp
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hspec-wai http-types servant
+         servant-server tasty tasty-hspec tasty-hunit wai
+       ];
+       homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
+       description = "Checked exceptions for Servant APIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-client" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, deepseq, exceptions, generics-sop
@@ -182309,7 +182694,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "shake_0_16_1" = callPackage
+  "shake_0_16_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, directory
      , extra, filepath, hashable, js-flot, js-jquery, primitive, process
      , QuickCheck, random, time, transformers, unix
@@ -182317,8 +182702,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.16.1";
-       sha256 = "14f9ai58i83wy5kr28gl1a3a1jbl89j6i25qi79nf3fbdca05s75";
+       version = "0.16.2";
+       sha256 = "07drp370pd794f0lbs2512dhkr3himndafyfngvxad6m4m6nri18";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -182349,8 +182734,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.4.0.0";
-       sha256 = "06x8aclhhsr6gg1qj9hbv8bk4f21i55akni7i3fl117qn2bq8wp6";
+       version = "1.4.1.2";
+       sha256 = "0bjgk2avcvqys8x4nxq5wsydar7wvxsqsiips2zbkydclahj9p30";
        libraryHaskellDepends = [
          base binary dependency directory hs2ats language-ats microlens
          shake shake-ext text
@@ -182379,16 +182764,15 @@ self: {
      }) {};
 
   "shake-ext" = callPackage
-    ({ mkDerivation, base, Cabal, composition-prelude, directory
-     , language-ats, mtl, shake, template-haskell, text
+    ({ mkDerivation, base, Cabal, directory, mtl, shake
+     , template-haskell, text
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.3.0.1";
-       sha256 = "0g8hadbq4db6kx611hlhcpnna9rwdwwsch83vl3vv1417f84gjl5";
+       version = "2.5.0.0";
+       sha256 = "0bsl49x7y1mif4h3yp4k8p5n39d410nm0awxdpiwvan9pnz692df";
        libraryHaskellDepends = [
-         base Cabal composition-prelude directory language-ats mtl shake
-         template-haskell text
+         base Cabal directory mtl shake template-haskell text
        ];
        homepage = "https://hub.darcs.net/vmchale/shake-ext";
        description = "Helper functions for linting with shake";
@@ -182527,8 +182911,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.40";
-       sha256 = "0jlihrgg0c2ksbj2dkzsp6c83m66dxdsy3993xpa018idjsm3cf9";
+       version = "0.0.41";
+       sha256 = "0djg61fv6g0xskk72a06kva70a6zvdwlsfhdnw6fsk69h0vlidrc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185397,7 +185781,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slack-web_0_2_0_2" = callPackage
+  "slack-web_0_2_0_3" = callPackage
     ({ mkDerivation, aeson, base, containers, errors, hspec
      , http-api-data, http-client, http-client-tls, megaparsec, mtl
      , servant, servant-client, servant-client-core, text, time
@@ -185405,8 +185789,8 @@ self: {
      }:
      mkDerivation {
        pname = "slack-web";
-       version = "0.2.0.2";
-       sha256 = "18hp8s5qcl2756p6sdx98d49p6bjk44616z9mcpd2ic9gcrs60q5";
+       version = "0.2.0.3";
+       sha256 = "1zxs697fmcgwrbrkzh7qgmrxcc6l75m1p300zinzqxvxv3zvk5l6";
        libraryHaskellDepends = [
          aeson base containers errors http-api-data http-client
          http-client-tls megaparsec mtl servant servant-client
@@ -190807,8 +191191,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage2nix";
-       version = "0.6.0";
-       sha256 = "0v39d39ijc15n6k96g9ii02xlgyw8dvlfghkavlqcsny3jqfa49d";
+       version = "0.6.1";
+       sha256 = "0wqa6lrn2l38grg4h24ihacchavsyglbvlmlsfh4s9h1300dngab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191768,6 +192152,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stm-conduit_4_0_0" = callPackage
+    ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
+     , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
+     , QuickCheck, resourcet, stm, stm-chans, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, transformers
+     , unliftio
+     }:
+     mkDerivation {
+       pname = "stm-conduit";
+       version = "4.0.0";
+       sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z";
+       libraryHaskellDepends = [
+         async base cereal cereal-conduit conduit conduit-extra directory
+         exceptions monad-loops resourcet stm stm-chans transformers
+         unliftio
+       ];
+       testHaskellDepends = [
+         base conduit directory doctest HUnit QuickCheck resourcet stm
+         stm-chans test-framework test-framework-hunit
+         test-framework-quickcheck2 transformers unliftio
+       ];
+       homepage = "https://github.com/cgaebel/stm-conduit";
+       description = "Introduces conduits to channels, and promotes using conduits concurrently";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stm-containers" = callPackage
     ({ mkDerivation, async, base, base-prelude, containers, criterion
      , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
@@ -193166,6 +193577,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "string-class_0_1_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, tagged, text }:
+     mkDerivation {
+       pname = "string-class";
+       version = "0.1.7.0";
+       sha256 = "1s0bj0wvwriw4516za6ar7w7zsz5mmnf1dba0ch239n27rb00nwf";
+       libraryHaskellDepends = [ base bytestring tagged text ];
+       homepage = "https://github.com/string-class/string-class";
+       description = "String class library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "string-combinators" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -194578,6 +195002,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "superevent" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, conduit
+     , containers, contravariant, hashable, hasql, hasql-migration
+     , hasql-pool, hasql-transaction, hspec, mtl, QuickCheck, random
+     , stm, string-qq, temporary, text, time, timespan, transformers
+     , unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "superevent";
+       version = "0.1.0.1";
+       sha256 = "0bda6fpljydp9i3sdyb8n0sy0dbfnryz83hpmnz59jarhhzw6nxd";
+       libraryHaskellDepends = [
+         aeson async base bytestring conduit containers contravariant
+         hashable hasql hasql-migration hasql-pool hasql-transaction mtl
+         random stm string-qq text time timespan transformers
+         unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson async base conduit hspec mtl QuickCheck stm temporary text
+         transformers uuid vector
+       ];
+       homepage = "https://github.com/agrafix/superevent#readme";
+       description = "A simple opinionated event store implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "supermonad" = callPackage
     ({ mkDerivation, base, containers, fgl, ghc, mtl, QuickCheck
      , transformers
@@ -195057,8 +195507,8 @@ self: {
      }:
      mkDerivation {
        pname = "sws";
-       version = "0.4.0.1";
-       sha256 = "072njwc5b5jmlh50520nd9ck60xhni6mk3x7c9m8c0bv3h67rnn8";
+       version = "0.4.1.0";
+       sha256 = "1xcbmwpwp2nvi7adihkddpgi9pkdc7q7ly08vm57r56lcpzvs70p";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -195221,8 +195671,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic";
-       version = "6.3.0.20170807";
-       sha256 = "1w2yyy35w9k3p53x9a51hn5cfja74i6g62jcw2l1bq5cgaakfjgn";
+       version = "6.3.1.20180213";
+       sha256 = "16bbby4lcyna842gvf95ss8fvsp5kgzpn996yxzv3jjhxg00ls5d";
        libraryHaskellDepends = [
          base containers mono-traversable symantic-document symantic-grammar
          text transformers
@@ -195236,8 +195686,8 @@ self: {
     ({ mkDerivation, ansi-terminal, base, text }:
      mkDerivation {
        pname = "symantic-document";
-       version = "0.0.0.20170623";
-       sha256 = "0va9q2lp6vp81sm0vfm10s7ybp34i89bk6p2ry2f0fcr0lhb09i0";
+       version = "0.0.0.20180213";
+       sha256 = "0f3rr8117cr78nkcw7kpddcpisbmvsyw03ym7cq6ms0z8zqynwpm";
        libraryHaskellDepends = [ ansi-terminal base text ];
        description = "Document symantics";
        license = stdenv.lib.licenses.gpl3;
@@ -195249,8 +195699,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic-grammar";
-       version = "0.2.0.20170709";
-       sha256 = "0vr0j7v2l9sfw8fcfdrhdcb9imgzklmm7p8n6jh9vlshl2d9piwy";
+       version = "0.3.0.20180213";
+       sha256 = "0kqy27c4ix16v7n7zqhc57alrg1n1xksdf7ijsbvpjs4597vpwih";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
          base megaparsec tasty tasty-hunit text transformers
@@ -195261,21 +195711,22 @@ self: {
      }) {};
 
   "symantic-lib" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, megaparsec
+    ({ mkDerivation, base, bytestring, containers, megaparsec
      , monad-classes, mono-traversable, symantic, symantic-grammar
-     , tasty, tasty-hunit, text, transformers
+     , tasty, tasty-golden, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "symantic-lib";
-       version = "0.0.2.20170703";
-       sha256 = "0ar1ikm42a0apy222y6ii7mjd7fr7n2kpyycyhfznc902jknxk2w";
+       version = "0.0.3.20180213";
+       sha256 = "17y4rmw9l4j3j9g2i60las3q6y7rlklzr48xr8arkhi0i5zi1qw2";
        libraryHaskellDepends = [
-         base containers ghc-prim monad-classes mono-traversable symantic
-         symantic-grammar text transformers
+         base containers mono-traversable symantic symantic-grammar text
+         transformers
        ];
        testHaskellDepends = [
-         base containers megaparsec monad-classes mono-traversable symantic
-         symantic-grammar tasty tasty-hunit text transformers
+         base bytestring containers megaparsec monad-classes
+         mono-traversable symantic symantic-grammar tasty tasty-golden
+         tasty-hunit text transformers
        ];
        description = "Symantics for common types";
        license = stdenv.lib.licenses.gpl3;
@@ -197484,18 +197935,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty_1_0_0_1" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers
-     , deepseq, mtl, optparse-applicative, stm, tagged, unbounded-delays
-     , unix
+  "tasty_1_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+     , optparse-applicative, stm, tagged, unbounded-delays, unix
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.0.0.1";
-       sha256 = "0ggqffw9kbb6nlq1pplk131qzxndqqzqyf4s2p7576nljx11a7qf";
+       version = "1.0.1";
+       sha256 = "1jf53dd7ilwqfj27ndx2dgs76a7s0saakqxm9cr6bb42a0jnzqij";
        libraryHaskellDepends = [
-         ansi-terminal async base clock containers deepseq mtl
-         optparse-applicative stm tagged unbounded-delays unix
+         ansi-terminal async base clock containers mtl optparse-applicative
+         stm tagged unbounded-delays unix
        ];
        homepage = "https://github.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
@@ -197555,12 +198005,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_0_0_1" = callPackage
+  "tasty-dejafu_1_0_1_0" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.0.0.1";
-       sha256 = "1b06x1z6bc010w4nfz7hf5qb35z6cwa8bz35qd4526qnxqf88qf5";
+       version = "1.0.1.0";
+       sha256 = "1japzchg9sxy08rjj9vvr3qxil1bzhn3i3qxr00pf0qpxnd5ssmc";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -197647,6 +198097,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-golden_2_3_1_3" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , directory, filepath, mtl, optparse-applicative, process, tagged
+     , tasty, tasty-hunit, temporary, temporary-rc
+     }:
+     mkDerivation {
+       pname = "tasty-golden";
+       version = "2.3.1.3";
+       sha256 = "1xri8bnj22gzxkxz4hi2vqx0aaz51ww3zz9ac0ig0lw653kbj61p";
+       libraryHaskellDepends = [
+         async base bytestring containers deepseq directory filepath mtl
+         optparse-applicative process tagged tasty temporary
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary-rc
+       ];
+       homepage = "https://github.com/feuerbach/tasty-golden";
+       description = "Golden tests support for tasty";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-groundhog-converters" = callPackage
     ({ mkDerivation, aeson, base, bimap, bytestring, containers
      , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th
@@ -197911,15 +198383,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-quickcheck_0_9_2" = callPackage
-    ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged
-     , tasty, tasty-hunit
+  "tasty-quickcheck_0_10" = callPackage
+    ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck
+     , random, tagged, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "tasty-quickcheck";
-       version = "0.9.2";
-       sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5";
-       libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
+       version = "0.10";
+       sha256 = "0vr6szbbz3s5461i0zr8zpq347zfvidfzv5gf3xwxhm0yk731z8h";
+       revision = "1";
+       editedCabalFile = "1ndkkywcqgb2wj339vgckjv5915da5kd4ixlkaww9fsba3qsrnwx";
+       libraryHaskellDepends = [
+         base optparse-applicative QuickCheck random tagged tasty
+       ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        homepage = "https://github.com/feuerbach/tasty";
        description = "QuickCheck support for the Tasty test framework";
@@ -201977,6 +202453,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threepenny-gui_0_8_2_1" = 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.1";
+       sha256 = "0ky9nsrihiqbg1sizz7yhrif672l1gr5p4nqn9lxcchlf4d2hyl2";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threepenny-gui-contextmenu" = callPackage
     ({ mkDerivation, base, threepenny-gui }:
      mkDerivation {
@@ -205273,19 +205775,20 @@ self: {
      }) {};
 
   "treemap" = callPackage
-    ({ mkDerivation, base, containers, deepseq, semigroups, strict
-     , tasty, tasty-hunit, text, transformers
+    ({ mkDerivation, base, containers, deepseq, mono-traversable
+     , semigroups, strict, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "treemap";
-       version = "2.0.0.20161218";
-       sha256 = "18xhsih3q9vmakzjk3mhb9ckp9m7vs16dikf9ry4yhfsyv2v57vh";
+       version = "2.4.0.20180213";
+       sha256 = "1yf0ihawdp51n6j1j5b4s7f1xxsyg0spaamhwpd8pmm0fncr8c2s";
        libraryHaskellDepends = [
-         base containers deepseq semigroups strict transformers
+         base containers deepseq mono-traversable semigroups strict
+         transformers
        ];
        testHaskellDepends = [
-         base containers semigroups strict tasty tasty-hunit text
-         transformers
+         base containers mono-traversable semigroups strict tasty
+         tasty-hunit text transformers
        ];
        description = "A tree of Data.Map.";
        license = stdenv.lib.licenses.gpl3;
@@ -205342,6 +205845,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "treeseq" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "treeseq";
+       version = "1.0.0.20180213";
+       sha256 = "105gj9s8gp4xc4i7ank8m6pjc80kywl7vn53qdxfrndaljv4kark";
+       libraryHaskellDepends = [ base containers ];
+       description = "Library for a multi-way tree (rose tree), using Seq (finger tree) for forests";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "treeviz" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, random }:
      mkDerivation {
@@ -205443,8 +205957,8 @@ self: {
        pname = "trifecta";
        version = "1.7.1.1";
        sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31";
-       revision = "2";
-       editedCabalFile = "1pbywxk2aw0bkhkhhcdqhxnkvyxxnrj13qahlzf2ivd5awmynmqp";
+       revision = "3";
+       editedCabalFile = "18n50vn8znpwci2f333wsqzr8zkj35ki5z8bs9a2717yhzyha4k8";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -206147,12 +206661,17 @@ self: {
      }) {};
 
   "turingMachine" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, hspec, hspecVariant, mtl
+     , QuickCheck, QuickCheckVariant
+     }:
      mkDerivation {
        pname = "turingMachine";
-       version = "0.1.3.0";
-       sha256 = "1z7sgvnfdj70lqd330pmv3ms8mxxd0xh8pp41hxggg95kxqmbci6";
-       libraryHaskellDepends = [ base containers ];
+       version = "1.0.0.0";
+       sha256 = "04lpvqandjqwwy494a5mb4nvig8lw3fn9ncrb8d2gkfklxga17gp";
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [
+         base containers hspec hspecVariant QuickCheck QuickCheckVariant
+       ];
        homepage = "https://github.com/sanjorgek/turingMachine";
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
@@ -206212,7 +206731,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "turtle_1_5_2" = callPackage
+  "turtle_1_5_3" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -206221,8 +206740,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.5.2";
-       sha256 = "1h44b1r7kcfbsziq0c2ldc35mgsyaxa4pkzqs529ibd5pridm8vd";
+       version = "1.5.3";
+       sha256 = "0pxhi3y051y8yll8bc4dv7sz2wbhf70lr8saxsassjw71hrhgs3s";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          exceptions foldl hostname managed optional-args
@@ -206323,8 +206842,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.33";
-       sha256 = "0r1aq1w3nis3rqd94yrg2idkqbcrzs0dsnvbrmrny65b7l50zzbk";
+       version = "1.0.1.35";
+       sha256 = "1rg7yn5072dr8kpd5m3c4p1brq9sbs2npvvyqkjpvfxsbyziblw7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208011,6 +208530,29 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tzdata_0_1_20180122_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
+     , test-framework, test-framework-hunit, test-framework-th, unix
+     , vector
+     }:
+     mkDerivation {
+       pname = "tzdata";
+       version = "0.1.20180122.0";
+       sha256 = "17fv2jvmbplyaxw4jpq78kqws4cmwc53mlnnjw70vmagx52xh6x3";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers deepseq vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       homepage = "https://github.com/nilcons/haskell-tzdata";
+       description = "Time zone database (as files and as a module)";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "u2f" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
      , base64-bytestring, binary, bytestring, cryptohash, cryptonite
@@ -215489,7 +216031,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_2_15" = callPackage
+  "warp_3_2_16" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -215499,8 +216041,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.15";
-       sha256 = "10l2qk4qn6vf898fp4ahdyhn49f8zjhlczxv0d93wkc695m59his";
+       version = "3.2.16";
+       sha256 = "111jwk9z3r4m14lmvlczpk8qhg31i2m01qy4lyawmsispy3fhr1i";
        libraryHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -215607,19 +216149,19 @@ self: {
      }) {};
 
   "warped" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, http-types
+    ({ mkDerivation, aeson, base, blaze-builder, conduit, http-types
      , lifted-async, monad-control, preamble, shakers, uuid, wai
      , wai-conduit, wai-cors, warp
      }:
      mkDerivation {
        pname = "warped";
-       version = "0.0.1";
-       sha256 = "1p90qkvryj5ah8knxrng4wfzzy73bailgj001g3s48qf7b6a46qm";
+       version = "0.0.3";
+       sha256 = "11iw5shjclns2d8baj98scm4jc773fxyzbjwbvvs6scan9d31z7m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-builder conduit http-types lifted-async monad-control
-         preamble uuid wai wai-conduit wai-cors warp
+         aeson base blaze-builder conduit http-types lifted-async
+         monad-control preamble uuid wai wai-conduit wai-cors warp
        ];
        executableHaskellDepends = [ base shakers ];
        homepage = "https://github.com/swift-nav/warped";
@@ -217726,8 +218268,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.41";
-       sha256 = "06w55qgsp2jvic8f70rr7dl4shqx64hiqr15vk104vvf7xiy2asr";
+       version = "0.3.42";
+       sha256 = "078pzdwhdxgqd5lszwszzcwxla17a51ikcvvas6791lvwx1ddg0d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -221489,8 +222031,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-combinators";
-       version = "1.1";
-       sha256 = "045zi5lipnjw161xz2awr5zwnzhiszsrrpwin64q4r5pxjkh7ala";
+       version = "1.1.1";
+       sha256 = "0zrvg0ccqn20gj8bbnc3xnlmbvf226qq7synx3q962cw95l53cyl";
        libraryHaskellDepends = [
          aeson base bytestring generics-sop scientific text transformers
          unordered-containers vector yaml
@@ -225777,7 +226319,7 @@ self: {
   "zip-archive_0_3_2_3" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
-     , process, temporary, text, time, unix, unzip, zip, zlib
+     , process, temporary, text, time, unix, unzip, zlib
      }:
      mkDerivation {
        pname = "zip-archive";
@@ -225796,12 +226338,11 @@ self: {
          base bytestring directory filepath HUnit old-time process temporary
          time unix
        ];
-       testToolDepends = [ unzip zip ];
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) unzip; inherit (pkgs) zip;};
+     }) {inherit (pkgs) unzip;};
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
@@ -225908,6 +226449,8 @@ self: {
        pname = "zippers";
        version = "0.2.5";
        sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id";
+       revision = "1";
+       editedCabalFile = "0nndhvgkv1v8zg906cblnxb5xiz0ghmvwdwnsn85pyp0rjplcv1k";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base lens profunctors semigroupoids semigroups
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix
index 6de3f8b16669..44efa97a5319 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/pkgs/development/idris-modules/build-builtin-package.nix
@@ -1,4 +1,4 @@
-# Build one of the packages that come with idris
+# Build one of the packages that comes with idris
 # name: The name of the package
 # deps: The dependencies of the package
 { idris, build-idris-package, lib }: name: deps:
@@ -6,20 +6,16 @@ let
   inherit (builtins.parseDrvName idris.name) version;
 in
 build-idris-package {
-  name = "${name}-${version}";
-
-  propagatedBuildInputs = deps;
 
+  inherit name version;
   inherit (idris) src;
 
+  idrisDeps = deps;
+
   postUnpack = ''
     sourceRoot=$sourceRoot/libs/${name}
   '';
 
-  postPatch = ''
-    sed -i ${name}.ipkg -e "/^opts/ s|-i \\.\\./|-i $IDRIS_LIBRARY_PATH/|g"
-  '';
-
   meta = idris.meta // {
     description = "${name} builtin Idris library";
   };
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 0048634f5b45..0416e76afa9e 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -1,23 +1,46 @@
 # Build an idris package
-#
-# args: Additional arguments to pass to mkDerivation. Generally should include at least
-#       name and src.
-{ stdenv, idris, gmp }: args: stdenv.mkDerivation ({
-  buildPhase = ''
-    idris --build *.ipkg
+{ stdenv, idrisPackages, gmp }:
+  { idrisDeps ? []
+  , name
+  , version
+  , src
+  , meta
+  , extraBuildInputs ? []
+  , postUnpack ? ""
+  , doCheck ? true
+  }:
+let
+  idris-with-packages = idrisPackages.with-packages idrisDeps;
+in
+stdenv.mkDerivation ({
+
+  name = "${name}-${version}";
+
+  inherit postUnpack src doCheck meta;
+
+
+  # Some packages use the style
+  # opts = -i ../../path/to/package
+  # rather than the declarative pkgs attribute so we have to rewrite the path.
+  postPatch = ''
+    sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
   '';
 
-  doCheck = true;
+  buildPhase = ''
+    ${idris-with-packages}/bin/idris --build *.ipkg
+  '';
 
   checkPhase = ''
     if grep -q test *.ipkg; then
-      idris --testpkg *.ipkg
+      ${idris-with-packages}/bin/idris --testpkg *.ipkg
     fi
   '';
 
   installPhase = ''
-    idris --install *.ipkg --ibcsubdir $IBCSUBDIR
+    ${idris-with-packages}/bin/idris --install *.ipkg --ibcsubdir $out/libs
   '';
 
-  buildInputs = [ gmp idris ];
-} // args)
+  buildInputs = [ gmp ] ++ extraBuildInputs;
+
+  propagatedBuildInputs = idrisDeps;
+})
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 16f6c65b094a..35ee20e96224 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -25,14 +25,8 @@
       pruviloj = [ self.prelude self.base ];
     };
 
-    files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let
-      m = builtins.match "(.*)\\.nix" name;
-    in if m == null then "default" else builtins.head m) (builtins.readDir ./.));
-  in (builtins.listToAttrs (map (name: {
-    inherit name;
-
-    value = callPackage (./. + "/${name}.nix") {};
-  }) files)) // {
+  in
+    {
     inherit idris-no-deps callPackage;
     # See #10450 about why we have to wrap the executable
     idris =
@@ -40,7 +34,28 @@
           idris-no-deps
           { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
 
+
+    with-packages = callPackage ./with-packages.nix {} ;
+
+    build-builtin-package = callPackage ./build-builtin-package.nix {};
+
+    build-idris-package = callPackage ./build-idris-package.nix {};
+
+    # Libraries
+
     # A list of all of the libraries that come with idris
     builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;
+
+    httpclient = callPackage ./httpclient.nix {};
+
+    lightyear = callPackage ./lightyear.nix {};
+
+    optparse = callPackage ./optparse.nix {};
+
+    wl-pprint = callPackage ./wl-pprint.nix {};
+
+    specdris = callPackage ./specdris.nix {};
+
+
   } // builtins_;
 in fix' (extends overrides idrisPackages)
diff --git a/pkgs/development/idris-modules/httpclient.nix b/pkgs/development/idris-modules/httpclient.nix
index ec41956b9634..13c33d04da51 100644
--- a/pkgs/development/idris-modules/httpclient.nix
+++ b/pkgs/development/idris-modules/httpclient.nix
@@ -1,17 +1,20 @@
-{ pkgs
+{ curl
 , build-idris-package
 , fetchFromGitHub
 , lightyear
 , contrib
+, effects
+, prelude
+, base
 , lib
 , idris
 }:
 
 let
-  date = "2016-12-20";
 in
 build-idris-package {
-  name = "httpclient-${date}";
+  name = "httpclient";
+  version = "2016-12-20";
 
   src = fetchFromGitHub {
     owner = "justjoheinz";
@@ -20,11 +23,14 @@ build-idris-package {
     sha256 = "0sy0q7gri9lwbqdmx9720pby3w1470w7wzn62bf2rir532219hhl";
   };
 
-  propagatedBuildInputs = [ pkgs.curl lightyear contrib ];
+  idrisDeps = [ prelude base effects lightyear contrib ];
+
+  extraBuildInputs = [ curl ];
 
   meta = {
     description = "HTTP Client for Idris";
     homepage = https://github.com/justjoheinz/idris-httpclient;
     inherit (idris.meta) platforms;
+    broken = true;
   };
 }
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix
index 155098a46252..fcd02c4da246 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -10,8 +10,5 @@ symlinkJoin {
     wrapProgram $out/bin/idris \
       --suffix PATH : ${ stdenv.lib.makeBinPath path } \
       --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib}
-
-    mkdir -p $out/nix-support
-    substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
       '';
   }
diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix
index 27828e6f41f6..e217e76e2a78 100644
--- a/pkgs/development/idris-modules/lightyear.nix
+++ b/pkgs/development/idris-modules/lightyear.nix
@@ -10,8 +10,11 @@
 let
   date = "2017-09-10";
 in
-build-idris-package {
-  name = "lightyear-${date}";
+build-idris-package  {
+  name = "lightyear";
+  version = date;
+
+  idrisDeps = [ prelude base effects ];
 
   src = fetchFromGitHub {
     owner = "ziman";
@@ -20,8 +23,6 @@ build-idris-package {
     sha256 = "05x66abhpbdm6yr0afbwfk6w04ysdk78gylj5alhgwhy4jqakv29";
   };
 
-  propagatedBuildInputs = [ prelude base effects ];
-
   meta = {
     description = "Parser combinators for Idris";
     homepage = https://github.com/ziman/lightyear;
diff --git a/pkgs/development/idris-modules/setup-hook.sh b/pkgs/development/idris-modules/setup-hook.sh
deleted file mode 100644
index 30a487ea80d4..000000000000
--- a/pkgs/development/idris-modules/setup-hook.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Library import path
-export IDRIS_LIBRARY_PATH=$PWD/idris-libs
-mkdir -p $IDRIS_LIBRARY_PATH
-
-# Library install path
-export IBCSUBDIR=$out/lib/@name@
-mkdir -p $IBCSUBDIR
-
-addIdrisLibs () {
-  if [ -d $1/lib/@name@ ]; then
-    ln -sv $1/lib/@name@/* $IDRIS_LIBRARY_PATH
-  fi
-}
-
-# All run-time deps
-addEnvHooks 1 addIdrisLibs
diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix
index e6ca49aa489a..e20af3752371 100644
--- a/pkgs/development/idris-modules/specdris.nix
+++ b/pkgs/development/idris-modules/specdris.nix
@@ -11,7 +11,8 @@ let
   date = "2017-11-11";
 in
 build-idris-package {
-  name = "specdris-${date}";
+  name = "specdris";
+  version = date;
 
   src = fetchgit {
     url = "https://github.com/pheymann/specdris";
@@ -19,21 +20,10 @@ build-idris-package {
     sha256 = "4813c4be1d4c3dd1dad35964b085f83cf9fb44b16824257c72b468d4bafd0e4f";
   };
 
-  propagatedBuildInputs = [ prelude base effects ];
+  idrisDeps = [ prelude base effects idris ];
 
-  buildPhase = ''
-    ${idris}/bin/idris --build specdris.ipkg
-  '';
-
-  checkPhase = ''
-      cd test/
-      ${idris}/bin/idris --testpkg test.ipkg
-      cd ../
-    '';
-
-  installPhase = ''
-    ${idris}/bin/idris --install specdris.ipkg --ibcsubdir $IBCSUBDIR
-  '';
+  # The tests attribute is very strange as the tests are a different ipkg
+  doCheck = false;
 
   meta = {
     description = "A testing library for Idris";
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index d4638670f699..1631555eee4a 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -1,46 +1,20 @@
 # Build a version of idris with a set of packages visible
 # packages: The packages visible to idris
-{ stdenv, idris }: packages: stdenv.mkDerivation {
-  inherit (idris) name;
+{ stdenv, idris, symlinkJoin, makeWrapper }: packages:
 
-  buildInputs = packages;
+let paths = stdenv.lib.closePropagation packages;
+in
+symlinkJoin {
 
-  preHook = ''
-    mkdir -p $out/lib/${idris.name}
+  name = idris.name + "-with-packages";
 
-    installIdrisLib () {
-      if [ -d $1/lib/${idris.name} ]; then
-        ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name}
-      fi
-    }
+  paths = paths ++ [idris] ;
 
-    envHostTargetHooks+=(installIdrisLib)
-  '';
+  buildInputs = [ makeWrapper ];
 
-  unpackPhase = ''
-    cat >idris.c <<EOF
-    #include <stdlib.h>
-    #include <unistd.h>
-    #include <stdio.h>
+  postBuild = ''
+    wrapProgram $out/bin/idris \
+      --set IDRIS_LIBRARY_PATH $out/libs
+      '';
 
-    int main (int argc, char ** argv) {
-      /* idris currently only supports a single library path, so respect it if the user set it */
-      setenv("IDRIS_LIBRARY_PATH", "$out/lib/${idris.name}", 0);
-      execv("${idris}/bin/idris", argv);
-      perror("executing ${idris}/bin/idris");
-      return 127;
-    }
-    EOF
-  '';
-
-  buildPhase = ''
-    $CC -O3 -o idris idris.c
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv idris $out/bin
-  '';
-
-  stripAllList = [ "bin" ];
 }
diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix
index 12e9b28d81c0..7e6d77a19a21 100644
--- a/pkgs/development/idris-modules/wl-pprint.nix
+++ b/pkgs/development/idris-modules/wl-pprint.nix
@@ -6,7 +6,8 @@
 , idris
 }:
 build-idris-package {
-  name = "wl-pprint-2016-09-28";
+  pkName = "wl-pprint";
+  version = "2016-09-28";
 
   src = fetchFromGitHub {
     owner = "shayan-najd";
@@ -19,7 +20,7 @@ build-idris-package {
   # updating this package again.
   doCheck = false;
 
-  propagatedBuildInputs = [ prelude base ];
+  idrisDeps = [ prelude base ];
 
   meta = {
     description = "Wadler-Leijen pretty-printing library";
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 5aaa18e5ac68..3b071d3afb3a 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, jdk, makeWrapper }:
+{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
 
-let version = "1.9.0.273"; in
+let version = "1.9.0.326"; in
 
 stdenv.mkDerivation {
   name = "clojure-${version}";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "0xmrq3xvr002jgq8m1j0y5ld0rcr49608g3gqxgyxzjqswacglb4";
+    sha256 = "0sf8gy39iz4jxj2wic1lbdwdwbj90k3awhr0kq76gr1z1dwbj6s9";
   };
 
-  buildInputs = [ jdk makeWrapper ];
+  buildInputs = [ makeWrapper ];
 
   installPhase = ''
     pwd
@@ -20,6 +20,9 @@ stdenv.mkDerivation {
     cp -f clojure-tools-${version}.jar $out/libexec
     sed -i -e "s@PREFIX@$out@g" clojure
     cp -f clj clojure $out/bin
+    for program in $out/bin/{clojure,clj}; do
+      wrapProgram $program --suffix PATH : $out/bin:${jdk.jre}/bin:${rlwrap}/bin
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index dc9e4e6ff18b..3c6f42e5cbf8 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
     sed -e '/^\/\//d' -i include/acl.h
   '';
 
-  configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk";
+  configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ZIP=gzip" "ECHO=echo" "SED=sed" "AWK=gawk" ];
 
-  installTargets = "install install-lib install-dev";
+  installTargets = [ "install" "install-lib" "install-dev" ];
 
-  meta = {
-    homepage = http://savannah.nongnu.org/projects/acl;
+  meta = with stdenv.lib; {
+    homepage = "http://savannah.nongnu.org/projects/acl";
     description = "Library and tools for manipulating access control lists";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index d177c3acfa71..dc5de2b382a1 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,30 +1,49 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib
-, gtk_doc, libarchive, gobjectIntrospection
-, sqlite, libsoup, gcab, attr, acl, docbook_xsl
+{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
+, gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant
+, sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42
 , libuuid, json_glib, meson, gperf, ninja
 }:
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.7.2";
+  name = "appstream-glib-0.7.6";
+
+  outputs = [ "out" "dev" "man" ];
+  outputBin = "dev";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "1jvwfida12d2snc8p9lpbpqzrixw2naaiwfmsrldwkrxsj3i19pl";
+    sha256 = "1nzm6w9n7fb2m06w88gwszaqf74bnip87ay0ca59wajq6y4mpfgv";
   };
 
-  nativeBuildInputs = [ meson pkgconfig ninja ];
-  buildInputs = [ glib gtk_doc gettext sqlite libsoup
-                  gcab attr acl docbook_xsl libuuid json_glib
-                  libarchive gobjectIntrospection gperf ];
+  nativeBuildInputs = [
+    meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42
+  ];
+  buildInputs = [
+    glib gettext sqlite libsoup
+    gcab attr acl libuuid json_glib
+    libarchive gobjectIntrospection gperf
+  ];
   propagatedBuildInputs = [ gtk3 ];
-  mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ];
+
+  patches = [
+    (substituteAll {
+      src = ./paths.patch;
+      pngquant= "${pngquant}/bin/pngquant";
+    })
+  ];
+
+  mesonFlags = [
+    "-Drpm=false"
+    "-Dstemmer=false"
+    "-Ddep11=false"
+  ];
 
   meta = with stdenv.lib; {
     description = "Objects and helper methods to read and write AppStream metadata";
-    homepage    = https://github.com/hughsie/appstream-glib;
-    license     = licenses.lgpl21Plus;
-    platforms   = platforms.linux;
+    homepage = https://people.freedesktop.org/~hughsient/appstream-glib/;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ lethalman matthewbauer ];
   };
 }
diff --git a/pkgs/development/libraries/appstream-glib/paths.patch b/pkgs/development/libraries/appstream-glib/paths.patch
new file mode 100644
index 000000000000..5c6396988a17
--- /dev/null
+++ b/pkgs/development/libraries/appstream-glib/paths.patch
@@ -0,0 +1,11 @@
+--- a/libappstream-builder/asb-utils.c
++++ b/libappstream-builder/asb-utils.c
+@@ -294,7 +294,7 @@
+ {
+ 	g_autofree gchar *standard_error = NULL;
+ 	gint exit_status = 0;
+-	const gchar *argv[] = { "/usr/bin/pngquant", "--skip-if-larger",
++	const gchar *argv[] = { "@pngquant@", "--skip-if-larger",
+ 				"--strip", "--ext", ".png",
+ 				"--force", "--speed", "1", filename, NULL };
+ 	if (!g_file_test (argv[0], G_FILE_TEST_IS_EXECUTABLE))
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 34bf9aca974b..0bfeaf81a81d 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -12,15 +12,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext ];
 
-  configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";
+  configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ECHO=echo" "SED=sed" "AWK=gawk" ];
 
-  installTargets = "install install-lib install-dev";
+  installTargets = [ "install" "install-lib" "install-dev" ];
 
   patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null;
 
-  meta = {
-    homepage = http://savannah.nongnu.org/projects/attr/;
+  meta = with stdenv.lib; {
+    homepage = "http://savannah.nongnu.org/projects/attr/";
     description = "Library and tools for manipulating extended attributes";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index 38a36fc4e546..0758d1252274 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }:
+{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }:
 
 stdenv.mkDerivation rec {
   name = "gcab-${version}";
-  version = "0.7";
+  version = "1.1";
+
+  LC_ALL = "en_US.UTF-8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz";
-    sha256 = "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1";
+    sha256 = "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobjectIntrospection ];
+
+  buildInputs = [ glib zlib ];
+
+  mesonFlags = [
+    "-Ddocs=false"
+    "-Dtests=false"
+  ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 119abbe9f530..d4901ba4233b 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.42/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.43/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index 05fde45f17d2..ae945ab73384 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -13,8 +13,4 @@ mkDerivation {
     qtx11extras
   ];
   propagatedBuildInputs = [ qtbase ];
-  postPatch = ''
-    sed -i src/runtime/org.kde.kglobalaccel.service.in \
-        -e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|"
-  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index a2a90e448d49..44005ec7d282 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -4,7 +4,7 @@
   kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
   knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui,
-  qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2
+  qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2, qtquickcontrols2
 }:
 
 mkDerivation {
@@ -15,6 +15,7 @@ mkDerivation {
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
     kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2
+    qtquickcontrols2
   ];
   propagatedBuildInputs = [ kpackage kservice qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index f8d4bcf5c8f9..af01f6faef64 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,611 +3,627 @@
 
 {
   attica = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/attica-5.42.0.tar.xz";
-      sha256 = "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd";
-      name = "attica-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/attica-5.43.0.tar.xz";
+      sha256 = "1vvf5d0dnfm69gahrhndy9jqxk7hkh5vj6z9pyprpl3zp5z1ki1a";
+      name = "attica-5.43.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/baloo-5.42.0.tar.xz";
-      sha256 = "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl";
-      name = "baloo-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/baloo-5.43.0.tar.xz";
+      sha256 = "095z6w5qyq4z2hkdxq0vizfgv1v6g9w960wrh78b6bi1bf4ig2np";
+      name = "baloo-5.43.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/bluez-qt-5.42.0.tar.xz";
-      sha256 = "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f";
-      name = "bluez-qt-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/bluez-qt-5.43.0.tar.xz";
+      sha256 = "04bsrp0biyn7b630hywk82rwn8kl8c2rwh8iwhjz35b51jjqm2b5";
+      name = "bluez-qt-5.43.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz";
-      sha256 = "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r";
-      name = "breeze-icons-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/breeze-icons-5.43.0.tar.xz";
+      sha256 = "19yy6pcqjfbjxlkkf4g1hcgl3lv4m640sl26nblrydn9qyj5iniy";
+      name = "breeze-icons-5.43.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz";
-      sha256 = "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3";
-      name = "extra-cmake-modules-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/extra-cmake-modules-5.43.0.tar.xz";
+      sha256 = "1zgzjh5q1ppgfzj4mhprgd4848iwjnzqsnilb0dk5rgdrvfsamsp";
+      name = "extra-cmake-modules-5.43.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/frameworkintegration-5.42.0.tar.xz";
-      sha256 = "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7";
-      name = "frameworkintegration-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/frameworkintegration-5.43.0.tar.xz";
+      sha256 = "0qjpk4lslpxqj5aisczm5kl201g4z3grgjhx38r1ih4hyp805vw0";
+      name = "frameworkintegration-5.43.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kactivities-5.42.0.tar.xz";
-      sha256 = "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r";
-      name = "kactivities-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kactivities-5.43.0.tar.xz";
+      sha256 = "0rmmyjfgz8ybvdgpbqndsn0gxizxpmwhvglnnl8ia1s4sna6sjby";
+      name = "kactivities-5.43.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kactivities-stats-5.42.0.tar.xz";
-      sha256 = "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8";
-      name = "kactivities-stats-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kactivities-stats-5.43.0.tar.xz";
+      sha256 = "1rrn1dxsiyvyf3pa5fyxa0sfbamv5c6g95s4f144xwrx2b130rh1";
+      name = "kactivities-stats-5.43.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kapidox-5.42.0.tar.xz";
-      sha256 = "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz";
-      name = "kapidox-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kapidox-5.43.0.tar.xz";
+      sha256 = "0c358ply0qzg269vxyg6py6l8z5j8l4h6apqcynyql4dbbbm8941";
+      name = "kapidox-5.43.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/karchive-5.42.0.tar.xz";
-      sha256 = "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi";
-      name = "karchive-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/karchive-5.43.0.tar.xz";
+      sha256 = "1f3pqhpdgn00ni05iflyydkmsf3vd403ma5f42zj00kh30l9lqqf";
+      name = "karchive-5.43.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kauth-5.42.0.tar.xz";
-      sha256 = "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi";
-      name = "kauth-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kauth-5.43.0.tar.xz";
+      sha256 = "05w8vx45mrf32kzcyjmay1k9dw3j8axbrrp6infg0hhfsgk04w1f";
+      name = "kauth-5.43.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kbookmarks-5.42.0.tar.xz";
-      sha256 = "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2";
-      name = "kbookmarks-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kbookmarks-5.43.0.tar.xz";
+      sha256 = "0i7rfahn32m6xpbwra5m5nnpgq8l56jm0ijsq6f80cx8ww3nkcq5";
+      name = "kbookmarks-5.43.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kcmutils-5.42.0.tar.xz";
-      sha256 = "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7";
-      name = "kcmutils-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kcmutils-5.43.0.tar.xz";
+      sha256 = "1dshx859k64yp00s5xx7z6x0wlawxyq41rg795nqizhk2s76agr2";
+      name = "kcmutils-5.43.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kcodecs-5.42.0.tar.xz";
-      sha256 = "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc";
-      name = "kcodecs-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kcodecs-5.43.0.tar.xz";
+      sha256 = "0ncrzxvy2l324yvlzha9hkyp5qq75wfb9cbnxb5mygispxhrgh2v";
+      name = "kcodecs-5.43.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kcompletion-5.42.0.tar.xz";
-      sha256 = "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f";
-      name = "kcompletion-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kcompletion-5.43.0.tar.xz";
+      sha256 = "065nzw26ps367lf3m1j6x95swk0f6grap71wjjv688gablcaz699";
+      name = "kcompletion-5.43.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kconfig-5.42.0.tar.xz";
-      sha256 = "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq";
-      name = "kconfig-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kconfig-5.43.0.tar.xz";
+      sha256 = "1na1b2dsajl9b9rn2990fd8cqqaj2iwddrxjacbf0ib5mray1sr2";
+      name = "kconfig-5.43.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kconfigwidgets-5.42.0.tar.xz";
-      sha256 = "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z";
-      name = "kconfigwidgets-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kconfigwidgets-5.43.0.tar.xz";
+      sha256 = "1qxv8m614y0j687gwcsqqkwcdwsbbwc7ivwx6l9djll4r7r1d43w";
+      name = "kconfigwidgets-5.43.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kcoreaddons-5.42.0.tar.xz";
-      sha256 = "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9";
-      name = "kcoreaddons-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kcoreaddons-5.43.0.tar.xz";
+      sha256 = "10pgja1v2x5q6jyajld3yq116g1m90djnbf6p35i6n9ng65h0zy6";
+      name = "kcoreaddons-5.43.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kcrash-5.42.0.tar.xz";
-      sha256 = "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins";
-      name = "kcrash-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kcrash-5.43.0.tar.xz";
+      sha256 = "1hvfhr3s0igc1n37w5fxx0jivsgvcdvpa5iywnkk4g1r1l6snx1b";
+      name = "kcrash-5.43.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kdbusaddons-5.42.0.tar.xz";
-      sha256 = "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd";
-      name = "kdbusaddons-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kdbusaddons-5.43.0.tar.xz";
+      sha256 = "1h4m6ra1cangvqyzmkxkh1fld4rlvxnzz8wny53drgbyrsq2xxv5";
+      name = "kdbusaddons-5.43.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kdeclarative-5.42.0.tar.xz";
-      sha256 = "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22";
-      name = "kdeclarative-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kdeclarative-5.43.0.tar.xz";
+      sha256 = "0jbm2ih9hzpnfaqc867fvwr414q78f9jjk6yyf1cjgq8vx8rmjq1";
+      name = "kdeclarative-5.43.0.tar.xz";
     };
   };
   kded = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kded-5.42.0.tar.xz";
-      sha256 = "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l";
-      name = "kded-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kded-5.43.0.tar.xz";
+      sha256 = "1kfli2f4hxc9a0hk75kgln3x374y4av6hfajhncwyq37zd4wxq3r";
+      name = "kded-5.43.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.0.tar.xz";
-      sha256 = "0aiig8akn6bdxrqdl96xjjy2pxw8hhfrsalbkkzyhh06j794snfb";
-      name = "kdelibs4support-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/portingAids/kdelibs4support-5.43.0.tar.xz";
+      sha256 = "1rwk436vpny3sq12bjqwapjicc3inyrq6dn34a6mr6gjcd5p2mch";
+      name = "kdelibs4support-5.43.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kdesignerplugin-5.42.0.tar.xz";
-      sha256 = "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6";
-      name = "kdesignerplugin-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kdesignerplugin-5.43.0.tar.xz";
+      sha256 = "0pk95vsgj67jw0qaalcrfvzkr9flxh6shkkmlaxclrz6yhnf9axz";
+      name = "kdesignerplugin-5.43.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kdesu-5.42.0.tar.xz";
-      sha256 = "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx";
-      name = "kdesu-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kdesu-5.43.0.tar.xz";
+      sha256 = "1mll18ms5zk7i4lpkj6qdcxwaf0h52h9mi47y882hzqkvvbnk4d6";
+      name = "kdesu-5.43.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kdewebkit-5.42.0.tar.xz";
-      sha256 = "1csd4p996im7ygxc5rfdkzgdpngjgzyqakj12rl9rnfbsd15i8kb";
-      name = "kdewebkit-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kdewebkit-5.43.0.tar.xz";
+      sha256 = "0yi7dv77flz7z1yjzlvrfvlybp7knz808hpfbr6hxgrp1gwi7h6b";
+      name = "kdewebkit-5.43.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kdnssd-5.42.0.tar.xz";
-      sha256 = "1k1rz62h3mafliik5n0k98dc56b5v2v6qyqj40696mcyc2d1yvll";
-      name = "kdnssd-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kdnssd-5.43.0.tar.xz";
+      sha256 = "0d58aaii1r2x3nmw9s2hnk178sr54yvrqi22ry3xm3v7yvx9jr3b";
+      name = "kdnssd-5.43.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kdoctools-5.42.0.tar.xz";
-      sha256 = "1bby3avdllch1mji0mxzcix8q5yir5a0i6wpjs5lwckv1glh6kmz";
-      name = "kdoctools-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kdoctools-5.43.0.tar.xz";
+      sha256 = "1llif166p17ffjwsgvb0n9lq8ip3if0hqma9zm9jpghm5j21q1jh";
+      name = "kdoctools-5.43.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kemoticons-5.42.0.tar.xz";
-      sha256 = "0f6an1bwxnga41a2b35b2pdcni4p0hh76k4jvanl3g046v07f2wr";
-      name = "kemoticons-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kemoticons-5.43.0.tar.xz";
+      sha256 = "161n9xg82gxvl4a4by328llxz0x4w643vcxi88414zg1bm1z1cfb";
+      name = "kemoticons-5.43.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kfilemetadata-5.42.0.tar.xz";
-      sha256 = "03wk38q3sq354ykz9dwbgykn73ldf94ryx6hxvpr66bq3a59jmwz";
-      name = "kfilemetadata-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kfilemetadata-5.43.0.tar.xz";
+      sha256 = "1lxbj8fnaf6sybxgyq6h1qnic65l0mdhhxlw1djd16c7ih7ghrnq";
+      name = "kfilemetadata-5.43.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kglobalaccel-5.42.0.tar.xz";
-      sha256 = "0nlza73i0qd79yhwhpnvgbh2xa9lvd1n2xg25p3bvfzwidcfdxg6";
-      name = "kglobalaccel-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kglobalaccel-5.43.0.tar.xz";
+      sha256 = "00ygkszkklaz7k4hkshcb5gfynha8rncwvj7z9jvhd9chmwkiffc";
+      name = "kglobalaccel-5.43.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kguiaddons-5.42.0.tar.xz";
-      sha256 = "193i8b4f13dkgp88m3pk9wzi0dhx7qmsnmpizxia3457gg016wn7";
-      name = "kguiaddons-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kguiaddons-5.43.0.tar.xz";
+      sha256 = "0z6sf4pr4ykhlzdckyfap2f41y2chrl2kwlrb4djflfxf7q2xcqr";
+      name = "kguiaddons-5.43.0.tar.xz";
+    };
+  };
+  kholidays = {
+    version = "5.43.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.43/kholidays-5.43.0.tar.xz";
+      sha256 = "0zkjh7y0gdwakil6dj0z8yi2zzczzvdfhmnsd54s5yn0fvv37xbk";
+      name = "kholidays-5.43.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/portingAids/khtml-5.42.0.tar.xz";
-      sha256 = "1bfslndxvad0zgzr22w2mz1xwavix9bh5qrrv8dpshlh043bwr3l";
-      name = "khtml-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/portingAids/khtml-5.43.0.tar.xz";
+      sha256 = "034aycdi7i6pvwkwz632nzk3vp8040hlvmzpp38nsy4idl4klh46";
+      name = "khtml-5.43.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/ki18n-5.42.0.tar.xz";
-      sha256 = "1rpriflb2a48j94zxgh63l6rzq4nlnlkvy89ns1vkdw42bnqrjx9";
-      name = "ki18n-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/ki18n-5.43.0.tar.xz";
+      sha256 = "1zspxv6z4a3rarrn9n38g7rp0gc48bl4kih91m3r2nkap83jb04a";
+      name = "ki18n-5.43.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kiconthemes-5.42.0.tar.xz";
-      sha256 = "1nbxxpf8bv835xl35b17rk8s3zs110bh31078kqqh7dhvwzlxic7";
-      name = "kiconthemes-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kiconthemes-5.43.0.tar.xz";
+      sha256 = "105c892d4np4lshmd5f5x74m1ib3fbmvwgjzf6j317mq261r3rsw";
+      name = "kiconthemes-5.43.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kidletime-5.42.0.tar.xz";
-      sha256 = "019r41r28pcrcn1kwxsll53za705jkc9n23b6sr2lplgjk05bcxh";
-      name = "kidletime-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kidletime-5.43.0.tar.xz";
+      sha256 = "1jm2rdbzffnw0fv1pzfyz5lvzaa3x2pfp12zm9kl7skyj39z5vbj";
+      name = "kidletime-5.43.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kimageformats-5.42.0.tar.xz";
-      sha256 = "1k67yrmszx7azjzrg478rimbz991lghx4d6dmg22p6dknajd78a6";
-      name = "kimageformats-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kimageformats-5.43.0.tar.xz";
+      sha256 = "1bn4rx5xx68m101n3ba774pd8qddaw3bwf2bc7zp7gi6d8bprh9i";
+      name = "kimageformats-5.43.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kinit-5.42.0.tar.xz";
-      sha256 = "05vpac41pw1n8y58l2z08vyknzv950x8dxxw66dnymm2v31w07ia";
-      name = "kinit-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kinit-5.43.0.tar.xz";
+      sha256 = "1jrzr4kv84rvf214wszd2zdnvlx2qxvr1ah9f564h23vvdrg79gd";
+      name = "kinit-5.43.0.tar.xz";
     };
   };
   kio = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kio-5.42.0.tar.xz";
-      sha256 = "1526a89x11ank55dp3rfp7xd04w8x7prjg3y6i7n2q9nabwhw7gc";
-      name = "kio-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kio-5.43.0.tar.xz";
+      sha256 = "1mbjld1kh5hhslfm4rx9nddghkcgrxbw2pf39c7niq0r1llx5v76";
+      name = "kio-5.43.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kirigami2-5.42.0.tar.xz";
-      sha256 = "11gqn7amp0r9bgh8ldgisfc2lrkzkn5mq2a1madf24nvjbkvqnqv";
-      name = "kirigami2-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kirigami2-5.43.0.tar.xz";
+      sha256 = "0vshabb1q5pjscw0g57l7lpaal69g1mdpf01w0yskmbiqnzzpjl0";
+      name = "kirigami2-5.43.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kitemmodels-5.42.0.tar.xz";
-      sha256 = "0mcdzdqwmvf9pwirsrnjbhrgqphnfmanbl9zij4qsmin8n866mhc";
-      name = "kitemmodels-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kitemmodels-5.43.0.tar.xz";
+      sha256 = "1yw7h7g0knlljizsf9cir196v22cqhlaazmrbm6jqz198g47sqdd";
+      name = "kitemmodels-5.43.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kitemviews-5.42.0.tar.xz";
-      sha256 = "1j1q0b08f8mnfc3r2a7rplyb2nv9f0aq5a3fxskinvg70c6y248w";
-      name = "kitemviews-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kitemviews-5.43.0.tar.xz";
+      sha256 = "19w6xhhxr7w40baw6i6lfq0fd7bahxfzr7pj10mrwb5i6bcbsk1h";
+      name = "kitemviews-5.43.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kjobwidgets-5.42.0.tar.xz";
-      sha256 = "1m3csdl7wh18ywv5p0qpbjpixvflgjcq3yvk3vlvh0sxxlwcz8k4";
-      name = "kjobwidgets-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kjobwidgets-5.43.0.tar.xz";
+      sha256 = "1kri6z737abwsglh29bh4kckbf1ici8n162lcyvw8b3w91l4dyc6";
+      name = "kjobwidgets-5.43.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/portingAids/kjs-5.42.0.tar.xz";
-      sha256 = "1m26sb2qyrcgmpkw76k2yv5my2pkhld96vw6aaqm77q90faw734g";
-      name = "kjs-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/portingAids/kjs-5.43.0.tar.xz";
+      sha256 = "1jdqdy1kxarv6k31yd0k280jyfy7y3qwgd9c7is7aya1ns46nx59";
+      name = "kjs-5.43.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/portingAids/kjsembed-5.42.0.tar.xz";
-      sha256 = "10w4w4ncwr245bv1ii4sh154w91ghfz0l60k89j50lsydpcqcp3a";
-      name = "kjsembed-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/portingAids/kjsembed-5.43.0.tar.xz";
+      sha256 = "11hcwwhkrl7sns4s36nxnp550n9xvky1rkrissm0mqh76309g6hy";
+      name = "kjsembed-5.43.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/portingAids/kmediaplayer-5.42.0.tar.xz";
-      sha256 = "1k1pjc0cz36gs0pl2pxw8f9f82xkbqyy320nfyhan5waxbl1qd5n";
-      name = "kmediaplayer-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/portingAids/kmediaplayer-5.43.0.tar.xz";
+      sha256 = "1q1s5v3fqnmxx58ixgdhkhrgkrdxy8mq8hg4ll7l6038lgycfsxf";
+      name = "kmediaplayer-5.43.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/knewstuff-5.42.0.tar.xz";
-      sha256 = "0i2gmyp67xzf2m5wnv7v574q3gsp1yxfflv1jgl0wy57vchwn9g6";
-      name = "knewstuff-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/knewstuff-5.43.0.tar.xz";
+      sha256 = "1v3wzydi1jqb9an2bnxzfhwxhlb2lj8l735mdhym4859njj8x7w7";
+      name = "knewstuff-5.43.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/knotifications-5.42.0.tar.xz";
-      sha256 = "0awmwypmd104vhaj2v9k83niflxj26d4mbl6mzfcj75lgka6kffc";
-      name = "knotifications-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/knotifications-5.43.0.tar.xz";
+      sha256 = "0kgn5h38z9xd5a210w989j3z0khs4l9ahf19lqfara1ziwl4gaiv";
+      name = "knotifications-5.43.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/knotifyconfig-5.42.0.tar.xz";
-      sha256 = "1h07bjj71611v6912m5ajli6qszh9w925zqbk3vih8rn6pd2s3mc";
-      name = "knotifyconfig-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/knotifyconfig-5.43.0.tar.xz";
+      sha256 = "0nrjxs263sp64h9pmrmr7fjkbpkalzr6crpyq0aqclciwfjpj326";
+      name = "knotifyconfig-5.43.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kpackage-5.42.0.tar.xz";
-      sha256 = "10amhh07x8d0jkyylb19cyzjs71k8dq1y8isfahqzb2kd43vijqa";
-      name = "kpackage-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kpackage-5.43.0.tar.xz";
+      sha256 = "1nr7zkqp7zbvyrhc7iqznyqnfhmnqhhaqs30ig4gwsagq3x2a02b";
+      name = "kpackage-5.43.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kparts-5.42.0.tar.xz";
-      sha256 = "1mb5gp2ckmmrb4ym7cqvyl81wnp7cryk85gmizl7cnn69svlf40h";
-      name = "kparts-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kparts-5.43.0.tar.xz";
+      sha256 = "09i2ds6xgkbm9k9nd9yj1p3qw9xl3a25lh97ln9c39ccx32i32wd";
+      name = "kparts-5.43.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kpeople-5.42.0.tar.xz";
-      sha256 = "050km3rpx58acx2341si46lxc2hywa59m8rwd849c2dnsxw3w1hm";
-      name = "kpeople-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kpeople-5.43.0.tar.xz";
+      sha256 = "0xi6sxprqvmjc30cw1rfpryahid9dswql6b1wrdv5wsmci8k4xmq";
+      name = "kpeople-5.43.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kplotting-5.42.0.tar.xz";
-      sha256 = "109b9grshrwralyp8ilkbf1k0akaggygqh6wafqdf0ris0ps13l9";
-      name = "kplotting-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kplotting-5.43.0.tar.xz";
+      sha256 = "0d5mf5xaysw837ninvdx1hfra8qjaxd9lcm28fyjfm506iq8v09f";
+      name = "kplotting-5.43.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kpty-5.42.0.tar.xz";
-      sha256 = "07s16zxs03ixy7yxy9fda83yqhcgqzx42gnvwjwkyc8q05njmma6";
-      name = "kpty-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kpty-5.43.0.tar.xz";
+      sha256 = "09m02ramzk6jc9scnsvcm2sgnia2vmnnfgmjsddspc2kp1aj2km8";
+      name = "kpty-5.43.0.tar.xz";
     };
   };
   kross = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/portingAids/kross-5.42.0.tar.xz";
-      sha256 = "1aqqwby6jslimpvx42d4n6gjsjc8l82gmsq5ajpv9zkkk91dqfqi";
-      name = "kross-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/portingAids/kross-5.43.0.tar.xz";
+      sha256 = "05px64msss6as0pbrpl6l4y2n97kayphxqhwfilgsj9yjmyhm46h";
+      name = "kross-5.43.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/krunner-5.42.0.tar.xz";
-      sha256 = "0xh9kss67l09am1ilsr9zyx1yhlmaq3g9x60hw0sx7h7wrl6zsw6";
-      name = "krunner-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/krunner-5.43.0.tar.xz";
+      sha256 = "1wiaaz7wc2ls0gxyyws7cw6gmphkzayhdz1xxsyn4bzrc1h3z7dw";
+      name = "krunner-5.43.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kservice-5.42.0.tar.xz";
-      sha256 = "0z8zfpd00ndvkm1klp8l4mrcksshhyg280zgmg3gffz5rgh3gwri";
-      name = "kservice-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kservice-5.43.0.tar.xz";
+      sha256 = "1mdxd8kxawlhrsnd9lrx6cx9p8gvvsr9mx2d1s0bi90kapfqyqi3";
+      name = "kservice-5.43.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/ktexteditor-5.42.0.tar.xz";
-      sha256 = "020y3j6vm15sfpiwainr3qsx9i93j15mrvq523wmbmdj1z36yrh2";
-      name = "ktexteditor-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/ktexteditor-5.43.0.tar.xz";
+      sha256 = "1rhw1y0js2vjjp7c9f539lvqvci4nrgdicaypw3p5ndg8vsw2xag";
+      name = "ktexteditor-5.43.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/ktextwidgets-5.42.0.tar.xz";
-      sha256 = "088azbv95ycwxmxxw4l63i2l14fmn8l473pb4djh2mvz1ypfqayk";
-      name = "ktextwidgets-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/ktextwidgets-5.43.0.tar.xz";
+      sha256 = "0h5bxf1a9mik2p2xhnm7nnr0r54s6zf4cby4qd8nlwl292dyf8gy";
+      name = "ktextwidgets-5.43.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kunitconversion-5.42.0.tar.xz";
-      sha256 = "0219pna4l3vvhyf5acsc87n48jzdnws6kwyhaiy3hy1pzrilv32l";
-      name = "kunitconversion-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kunitconversion-5.43.0.tar.xz";
+      sha256 = "14syfc9vybmaais740xmb79g7ffpyanwkb2blar88zm810dpshqd";
+      name = "kunitconversion-5.43.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kwallet-5.42.0.tar.xz";
-      sha256 = "1kv3v7593srfn0wd7qp4rhvb30rxp7d2qmlwi0n4nc9s6v59pabn";
-      name = "kwallet-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kwallet-5.43.0.tar.xz";
+      sha256 = "01mxl06nbpgkp6dva1kvqcbhjahgjqkbql6rhwgdyhb4asabnsmj";
+      name = "kwallet-5.43.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kwayland-5.42.0.tar.xz";
-      sha256 = "0wr6ygppahxsx3dh71h2wmybv7z7iyqdv7wn80cxb0mp4zpyinh7";
-      name = "kwayland-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kwayland-5.43.0.tar.xz";
+      sha256 = "0glp9bnv53jjycwni0ywd7apr0jps3j0hpzs14y2v9bp4mwjgaji";
+      name = "kwayland-5.43.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.42.1";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz";
-      sha256 = "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg";
-      name = "kwidgetsaddons-5.42.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kwidgetsaddons-5.43.0.tar.xz";
+      sha256 = "15x7k953jj6vqmb2bbw4wad2n10akkg4i5n0gmkj4fsaiag359sr";
+      name = "kwidgetsaddons-5.43.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kwindowsystem-5.42.0.tar.xz";
-      sha256 = "15k6x0f93qxka3mz7qfzak2ibdd88q77pz6akil8s3g41zsg2dqv";
-      name = "kwindowsystem-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kwindowsystem-5.43.0.tar.xz";
+      sha256 = "0zcrls3m9np2a9r5n7fry03ll6vrj36abjh2sajm531z657xmxjd";
+      name = "kwindowsystem-5.43.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kxmlgui-5.42.0.tar.xz";
-      sha256 = "0kfxjx8wrhkys5bydnv84nqxc2jqvv92zb2l6zpi0km5ggmia5y0";
-      name = "kxmlgui-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kxmlgui-5.43.0.tar.xz";
+      sha256 = "1jncpyfvanyl02zx8zi2mmwbx86yaq9k7k40vh716dswbh2idzd3";
+      name = "kxmlgui-5.43.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/kxmlrpcclient-5.42.0.tar.xz";
-      sha256 = "0ciip27ilsfk9s3gslpbi06v8i6ipdbmcig2jf43z3amsxpq0ncn";
-      name = "kxmlrpcclient-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/kxmlrpcclient-5.43.0.tar.xz";
+      sha256 = "0c99wq7kqaqvafppcai47q8w9n21ncfmrc562cvhyqnx9qr9n5vn";
+      name = "kxmlrpcclient-5.43.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/modemmanager-qt-5.42.0.tar.xz";
-      sha256 = "0q6qzn60z55h0gyc9xwdfaq45mjpk3zrr6d4qqjjfkqsr3866sfx";
-      name = "modemmanager-qt-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/modemmanager-qt-5.43.0.tar.xz";
+      sha256 = "16h8af046jlhn31dg1y3ajpniidkijf0wy0qa7z6bpqw01vj4l6w";
+      name = "modemmanager-qt-5.43.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/networkmanager-qt-5.42.0.tar.xz";
-      sha256 = "03hhvx8d52mfgbhd4gn0vhsk9k1fv1pvq24ixxdgs2mw44v884xq";
-      name = "networkmanager-qt-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/networkmanager-qt-5.43.0.tar.xz";
+      sha256 = "0pkm02bg201xcxyn2cbw1w3gag9ig4g5yz4wbd2db6qzvficmfqc";
+      name = "networkmanager-qt-5.43.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/oxygen-icons5-5.42.0.tar.xz";
-      sha256 = "0pnav9h0xmvbaamzpcyznjjv25slz8maszshx7sj7h07b5a23x46";
-      name = "oxygen-icons5-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/oxygen-icons5-5.43.0.tar.xz";
+      sha256 = "13c80jnc6h2z9bbwwzq1b8jsn80n4bs0zzr2xsbzsfbl5sw0hwpc";
+      name = "oxygen-icons5-5.43.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/plasma-framework-5.42.0.tar.xz";
-      sha256 = "079c8h0lmbkfr3srj5m8a40b50kyrxbgmy1n66329l8js9xrvaah";
-      name = "plasma-framework-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/plasma-framework-5.43.0.tar.xz";
+      sha256 = "1v7far0jz0b0rvx4jzqsq2pp1diny5c2qz67jyxnqlfgsba8y466";
+      name = "plasma-framework-5.43.0.tar.xz";
     };
   };
   prison = {
-    version = "5.42.0";
+    version = "5.43.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.43/prison-5.43.0.tar.xz";
+      sha256 = "018kj3xgl5wr3nhrasxmwvk6fh63fdwlz78z1rzyd78jx95wpaqc";
+      name = "prison-5.43.0.tar.xz";
+    };
+  };
+  purpose = {
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/prison-5.42.0.tar.xz";
-      sha256 = "0bhg2fjdwsv7mk16jh1nc3miwggz1dl9l99l2f20xvi75hn7rryg";
-      name = "prison-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/purpose-5.43.0.tar.xz";
+      sha256 = "1vk796f3w2arqaql16yy012211vxgz6awa8kg0p1zrxbid43x757";
+      name = "purpose-5.43.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/qqc2-desktop-style-5.42.0.tar.xz";
-      sha256 = "1arlfhcshfs11pgf87jzjgln1p711zlx0v0q014740mbzb9g5wnk";
-      name = "qqc2-desktop-style-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/qqc2-desktop-style-5.43.0.tar.xz";
+      sha256 = "0q6v1si1c8dlvq5f303dd4n1qqrn9kw0r51dl37px6rvy2n16d0w";
+      name = "qqc2-desktop-style-5.43.0.tar.xz";
     };
   };
   solid = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/solid-5.42.0.tar.xz";
-      sha256 = "10lr8paaq6vaiqn833kzcdc3kkyv8j9fdchy7h8pvi9ajjjwq0lq";
-      name = "solid-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/solid-5.43.0.tar.xz";
+      sha256 = "0q62z23dml6rndgmkg6r09gsi0in8c4gbgv66dw47v02spsnp7v9";
+      name = "solid-5.43.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/sonnet-5.42.0.tar.xz";
-      sha256 = "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw";
-      name = "sonnet-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/sonnet-5.43.0.tar.xz";
+      sha256 = "0i5vxaw124093fi7fi8gjyi08xgxpkpb68lrpsxqdikadvx6nwaa";
+      name = "sonnet-5.43.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/syntax-highlighting-5.42.0.tar.xz";
-      sha256 = "1iwiym50859jki4x41rfdmbd14jiq5lr2hdg46pjkyw17njdjd60";
-      name = "syntax-highlighting-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/syntax-highlighting-5.43.0.tar.xz";
+      sha256 = "0a1xrpk3wavcq6d3cld33l05g5xlhz635vwcc6i1092gsgdns7k1";
+      name = "syntax-highlighting-5.43.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.42.0";
+    version = "5.43.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.42/threadweaver-5.42.0.tar.xz";
-      sha256 = "1isqlpnfxzxyz7mdm7yfrafgnx09mcndicdgdw3mi4r4misbrrbn";
-      name = "threadweaver-5.42.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.43/threadweaver-5.43.0.tar.xz";
+      sha256 = "0mmnf6lirvqwlrijpn5vqd8l9pk74dpsbr81y6kyfmx31mj36jjx";
+      name = "threadweaver-5.43.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch
index a9ac414e93df..4bddec6b0ffd 100644
--- a/pkgs/development/libraries/libbsd/darwin.patch
+++ b/pkgs/development/libraries/libbsd/darwin.patch
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index c909878..60c540e 100644
+index 88ccd91..0857782 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -59,7 +59,7 @@ AS_CASE([$host_os],
@@ -31,7 +31,7 @@ index c909878..60c540e 100644
 +		os_is_macosx=false
 +		nonLinuxOS=false
 +		;;
-+esac
++esac		
 +AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
 +AM_COND_IF([IS_DARWIN],
 +	[AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
@@ -58,7 +58,7 @@ index 45b3b15..d0d4043 100644
  #include <sys/types.h>
  #include <stdint.h>
 diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
-index 4b69983..8e2ac75 100644
+index 4b69983..c75151b 100644
 --- a/include/bsd/stdio.h
 +++ b/include/bsd/stdio.h
 @@ -48,12 +48,16 @@
@@ -69,37 +69,60 @@ index 4b69983..8e2ac75 100644
  /* XXX: The function requires cooperation from the system libc to store the
   * line buffer in the FILE struct itself. */
  char *fgetln(FILE *fp, size_t *lenp)
- 	LIBBSD_DEPRECATED("This functions cannot be safely ported, "
- 	                  "use getline(3) instead, as it is supported "
- 	                  "by GNU and POSIX.1-2008.");
+-	LIBBSD_DEPRECATED("This functions cannot be safely ported, "
+-	                  "use getline(3) instead, as it is supported "
+-	                  "by GNU and POSIX.1-2008.");
++	__attribute__((deprecated("This functions cannot be safely ported, "
++	                          "use getline(3) instead, as it is supported "
++	                          "by GNU and POSIX.1-2008.")));
 +#else
 +char *fgetln(FILE *fp, size_t *lenp);
 +#endif
  
  /*
   * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
+diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
+index ebc9638..6cd7943 100644
+--- a/include/bsd/stdlib.h
++++ b/include/bsd/stdlib.h
+@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb,
+                const unsigned char *table, unsigned endbyte);
+ 
+ void *reallocf(void *ptr, size_t size);
+-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
++#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
++#if !__GLIBC_PREREQ(2, 26)
+ void *reallocarray(void *ptr, size_t nmemb, size_t size);
+ #endif
++#endif
+ 
+ long long strtonum(const char *nptr, long long minval, long long maxval,
+                    const char **errstr);
 diff --git a/include/bsd/string.h b/include/bsd/string.h
-index ee2f953..a3ab077 100644
+index 6798bf6..6baaa14 100644
 --- a/include/bsd/string.h
 +++ b/include/bsd/string.h
-@@ -37,11 +37,14 @@
+@@ -37,6 +37,12 @@
  #include <sys/types.h>
  
  __BEGIN_DECLS
--size_t strlcpy(char *dst, const char *src, size_t siz);
--size_t strlcat(char *dst, const char *src, size_t siz);
- char *strnstr(const char *str, const char *find, size_t str_len);
 +#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
 +size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
 +size_t bsd_strlcat(char *dst, const char *src, size_t siz);
++char *bsd_strnstr(const char *str, const char *find, size_t str_len);
 +void bsd_strmode(mode_t mode, char *str);
 +#else
- void strmode(mode_t mode, char *str);
--
-+#endif
+ size_t strlcpy(char *dst, const char *src, size_t siz);
+ size_t strlcat(char *dst, const char *src, size_t siz);
+ char *strnstr(const char *str, const char *find, size_t str_len);
+@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str);
+ #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
  void explicit_bzero(void *buf, size_t len);
+ #endif
++#endif
  __END_DECLS
  
+ #endif
 diff --git a/src/Makefile.am b/src/Makefile.am
 index ad83dbf..0f2a7ee 100644
 --- a/src/Makefile.am
@@ -519,18 +542,17 @@ index 462535a..e7eb46f 100644
 +}
  #endif
 diff --git a/src/funopen.c b/src/funopen.c
-index 1e05c7e..ed8ce85 100644
+index 1e05c7e..75e61ea 100644
 --- a/src/funopen.c
 +++ b/src/funopen.c
-@@ -137,7 +137,7 @@ funopen(const void *cookie,
- 
- 	return fopencookie(cookiewrap, mode, funcswrap);
- }
--#elif defined(__MUSL__)
-+#elif defined(__MUSL__) || defined(darwin) || defined(__APPLE__) || defined(MACOSX)
- /*
-  * This is unimplementable on musl based systems, and upstream has stated
+@@ -143,6 +143,7 @@ funopen(const void *cookie,
   * they will not add the needed support to implement it. Just ignore this
+  * interface there, as it has never been provided anyway.
+  */
++#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+ #else
+ #error "Function funopen() needs to be ported or disabled."
+ #endif
 diff --git a/src/getentropy.c b/src/getentropy.c
 index 3f11a1e..8a23a07 100644
 --- a/src/getentropy.c
@@ -563,13 +585,15 @@ index 4f368a1..ab22fc1 100644
  #define SHA512_DIGEST_LENGTH		64
  
 diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
-index b3c8d5e..4fade0f 100644
+index b3c8d5e..f69013d 100644
 --- a/src/hash/sha512c.c
 +++ b/src/hash/sha512c.c
-@@ -25,7 +25,11 @@
+@@ -25,7 +25,13 @@
   */
  
  #include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
++
 +#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
 +#include <machine/endian.h>
 +#else
@@ -579,24 +603,25 @@ index b3c8d5e..4fade0f 100644
  
  #include <string.h>
 diff --git a/src/nlist.c b/src/nlist.c
-index 0932f59..a3ba2be 100644
+index 0932f59..598a329 100644
 --- a/src/nlist.c
 +++ b/src/nlist.c
-@@ -27,6 +27,8 @@
+@@ -27,6 +27,10 @@
   * SUCH DAMAGE.
   */
  
 +#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
-+
++#if defined(LIBC_SCCS) && !defined(lint)
++static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
++#endif /* LIBC_SCCS and not lint */
  #include <sys/cdefs.h>
  
  #include <sys/param.h>
-@@ -265,3 +267,5 @@ nlist(const char *name, struct nlist *list)
+@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list)
  	(void)close(fd);
  	return (n);
  }
-+
-+#endif
++#endif /* _NLIST_DO_ELF */
 diff --git a/src/setproctitle.c b/src/setproctitle.c
 index 038ac7d..d0ef01b 100644
 --- a/src/setproctitle.c
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 3f764b1d8453..9aca076c5dcb 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
-  configureFlags = with stdenv; []
+  configureFlags = with stdenv; [ "--disable-mca-dso" ]
     ++ lib.optional isLinux  "--with-libnl=${libnl.dev}"
     ++ lib.optional enableSGE "--with-sge"
     ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default"
diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix
index dd6037e68329..270c24dc01f4 100644
--- a/pkgs/development/libraries/psol/default.nix
+++ b/pkgs/development/libraries/psol/default.nix
@@ -1,5 +1,5 @@
 { callPackage }:
 callPackage ./generic.nix {} {
-  version = "1.13.35.1"; # Latest beta, 2017-11-08
-  sha256  = "126823gpr3rdqakwixmr887rbvwhksr3xg14jnyzlp84q4hg1p0n";
+  version = "1.13.35.2"; # Latest stable, 2018-02-05
+  sha256  = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr";
 }
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
new file mode 100644
index 000000000000..b055acba9f15
--- /dev/null
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -0,0 +1,140 @@
+{ stdenv, lib, config, fetchFromGitHub
+, cmake
+, glog, google-gflags, gtest
+, protobuf, snappy
+, python, future, six, python-protobuf, numpy, pydot
+, eigen3
+, doxygen
+, useCuda ? (config.cudaSupport or false), cudatoolkit ? null
+, useCudnn ? (config.cudnnSupport or false), cudnn ? null
+, useOpenmp ? false, openmp ? null
+, useOpencv3 ? true, opencv3 ? null
+, useLeveldb ? false, leveldb ? null
+, useLmdb ? true, lmdb ? null
+, useRocksdb ? false, rocksdb ? null
+, useZeromq ? false, zeromq ? null
+, useMpi ? false, mpi ? null
+# TODO: distributed computations
+#, useGloo ? false
+#, useNccl ? false
+#, useNnpack ? false
+}:
+
+assert useCuda -> cudatoolkit != null;
+assert useCudnn -> (useCuda && cudnn != null);
+assert useOpencv3 -> opencv3 != null;
+assert useLeveldb -> leveldb != null;
+assert useLmdb -> lmdb != null;
+assert useRocksdb -> rocksdb != null;
+assert useZeromq -> zeromq != null;
+assert useMpi -> mpi != null;
+
+let
+  # Third party modules that caffe2 holds as git submodules.
+  # Download them and create symlinks from caffe2/third_party.
+  installExtraSrc = extra: ''
+    rmdir "third_party/${extra.dst}"
+    ln -s "${extra.src}" "third_party/${extra.dst}"
+  '';
+
+  cub = {
+    src = fetchFromGitHub rec {
+      owner  = "NVlabs";
+      repo   = "cub";
+      rev    = "v1.7.4";
+      sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66";
+    };
+    dst = "cub";
+  };
+
+  pybind11 = {
+    src = fetchFromGitHub {
+      owner  = "pybind";
+      repo   = "pybind11";
+      rev    = "86e2ad4f77442c3350f9a2476650da6bee253c52";
+      sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz";
+    };
+    dst = "pybind11";
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "caffe2-${version}";
+  version = "0.8.1";
+  src = fetchFromGitHub {
+    owner = "caffe2";
+    repo = "caffe2";
+    rev = "v${version}";
+    sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8";
+  };
+
+  nativeBuildInputs = [ cmake doxygen gtest ];
+  outputs = [ "bin" "out" ];
+  propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
+
+  buildInputs = [ glog google-gflags protobuf snappy eigen3 ]
+    ++ lib.optional useCuda cudatoolkit
+    ++ lib.optional useCudnn cudnn
+    ++ lib.optional useOpenmp openmp
+    ++ lib.optional useOpencv3 opencv3
+    ++ lib.optional useLeveldb leveldb
+    ++ lib.optional useLmdb lmdb
+    ++ lib.optional useRocksdb rocksdb
+    ++ lib.optional useZeromq zeromq
+  ;
+  propagatedBuildInputs = [ numpy future six python-protobuf pydot ];
+
+  patches = lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];
+
+  cmakeFlags = [ ''-DBUILD_TEST=OFF''
+                 ''-DBUILD_PYTHON=ON''
+                 ''-DUSE_CUDA=${if useCuda then ''ON''else ''OFF''}''
+                 ''-DUSE_OPENMP=${if useOpenmp then ''ON''else ''OFF''}''
+                 ''-DUSE_OPENCV=${if useOpencv3 then ''ON''else ''OFF''}''
+                 ''-DUSE_MPI=${if useMpi then ''ON''else ''OFF''}''
+                 ''-DUSE_LEVELDB=${if useLeveldb then ''ON''else ''OFF''}''
+                 ''-DUSE_LMDB=${if useLmdb then ''ON''else ''OFF''}''
+                 ''-DUSE_ROCKSDB=${if useRocksdb then ''ON''else ''OFF''}''
+                 ''-DUSE_ZMQ=${if useZeromq  then ''ON''else ''OFF''}''
+                 ''-DUSE_GLOO=OFF''
+                 ''-DUSE_NNPACK=OFF''
+                 ''-DUSE_NCCL=OFF''
+                 ''-DUSE_REDIS=OFF''
+                 ''-DUSE_FFMPEG=OFF''
+               ]
+               ++ lib.optional useCuda [
+                 ''-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}''
+                 ''-DCUDA_FAST_MATH=ON''
+                 ''-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc''
+               ];
+
+  preConfigure = ''
+    ${installExtraSrc cub}
+    ${installExtraSrc pybind11}
+    # XXX hack
+    export NIX_CFLAGS_COMPILE="-I ${eigen3}/include/eigen3/ $NIX_CFLAGS_COMPILE"
+  '';
+
+  postInstall = ''
+    moveToOutput "bin" "$bin"
+    mkdir -p $out/lib/${python.libPrefix}
+    ln -s $out/ $out/${python.sitePackages}
+  '';
+
+  doCheck = false;
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = https://caffe2.ai/;
+    description = "A new lightweight, modular, and scalable deep learning framework";
+    longDescription = ''
+      Caffe2 aims to provide an easy and straightforward way for you to experiment
+      with deep learning and leverage community contributions of new models and
+      algorithms. You can bring your creations to scale using the power of GPUs in the
+      cloud or to the masses on mobile with Caffe2's cross-platform libraries.
+    '';
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
+  };
+}
diff --git a/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch b/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch
new file mode 100644
index 000000000000..d908cb6ba80b
--- /dev/null
+++ b/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch
@@ -0,0 +1,55 @@
+diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h
+index bd06681..00172b7 100644
+--- a/caffe2/perfkernels/cvtsh_ss_bugfix.h
++++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h
+@@ -1,10 +1,36 @@
++/**
++ * Copyright (c) 2016-present, Facebook, Inc.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
+ #pragma once
+ 
+-#if defined(__APPLE__) && (__clang_major__ < 8)
++// Apple clang was fixed in 8.1
++#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1)))
++#define __APPLE_NEED_FIX 1
++#endif
++
++// Regular clang was fixed in 3.9
++#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9)
++#define __CLANG_NEED_FIX 1
++#endif
++
++#if __APPLE_NEED_FIX || __CLANG_NEED_FIX
+ 
+ #include <emmintrin.h>
+ 
+-// This version of apple clang has a bug that _cvtsh_ss is not defined, see
++// This version of clang has a bug that _cvtsh_ss is not defined, see
+ // https://reviews.llvm.org/D16177
+ static __inline float
+     __attribute__((__always_inline__, __nodebug__, __target__("f16c")))
+@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a)
+   return r[0];
+ }
+ 
+-#endif // defined(__APPLE__) && (__clang_major__ < 8)
++#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX
++
++#undef __APPLE_NEED_FIX
++#undef __CLANG_NEED_FIX
+ 
+ #ifdef _MSC_VER
+ 
diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix
new file mode 100644
index 000000000000..b52871793bee
--- /dev/null
+++ b/pkgs/development/python-modules/JPype1/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "JPype1";
+  version = "0.6.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09bzmnzkjbrf60h39wapxc1l8mb3r9km486cly0mm78bv096884r";
+  };
+
+  patches = [ ./set-compiler-language.patch ];
+
+  # Test loader complains about non-test module on python3.
+  doCheck = !isPy3k;
+
+  meta = {
+    homepage = "https://github.com/originell/jpype/";
+    license = "License :: OSI Approved :: Apache Software License";
+    description = "A Python to Java bridge.";
+  };
+}
diff --git a/pkgs/development/python-modules/JPype1/set-compiler-language.patch b/pkgs/development/python-modules/JPype1/set-compiler-language.patch
new file mode 100644
index 000000000000..1d5921a6ffab
--- /dev/null
+++ b/pkgs/development/python-modules/JPype1/set-compiler-language.patch
@@ -0,0 +1,12 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2017-01-12 19:08:44.000000000 -0500
++++ b/setup.py	2018-02-15 12:28:16.000000000 -0500
+@@ -123,7 +123,7 @@
+ 
+     # extra compile args
+     copt = {'msvc': ['/EHsc'],
+-            'unix' : ['-ggdb'],
++            'unix' : ['-ggdb', '-x', 'c++'],
+             'mingw32' : [],
+            }
+     # extra link args
diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix
new file mode 100644
index 000000000000..a423945b0ce8
--- /dev/null
+++ b/pkgs/development/python-modules/JayDeBeApi/default.nix
@@ -0,0 +1,16 @@
+{ lib, buildPythonPackage, fetchPypi, JPype1 }:
+
+buildPythonPackage rec {
+  pname = "JayDeBeApi";
+  version = "1.1.1";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0a189xs9zw81jvwwglvf2qyqnk6ra0biljssx9n4ffayqn9glbds";
+  };
+  propagatedBuildInputs = [ JPype1 ];
+  meta = {
+    homepage = "https://github.com/baztian/jaydebeapi";
+    license = lib.licenses.lgpl2;
+    description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API.";
+  };
+}
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index f831679294a4..19ad64e7472e 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
+, attrs
 , chardet
 , multidict
 , async-timeout
@@ -14,24 +15,24 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "2.3.10";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+    sha256 = "7aee5c0750584946fde40da70f0b28fe769f85182f1171acef18a35fd8ecd221";
   };
 
   disabled = pythonOlder "3.4";
 
   checkInputs = [ pytest gunicorn pytest-mock ];
 
-  propagatedBuildInputs = [ async-timeout chardet multidict yarl ]
+  propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
     ++ lib.optional (pythonOlder "3.7") idna-ssl;
 
   meta = with lib; {
     description = "Asynchronous HTTP Client/Server for Python and asyncio";
     license = licenses.asl20;
-    homepage = https://github.com/KeepSafe/aiohttp/;
+    homepage = https://github.com/aio-libs/aiohttp;
     maintainers = with maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 6670394ac0bb..1f4a34d18a38 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -1,22 +1,32 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, isPyPy
+, matplotlib, pycrypto, ecdsa
+# Python3: pyx
+}:
 
 buildPythonPackage rec {
   pname = "scapy";
-  version = "2.2.0";
+  version = "2.3.3";
   name = pname + "-" + version;
 
   disabled = isPy3k || isPyPy;
 
-  src = fetchurl {
-    url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz";
-    sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5";
+  src = fetchFromGitHub {
+    owner = "secdev";
+    repo = "scapy";
+    rev = "v${version}";
+    sha256 = "1c22407vhksnhc0rwrslnp9zy05qmk2zmdm2imm3iw7g6kx7gak1";
   };
 
+  # Temporary workaround, only needed for 2.3.3
+  patches = [ ./fix-version-1.patch ./fix-version-2.patch ];
+
+  propagatedBuildInputs = [ matplotlib pycrypto ecdsa ];
+
   meta = with stdenv.lib; {
     description = "Powerful interactive network packet manipulation program";
     homepage = http://www.secdev.org/projects/scapy/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
+    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
new file mode 100644
index 000000000000..3864a41964e2
--- /dev/null
+++ b/pkgs/development/python-modules/scapy/fix-version-1.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2018-02-15 22:14:08.531591678 +0100
++++ b/setup.py	2018-02-15 22:14:57.947703737 +0100
+@@ -47,7 +47,7 @@
+ 
+ setup(
+     name='scapy',
+-    version=__import__('scapy').VERSION,
++    version='2.3.3',
+     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
new file mode 100644
index 000000000000..62d43b51fbb9
--- /dev/null
+++ b/pkgs/development/python-modules/scapy/fix-version-2.patch
@@ -0,0 +1,11 @@
+--- 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'
+ 
+ VERSION = _version()
+ 
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 67d186c5a257..6e974b7e93d6 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.9.0";
+  version = "0.10.1";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "0aiifrp6g1d3ilhg8111wdhsrjy41x8gcmq67rjyxypw9znqzcpg";
+    sha256 = "0rz6zvkzyglf0mmc178avf52zynz487m4v0089ilsbrgv7v4i0kh";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/development/tools/build-managers/cask/default.nix b/pkgs/development/tools/build-managers/cask/default.nix
new file mode 100644
index 000000000000..234dab99c03c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cask/default.nix
@@ -0,0 +1,11 @@
+{ emacsPackagesNg, writeScriptBin }:
+let
+
+  emacs = emacsPackagesNg.emacsWithPackages (epkgs: [ epkgs.cask-package-toolset ]);
+  cpt = emacsPackagesNg.cask-package-toolset;
+
+in writeScriptBin "cask" ''
+#!/bin/sh
+
+exec ${emacs}/bin/emacs --script ${cpt}/share/emacs/site-lisp/elpa/cask-package-toolset-${cpt.version}/cask-package-toolset.el -- "$@"
+''
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 8af11f057380..da404a63d85f 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -4,7 +4,7 @@ let
 
   dubBuild = stdenv.mkDerivation rec {
     name = "dubBuild-${version}";
-    version = "1.7.1";
+    version = "1.7.2";
 
     enableParallelBuilding = true;
 
@@ -12,9 +12,13 @@ let
       owner = "dlang";
       repo = "dub";
       rev = "v${version}";
-      sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv";
+      sha256 = "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9";
     };
 
+    postUnpack = ''
+        patchShebangs .
+    '';
+
     patches = [
       # TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354
       (fetchpatch {
@@ -23,12 +27,11 @@ let
       })
     ];
 
+    # Can be removed with https://github.com/dlang/dub/pull/1368
+    dubvar = "\\$DUB";
     postPatch = ''
-      # Avoid that the version file is overwritten
-      substituteInPlace build.sh \
-        --replace source/dub/version_.d /dev/null
-
-      patchShebangs .
+        substituteInPlace test/fetchzip.sh \
+            --replace "dub remove" "\"${dubvar}\" remove"
     '';
 
     nativeBuildInputs = [ dmd libevent rsync ];
@@ -70,6 +73,7 @@ let
     
     patches = dubBuild.patches;
 
+    postUnpack = dubBuild.postUnpack;
     postPatch = dubBuild.postPatch;
 
     nativeBuildInputs = dubBuild.nativeBuildInputs;
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index ab090e6dc129..515e22788e50 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
 let
-  version = "2.6.6";
+  version = "2.6.9";
   goPackagePath = "github.com/buildkite/agent";
 in
 buildGoPackage {
@@ -12,11 +12,15 @@ buildGoPackage {
     owner = "buildkite";
     repo = "agent";
     rev = "v${version}";
-    sha256 = "0rpi63mfzlm39517l4xjcka3m4dnfjzwvpi0i1rpf1z2288cnkyx";
+    sha256 = "0rlinj7dcr8vzl1pb15nfny8jkvvj50i8czf4ahv26avnfycm4pz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
+  # on Linux, the TMPDIR is /build which is the same prefix as this package
+  # remove once #35068 is merged
+  noAuditTmpdir = stdenv.isLinux;
+
   postInstall = ''
     # Install bootstrap.sh
     mkdir -p $bin/libexec/buildkite-agent
@@ -44,6 +48,6 @@ buildGoPackage {
     homepage = https://buildkite.com/docs/agent;
     license = licenses.mit;
     maintainers = with maintainers; [ pawelpacana zimbatm ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index 477c874af011..0d4f72fad80a 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -21,7 +21,7 @@ buildGoPackage rec {
     homepage = https://github.com/golang/dep;
     description = "Go dependency management tool";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.carlsverre ];
   };
 }
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index daa25de95080..d76bbb7f53a3 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "dtools-${version}";
-  version = "2.078.1";
+  version = "2.078.2";
 
   srcs = [
     (fetchFromGitHub {
       owner = "dlang";
       repo = "dmd";
       rev = "v${version}";
-      sha256 = "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2";
+      sha256 = "0x9q4aw4jl36dz7m5111y2sm8jdaj3zg36zhj6vqg1lqpdn3bhls";
       name = "dmd";
     })
     (fetchFromGitHub {
@@ -28,23 +28,11 @@ stdenv.mkDerivation rec {
       cd dtools
   '';
 
-  postPatch = ''
-      substituteInPlace posix.mak \
-          --replace "../dmd/generated/\$(OS)/release/\$(MODEL)/dmd" ${dmd.out}/bin/dmd
-
-      substituteInPlace posix.mak \
-          --replace gcc $CC
-
-      # To fix rdmd test with newer phobos
-      substituteInPlace rdmd.d \
-          --replace " std.stdiobase," ""
-  '';
-
   nativeBuildInputs = [ dmd ];
   buildInputs = [ curl ];
 
   makeCmd = ''
-    make -f posix.mak DMD=${dmd.out}/bin/dmd DMD_DIR=dmd
+    make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
   '';
 
   buildPhase = ''
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
new file mode 100644
index 000000000000..ccdab780e6cf
--- /dev/null
+++ b/pkgs/development/tools/gotests/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "gotests-${version}";
+  version = "1.5.2";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/cweill/gotests";
+  excludedPackages = "testdata";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "cweill";
+    repo = "gotests";
+    sha256 = "0ff2jvpc1xb5jr6dv9izlpfavxaivzirqmdmicpznrqjz0d56pri";
+  };
+
+  meta = {
+    description = "Generate Go tests from your source code.";
+    homepage = https://github.com/cweill/gotests;
+    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/gotests/deps.nix b/pkgs/development/tools/gotests/deps.nix
new file mode 100644
index 000000000000..6a333b58bec6
--- /dev/null
+++ b/pkgs/development/tools/gotests/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/tools";
+      rev = "96b5a5404f303f074e6117d832a9873c439508f0";
+      sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42";
+    };
+  }
+]
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
index 7282fb4970ee..edf967f7d110 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -7,15 +7,13 @@
 , configuration ? "[]"
 }:
 
-# FIXME: fix hoogle search
-
 let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ packages pkgs;
     mueval' = mueval.override {
       inherit haskellPackages;
       packages = allPkgs;
     };
     bins = lib.makeBinPath ([ mueval'
-                              (haskellPackages.ghcWithPackages allPkgs)
+                              (haskellPackages.ghcWithHoogle allPkgs)
                               haskellPackages.unlambda
                               haskellPackages.brainfuck
                             ]
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 6351a01501d3..0307027faa2e 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ python3 libftdi ];
   makeFlags = [ "PREFIX=$(out)" ];
 
+  # fix icebox_vlog chipdb path. icestorm issue:
+  #   https://github.com/cliffordwolf/icestorm/issues/125
+  patchPhase = ''
+    substituteInPlace ./icebox/icebox_vlog.py \
+      --replace /usr/local/share "$out/share"
+  '';
+
   meta = {
     description = "Documentation and tools for Lattice iCE40 FPGAs";
     longDescription = ''
diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix
new file mode 100644
index 000000000000..3e69b4ffa073
--- /dev/null
+++ b/pkgs/development/tools/reflex/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+
+buildGoPackage rec {
+  name = "reflex-${version}";
+  version = "0.2.0";
+
+  goPackagePath = "github.com/cespare/reflex";
+
+  src = fetchFromGitHub {
+    owner = "cespare";
+    repo = "reflex";
+    rev = "v${version}";
+    sha256 = "0ccwjmf8rjh03hpbmfiy70ai9dhgvb5vp7albffq0cmv2sl69dqr";
+  };
+
+  meta = with lib; {
+    description = "A small tool to watch a directory and rerun a command when certain files change";
+    homepage = https://github.com/cespare/reflex;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ nicknovitski ];
+  };
+}
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index be6f32654305..a3adec384015 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -1,5 +1,6 @@
 { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
-SDL2_mixer, freetype, gettext, Cocoa, libicns }:
+SDL2_mixer, freetype, gettext, Cocoa, libicns,
+tiles ? true }:
 
 stdenv.mkDerivation rec {
   version = "0.C";
@@ -13,36 +14,44 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ libicns ];
+    ++ stdenv.lib.optionals (tiles && stdenv.isDarwin) [ libicns ];
 
-  buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  buildInputs = with stdenv.lib; [ ncurses lua gettext ]
+    ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ]
+    ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ];
 
   patches = [ ./patches/fix_locale_dir.patch ];
 
   postPatch = ''
     patchShebangs .
-    sed -i Makefile \
-      -e 's,-Werror,,g'
-
-    sed '1i#include <cmath>' \
-      -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp
   '';
 
-  makeFlags = [
-    "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1"
+  makeFlags = with stdenv.lib; [
+    "PREFIX=$(out)"
+    "LUA=1"
+    "RELEASE=1"
+    "USE_HOME_DIR=1"
     # "LANGUAGES=all"  # vanilla C:DDA installs all translations even without this flag!
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    "NATIVE=osx CLANG=1"
+  ] ++ optionals tiles [
+    "TILES=1"
+    "SOUND=1"
+  ] ++ optionals stdenv.isDarwin [
+    "NATIVE=osx"
+    "CLANG=1"
     "OSX_MIN=10.6"  # SDL for macOS only supports deploying on 10.6 and above
+  ] ++ optionals stdenv.cc.isGNU [
+    "WARNINGS+=-Wno-deprecated-declarations"
+    "WARNINGS+=-Wno-ignored-attributes"
+  ] ++ optionals stdenv.cc.isClang [
+    "WARNINGS+=-Wno-inconsistent-missing-override"
   ];
 
-  postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+  postBuild = stdenv.lib.optionalString (tiles && stdenv.isDarwin) ''
     # iconutil on macOS is not available in nixpkgs
     png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/*
   '';
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = stdenv.lib.optionalString (tiles && stdenv.isDarwin) ''
     app=$out/Applications/Cataclysm.app
     install -D -m 444 data/osx/Info.plist -t $app/Contents
     install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources
@@ -83,7 +92,7 @@ stdenv.mkDerivation rec {
       substances or radiation, now more closely resemble insects, birds or fish
       than their original form.
     '';
-    homepage = http://en.cataclysmdda.com/;
+    homepage = http://cataclysmdda.org/;
     license = licenses.cc-by-sa-30;
     maintainers = [ maintainers.skeidel ];
     platforms = platforms.unix;
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix
index 3d8ec7d68448..fcc2481cb695 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/pkgs/games/cataclysm-dda/git.nix
@@ -1,5 +1,6 @@
 { fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
-SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa }:
+SDL2_mixer, freetype, gettext, CoreFoundation, Cocoa,
+tiles ? true }:
 
 stdenv.mkDerivation rec {
   version = "2017-12-09";
@@ -14,28 +15,38 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa ];
+  buildInputs = with stdenv.lib; [ ncurses lua gettext ]
+    ++ optionals stdenv.isDarwin [ CoreFoundation ]
+    ++ optionals tiles [ SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype ]
+    ++ optionals (tiles && stdenv.isDarwin) [ Cocoa ];
 
   patches = [ ./patches/fix_locale_dir_git.patch ];
 
   postPatch = ''
     patchShebangs .
-    sed -i Makefile \
-      -e 's,-Werror,,g'
-
-    sed '1i#include <cmath>' \
-      -i src/{crafting,skill,weather_data,melee,vehicle,overmap,iuse_actor}.cpp
+    sed -i data/xdg/com.cataclysmdda.cataclysm-dda.desktop \
+        -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2,"
   '';
 
-  makeFlags = [
-    "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1"
+  makeFlags = with stdenv.lib; [
+    "PREFIX=$(out)"
+    "LUA=1"
+    "RELEASE=1"
+    "USE_HOME_DIR=1"
     "LANGUAGES=all"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    "NATIVE=osx CLANG=1"
+    "VERSION=git-${version}-${substring 0 8 src.rev}"
+  ] ++ optionals tiles [
+    "TILES=1"
+    "SOUND=1"
+  ] ++ optionals stdenv.isDarwin [
+    "NATIVE=osx"
+    "CLANG=1"
   ];
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = with stdenv.lib; optionalString (tiles && !stdenv.isDarwin) ''
+    install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T $out/share/applications/cataclysm-dda.desktop
+    install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps
+  '' + optionalString (tiles && stdenv.isDarwin) ''
     app=$out/Applications/Cataclysm.app
     install -D -m 444 data/osx/Info.plist -t $app/Contents
     install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources
@@ -78,7 +89,7 @@ stdenv.mkDerivation rec {
       substances or radiation, now more closely resemble insects, birds or fish
       than their original form.
     '';
-    homepage = http://en.cataclysmdda.com/;
+    homepage = http://cataclysmdda.org/;
     license = licenses.cc-by-sa-30;
     platforms = platforms.unix;
   };
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index ac04022a4629..6a5cea0634da 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -4,6 +4,7 @@
 , releaseType
 , mods ? []
 , username ? "" , password ? ""
+, experimental ? false
 }:
 
 assert releaseType == "alpha"
@@ -14,19 +15,38 @@ let
 
   # NB If you nix-prefetch-url any of these, be sure to add a --name arg,
   #    where the ultimate "_" (before the version) is changed to a "-".
+  branch = if experimental then "experimental" else "stable";
   binDists = {
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
-      alpha    = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; };
-      headless = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; };
-      demo     = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; };
+      alpha = {
+        stable        = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; };
+        experimental  = bdist { sha256 = "0s7cn5xhzwn793bmvlhlmibhbxdpfmpnpn33k5a4hdprc5gc27rg"; version = "0.16.24"; fetcher = authenticatedFetch; };
+      };
+      headless = {
+        stable        = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; };
+        experimental  = bdist { sha256 = "1ff4yjybiqr5kw583hmxkbrbxa3haj4bkjj8sx811c3s269gspi2"; version = "0.16.24"; };
+      };
+      demo = {
+        stable        = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; };
+        experimental  = bdist { };
+      };
     };
     i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in {
-      alpha    = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; };
-      headless = bdist { };
-      demo     = bdist { };
+      alpha = {
+        stable        = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; };
+        experimental  = bdist { };
+      };
+      headless = {
+        stable        = bdist { };
+        experimental  = bdist { };
+      };
+      demo = {
+        stable        = bdist { };
+        experimental  = bdist { };
+      };
     };
   };
-  actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform");
+  actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform");
 
   bdistForArch = arch: { sha256 ? null
                        , version ? "0.15.40"
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix
index 17e5b37ed440..db787021ce03 100644
--- a/pkgs/misc/cups/drivers/kyocera/default.nix
+++ b/pkgs/misc/cups/drivers/kyocera/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   src = fetchzip {
-    # this side does not like curl -> override useragent
+    # this site does not like curl -> override useragent
     curlOpts = "-A ''";
     url = "http://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip";
     sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz";
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 93681b2e18c7..ea9c3f937d0e 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -64,13 +64,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "conky-${version}";
-  version = "1.10.7";
+  version = "1.10.8";
 
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
     rev = "v${version}";
-    sha256 = "1qx47m4c1j3wh1hmbn2h8wyvg0ncr3kz1zcdj9si2bdyz3s0i9w7";
+    sha256 = "18kxjmaplqvn81vmvybvpc9qczm7wgcgd4af3a8vsqdv77cn5bwq";
   };
 
   postPatch = ''
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 988f4efb9cdb..858f1448dfac 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,56 +1,87 @@
-{ stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
+{ stdenv, fetchurl, fetchpatch, gtk_doc, pkgconfig, gobjectIntrospection, intltool
 , libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking
-, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales
-, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord
-, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook
+, libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales
+, fwupdate, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl
+, ninja, gcab, gnutls, python3, wrapGAppsHook, json_glib
+, shared_mime_info, umockdev
 }:
 let
-  version = "1.0.1";
+  version = "1.0.4";
+  python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
+  installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
 in stdenv.mkDerivation {
   name = "fwupd-${version}";
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-    sha256 = "1k627rja7df51dkzqvkzgbwrrj4049k6408d01m34n66zwr2fp59";
+    sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3";
   };
 
+  outputs = [ "out" "devdoc" "man" "installedTests" ];
+
   nativeBuildInputs = [
-    meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales
-    valgrind gcab docbook2x libxslt pygobject3 python3Packages.pycairo wrapGAppsHook
+    meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales shared_mime_info
+    valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook
   ];
   buildInputs = [
-    polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml
-    libgudev colord gpgme libuuid pillow gnutls glib_networking
+    polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios fwupdate libyaml
+    libgudev colord gpgme libuuid gnutls glib_networking efivar json_glib umockdev
   ];
 
   LC_ALL = "en_US.UTF-8"; # For po/make-images
 
-  NIX_CFLAGS_COMPILE = [
-    "-I${efivar}/include/efivar"
-    # warning: "__LIBELF_INTERNAL__" is not defined
-    "-Wno-error=undef"
-  ];
-
   patches = [
     ./fix-missing-deps.patch
+    # https://github.com/hughsie/fwupd/issues/403
+    (fetchpatch {
+      url = https://github.com/hughsie/fwupd/commit/bd6082574989e4f48b66c7270bb408d439b77a06.patch;
+      sha256 = "17pixyizkmn6wlsjmr1wwya17ivn770hdv9mp769vifxinya8w9y";
+    })
+    # drop docbook2man
+    (fetchpatch {
+      url = https://github.com/hughsie/fwupd/commit/2c43d3e6e65868b66a9a64a76123697e259ec7c2.patch;
+      sha256 = "0vjv7jnai0g96frlipk2sc59pj3mhq9di01hajycjv7y5v6qqrmc";
+    })
+    # https://github.com/hughsie/fwupd/issues/405
+    (fetchpatch {
+      url = https://github.com/hughsie/fwupd/pull/407.patch;
+      sha256 = "1dxhqps12x7bz0s974xk5hfpk4nwn1gs29vl0dfi9j54wy18f688";
+    })
   ];
+
   postPatch = ''
+    # needs a different set of modules than po/make-images
+    escapedInterpreterLine=$(echo "${installedTestsPython}/bin/python3" | sed 's|\\|\\\\|g')
+    sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" data/installed-tests/hardware.py
+
     patchShebangs .
+    substituteInPlace data/installed-tests/fwupdmgr.test.in --subst-var-by installedtestsdir "$installedTests/share/installed-tests/fwupd"
+  '';
+
+  doCheck = true;
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
   '';
 
   mesonFlags = [
-    "-Denable-man=false"
-    "-Denable-tests=false"
-    "-Denable-doc=false"
-    "-Dwith-bootdir=/boot"
-    "-Dwith-udevdir=lib/udev"
-    "-Dwith-systemdunitdir=lib/systemd/system"
+    "-Dplugin_dummy=true"
+    "-Dbootdir=/boot"
+    "-Dudevdir=lib/udev"
+    "-Dsystemdunitdir=lib/systemd/system"
     "--localstatedir=/var"
   ];
 
+  postInstall = ''
+    moveToOutput share/installed-tests "$installedTests"
+    wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \
+      --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0"
+  '';
+
   enableParallelBuilding = true;
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://fwupd.org/;
-    license = [ stdenv.lib.licenses.gpl2 ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [];
+    license = [ licenses.gpl2 ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
index 46e11952afe0..d1d7c06027f9 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/fix-missing-deps.patch
@@ -2,7 +2,7 @@
 +++ b/data/builder/meson.build
 @@ -1,3 +0,0 @@
 -install_data('README.md',
--  install_dir : join_paths(get_option('localstatedir'), 'lib', 'fwupd', 'builder')
+-  install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
 -)
 --- a/data/meson.build
 +++ b/data/meson.build
@@ -11,15 +11,15 @@
  endif
  
 -install_data(['daemon.conf'],
--  install_dir : join_paths(get_option('sysconfdir'), 'fwupd')
+-  install_dir : join_paths(sysconfdir, 'fwupd')
 -)
 -
  install_data(['org.freedesktop.fwupd.metainfo.xml'],
-   install_dir: join_paths(get_option('datadir'), 'metainfo')
+   install_dir: join_paths(datadir, 'metainfo')
  )
  
  install_data(['org.freedesktop.fwupd.conf'],
--  install_dir : join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
+-  install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
 +  install_dir : join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d')
  )
  
@@ -30,14 +30,14 @@
        'GPG-KEY-Hughski-Limited',
        'GPG-KEY-Linux-Vendor-Firmware-Service',
      ],
--    install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd')
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
 +    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
    )
  
    install_data([
        'GPG-KEY-Linux-Vendor-Firmware-Service',
      ],
--    install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata')
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
 +    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
    )
  endif
@@ -46,13 +46,13 @@
    install_data([
        'LVFS-CA.pem',
      ],
--    install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd')
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
 +    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd')
    )
    install_data([
        'LVFS-CA.pem',
      ],
--    install_dir : join_paths(get_option('sysconfdir'), 'pki', 'fwupd-metadata')
+-    install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
 +    install_dir : join_paths(get_option('prefix'), 'etc', 'pki', 'fwupd-metadata')
    )
  endif
@@ -63,7 +63,7 @@
        'lvfs.conf',
        'lvfs-testing.conf',
      ],
--    install_dir : join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d')
+-    install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
 +    install_dir : join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d')
    )
  endif
@@ -72,7 +72,7 @@
    output : 'fwupd.conf',
    configuration : con2,
    install: true,
--  install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'),
+-  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
 +  install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
  )
  configure_file(
@@ -80,7 +80,7 @@
    output : 'vendor.conf',
    configuration : con2,
    install: true,
--  install_dir: join_paths(get_option('sysconfdir'), 'fwupd', 'remotes.d'),
+-  install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
 +  install_dir: join_paths(get_option('prefix'), 'etc', 'fwupd', 'remotes.d'),
  )
 --- a/meson_post_install.sh
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 8fb40475bd7b..968fb195d2a2 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -232,18 +232,23 @@ with stdenv.lib;
 
   # USB serial devices.
   USB_SERIAL_GENERIC y # USB Generic Serial Driver
-  USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
-  USB_SERIAL_KEYSPAN_USA28 y
-  USB_SERIAL_KEYSPAN_USA28X y
-  USB_SERIAL_KEYSPAN_USA28XA y
-  USB_SERIAL_KEYSPAN_USA28XB y
-  USB_SERIAL_KEYSPAN_USA19 y
-  USB_SERIAL_KEYSPAN_USA18X y
-  USB_SERIAL_KEYSPAN_USA19W y
-  USB_SERIAL_KEYSPAN_USA19QW y
-  USB_SERIAL_KEYSPAN_USA19QI y
-  USB_SERIAL_KEYSPAN_USA49W y
-  USB_SERIAL_KEYSPAN_USA49WLC y
+
+  # Include firmware for various USB serial devices.
+  # Only applicable for kernels below 4.16, after that no firmware is shipped in the kernel tree.
+  ${optionalString (versionOlder version "4.16") ''
+    USB_SERIAL_KEYSPAN_MPR y
+    USB_SERIAL_KEYSPAN_USA28 y
+    USB_SERIAL_KEYSPAN_USA28X y
+    USB_SERIAL_KEYSPAN_USA28XA y
+    USB_SERIAL_KEYSPAN_USA28XB y
+    USB_SERIAL_KEYSPAN_USA19 y
+    USB_SERIAL_KEYSPAN_USA18X y
+    USB_SERIAL_KEYSPAN_USA19W y
+    USB_SERIAL_KEYSPAN_USA19QW y
+    USB_SERIAL_KEYSPAN_USA19QI y
+    USB_SERIAL_KEYSPAN_USA49W y
+    USB_SERIAL_KEYSPAN_USA49WLC y
+  ''}
 
   # Device mapper (RAID, LVM, etc.)
   MD y
@@ -630,15 +635,17 @@ with stdenv.lib;
   FW_LOADER_USER_HELPER_FALLBACK? n
 
   # Disable various self-test modules that have no use in a production system
-  ${optionalString (versionOlder version "4.4") ''
-    ARM_KPROBES_TEST? n
-  ''}
-
+  # This menu disables all/most of them on >= 4.16
+  RUNTIME_TESTING_MENU? n
+  # For older kernels, painstakingly disable each symbol.
+  ARM_KPROBES_TEST? n
   ASYNC_RAID6_TEST? n
   ATOMIC64_SELFTEST? n
   BACKTRACE_SELF_TEST? n
   CRC32_SELFTEST? n
   CRYPTO_TEST? n
+  DRM_DEBUG_MM_SELFTEST? n
+  EFI_TEST? n
   GLOB_SELFTEST? n
   INTERVAL_TREE_TEST? n
   LNET_SELFTEST? n
@@ -647,39 +654,49 @@ with stdenv.lib;
   NOTIFIER_ERROR_INJECTION? n
   PERCPU_TEST? n
   RBTREE_TEST? n
+  RCU_PERF_TEST? n
   RCU_TORTURE_TEST? n
+  TEST_ASYNC_DRIVER_PROBE? n
+  TEST_BITMAP? n
   TEST_BPF? n
   TEST_FIRMWARE? n
+  TEST_HASH? n
   TEST_HEXDUMP? n
+  TEST_KMOD? n
   TEST_KSTRTOX? n
   TEST_LIST_SORT? n
   TEST_LKM? n
+  TEST_PARMAN? n
   TEST_PRINTF? n
   TEST_RHASHTABLE? n
+  TEST_SORT? n
   TEST_STATIC_KEYS? n
   TEST_STRING_HELPERS? n
   TEST_UDELAY? n
   TEST_USER_COPY? n
+  TEST_UUID? n
+  WW_MUTEX_SELFTEST? n
   XZ_DEC_TEST? n
 
-  ${optionalString (versionAtLeast version "4.13") ''
-    TEST_KMOD n
+  ${optionalString (features.criu or false)  ''
+    EXPERT y
+    CHECKPOINT_RESTORE y
   ''}
 
-  ${optionalString (versionOlder version "4.4") ''
-    EFI_TEST? n
-    RCU_PERF_TEST? n
-    TEST_ASYNC_DRIVER_PROBE? n
-    TEST_BITMAP? n
-    TEST_HASH? n
-    TEST_UUID? n
+  ${optionalString ((features.criu or false) && (features.criu_revert_expert or true))
+    # Revert some changes, introduced by EXPERT, when necessary for criu
+  ''
+    RFKILL_INPUT? y
+    HID_PICOLCD_FB? y
+    HID_PICOLCD_BACKLIGHT? y
+    HID_PICOLCD_LCD? y
+    HID_PICOLCD_LEDS? y
+    HID_PICOLCD_CIR? y
+    DEBUG_MEMORY_INIT? y
   ''}
 
-  ${optionalString (versionAtLeast version "4.11") ''
-    DRM_DEBUG_MM_SELFTEST? n
-    TEST_PARMAN? n
-    TEST_SORT? n
-    WW_MUTEX_SELFTEST? n
+  ${optionalString (features.debug or false)  ''
+    DEBUG_INFO y
   ''}
 
   ${extraConfig}
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 0bed93d76edb..216a7c7cb85d 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,4 +1,4 @@
-{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl
+{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
 , ncurses
 , libelf
 , utillinux
@@ -82,7 +82,8 @@ let
     kernelConfig = kernelConfigFun config;
 
     depsBuildBuild = [ buildPackages.stdenv.cc ];
-    nativeBuildInputs = [ perl ];
+    nativeBuildInputs = [ perl ]
+      ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
 
     platformName = hostPlatform.platform.name;
     # e.g. "defconfig"
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index ab838f546c16..2c32ba573114 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.15-rc9";
-  modDirVersion = "4.15.0-rc9";
-  extraMeta.branch = "4.15";
+  version = "4.16-rc1";
+  modDirVersion = "4.16.0-rc1";
+  extraMeta.branch = "4.16";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "18xhy38fqyzg9yiljhdj2y0skjf2yhxvhzbija3is75wyv7g55l6";
+    sha256 = "19m1scqfcslawsxci0lypy32af315by3rg10lczv0jh2j4gyggmd";
   };
 
   # Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 3dae37136a2e..bd9334b8f9b7 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,4 +1,4 @@
-{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl
+{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
 , ncurses ? null
 , libelf
 , utillinux
@@ -41,10 +41,10 @@ in {
 
 let
   inherit (stdenv.lib)
-    hasAttr getAttr optional optionalString optionalAttrs maintainers platforms;
+    hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms;
 
   # Dependencies that are required to build kernel modules
-  moduleBuildDependencies = stdenv.lib.optional (stdenv.lib.versionAtLeast version "4.14") libelf;
+  moduleBuildDependencies = optional (stdenv.lib.versionAtLeast version "4.14") libelf;
 
   installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
     #!${stdenv.shell} -e
@@ -262,6 +262,7 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config
       ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
       ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
       ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
+      ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
       ;
 
   hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 4b5e7bbf3e3d..ac8a1c7de4a8 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -7,12 +7,12 @@ with stdenv.lib;
 let
   _kernel = kernel;
 in stdenv.mkDerivation rec {
-  version = "2.5.2";
+  version = "2.5.4";
   name = "openvswitch-${version}";
 
   src = fetchurl {
     url = "http://openvswitch.org/releases/${name}.tar.gz";
-    sha256 = "0ifx758zl97dpad9vpd5i5dqj6i03k632mvgxs82hqkcsb3r6y7q";
+    sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv";
   };
 
   kernel = optional (_kernel != null) _kernel.dev;
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index c79de39d5dac..96306a9d5c6a 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,39 +1,20 @@
-{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
+{ stdenv, fetchFromGitHub, fetchpatch, kernel, bc }:
 
 stdenv.mkDerivation rec {
   name = "rtl8812au-${kernel.version}-${version}";
-  version = "4.3.20";
+  version = "5.2.20_25672.20171213";
 
   src = fetchFromGitHub {
-    owner = "Grawp";
-    repo = "rtl8812au_rtl8821au";
-    rev = "d716b38abf5ca7da72d2be0adfcebe98cceeda8f";
-    sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry";
+    owner = "zebulon2";
+    repo = "rtl8812au-driver-5.2.20";
+    rev = "aca1e0677bfe56c6c4914358df007c97486e7095";
+    sha256 = "19av8fkh3mvs2f57iibrg0cfyhjnnx4cbnfzv5aj7v5gb0j3dp0p";
   };
 
-  patches = [
-    (fetchpatch { # From PR # 42
-      name = "rtl8812au-4.11.x-fix.patch";
-      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/3224e74ad9c230b74a658e80dad66ab95c9e2ef5.patch;
-      sha256 = "12g4yvivg4d0qm5cgxs7k54p3y7h1dc2jw6rp1xbppwf3j1z6xks";
-    })
-    (fetchpatch { # From PR #46
-      name = "rtl8812au-4.11.9-fix.patch";
-      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/58fc45a4511b8b9d6b52813168e3eee657517b1f.patch;
-      sha256 = "18bag2mif5112lap2xvx2bb0wxrd13f9y9cwqv1qzp5nyqiniziz";
-    })
-    (fetchpatch { # From PR #43
-      name = "rtl8812au-4.12-fix.patch";
-      url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/a5475c9f1f54099ca35c8680f2dedee11fa9edec.patch;
-      sha256 = "01xa51whq1xa0sh3y2bhm65f0cryzmv46v530axqjrpnd924432d";
-    })
-  ];
-
+  nativeBuildInputs = [ bc ];
   buildInputs = kernel.moduleBuildDependencies;
 
-  hardeningDisable = [ "pic" ];
-
-  NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
+  hardeningDisable = [ "pic" "format" ];
 
   prePatch = ''
     substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
@@ -46,10 +27,11 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
-    homepage = https://github.com/Grawp/rtl8812au_rtl8821au;
-    license = stdenv.lib.licenses.gpl2;
+    homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20;
+    license = licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ danielfullmer ];
   };
 }
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 2ec12b81f84b..56b4a1552fe6 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -12,11 +12,11 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "b40d9dbef05031464dfff57712f476e7cddc0fda26b41daf660c5a33ea203ce0";
+    sha256 = "0e90ac37965839705bc2154cb07587cb31dd5816e37a14f3552d65676638fc6a";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
new file mode 100644
index 000000000000..cd2985960a75
--- /dev/null
+++ b/pkgs/servers/http/h2o/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub
+, pkgconfig, cmake
+, libressl_2_6, libuv, zlib
+}:
+
+with builtins;
+
+stdenv.mkDerivation rec {
+  name = "h2o-${version}";
+  version = "2.2.4";
+
+  src = fetchFromGitHub {
+    owner  = "h2o";
+    repo   = "h2o";
+    rev    = "refs/tags/v${version}";
+    sha256 = "0176x0bzjry19zs074a9i5vhncc842xikmx43wj61jky318nq4w4";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ libressl_2_6 libuv zlib ];
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Optimized HTTP/1 and HTTP/2 server";
+    homepage    = https://h2o.examp1e.net;
+    license     = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 36d0ea6b1e88..780f20017982 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -152,8 +152,8 @@
       moduleSrc = fetchFromGitHub {
         owner  = "pagespeed";
         repo   = "ngx_pagespeed";
-        rev    = "v${version}-beta";
-        sha256 = "176skx7zmi7islc1hmdxcynix4lkvgmr78lknn13s9gskc7qi25w";
+        rev    = "v${version}-stable";
+        sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp";
       };
 
       ngx_pagespeed = pkgs.runCommand
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index eb8275b94028..14662ff6cc25 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "matterbridge-${version}";
-  version = "1.6.3";
+  version = "1.7.1";
 
   goPackagePath = "github.com/42wim/matterbridge";
 
   src = fetchurl {
     url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
-    sha256 = "1d2wrfq07kk5l19w2d6yyjcdvn9b39cji1k5vzsfq0xkdb6b8spb";
+    sha256 = "0ajc7xswmwhc2xn937sv3b76s8hblfn9x9rj5825hi3d3s8zqq88";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 422309bc6546..4890ed5babf6 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -2,18 +2,18 @@
 
 buildGoPackage rec {
   name = "mattermost-${version}";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "mattermost-server";
     rev = "v${version}";
-    sha256 = "158sfbg19sp165iavjwwfxx9s4y116yc5h3plsmvlxpdv674k7v3";
+    sha256 = "11rw2m26mf4x6xbxkf37c1j16kyxx059jv3cdajkpv31xn82s7iv";
   };
 
   webApp = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "1rbpl6zfmhfgzz2i1q2ym51ll6j54gk5p6ca99v9kjlm4ipcq9mv";
+    sha256 = "09dzkvrwj4ynk8yqrcbnhmv9hm3z3r3vyjrbzpvmznfrwcccc7lr";
   };
 
   goPackagePath = "github.com/mattermost/mattermost-server";
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 786b142c7329..238cd20d75e5 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.2.3";
+  version = "3.3.3";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "1ndd7wxw2lz1ywnz3kp0pz1jmby2jakhl00kn8jwghcbipvnx9b5";
+    sha256 = "0hw6yzxmhmnb7qz30pqjdbgin41w892pbf1xbl2821nsz9b290sd";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix
new file mode 100644
index 000000000000..083a224d1558
--- /dev/null
+++ b/pkgs/servers/simplehttp2server/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "simplehttp2server-${version}";
+  version = "3.1.3";
+
+  goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server";
+
+  src = fetchFromGitHub {
+     owner = "GoogleChromeLabs";
+     repo = "simplehttp2server";
+     rev = version;
+     sha256 = "113mcfvy1m91wask5039mhr0187nlw325ac32785yl4bb4igi8aw";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+     homepage = https://github.com/GoogleChromeLabs/simplehttp2server;
+     description = "HTTP/2 server for development purposes";
+     license = licenses.asl20;
+     maintainers = with maintainers; [ yrashk ];
+  };
+
+}
diff --git a/pkgs/servers/simplehttp2server/deps.nix b/pkgs/servers/simplehttp2server/deps.nix
new file mode 100644
index 000000000000..e6a26bf2506c
--- /dev/null
+++ b/pkgs/servers/simplehttp2server/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/NYTimes/gziphandler";
+    fetch = {
+      type = "git";
+      url = "https://github.com/NYTimes/gziphandler";
+      rev = "289a3b81f5aedc99f8d6eb0f67827c142f1310d8";
+      sha256 = "1r9ly9wdqjcc4nwv71mfldf1f5cjm4r34vvkdm5wabmdqqqwkbyx";
+    };
+  }
+]
diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix
new file mode 100644
index 000000000000..b1e9c5c1a455
--- /dev/null
+++ b/pkgs/servers/softether/4.25.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, openssl, readline, ncurses, zlib }:
+
+let
+  os = if stdenv.isLinux then "1"
+       else if stdenv.isFreeBSD then "2"
+       else if stdenv.isSunOS then "3"
+       else if stdenv.isDarwin then "4"
+       else if stdenv.isOpenBSD then "5"
+       else "";
+  cpuBits = if stdenv.is64bit then "2" else "1";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "softether-${version}";
+  version = "4.25";
+  build = "9656";
+  compiledDate = "2018.01.15";
+  dataDir = "/var/lib/softether";
+
+  src = fetchurl {
+    url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
+    sha256 = "1y1m8lf0xfh7m70d15wj2jjf5a5qhi3j49ciwqmsscsqvb1xwimr";
+  };
+
+  buildInputs = [ openssl readline ncurses zlib ];
+
+  preConfigure = ''
+      echo "${os}
+      ${cpuBits}
+      " | ./configure
+      rm configure
+  '';
+
+  buildPhase = ''
+      mkdir -p $out/bin
+      sed -i \
+          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
+          -e "/_DIR=/s|/usr|${dataDir}|g" \
+          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
+          -e "/echo/s|echo $out/|echo |g" \
+          Makefile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
+    homepage = https://www.softether.org/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.rick68 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index e6137a2db7c2..07b530f4ef72 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -13,13 +13,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" ];
 
-  patchPhase = ''
+  patches = [ ./wallabag-data.patch ]; # exposes $WALLABAG_DATA
+
+  prePatch = ''
     rm Makefile # use the "shared hosting" package with bundled dependencies
-    substituteInPlace app/AppKernel.php \
-      --replace "__DIR__" "getenv('WALLABAG_DATA')"
-    substituteInPlace var/bootstrap.php.cache \
-      --replace "\$this->rootDir = \$this->getRootDir()" "\$this->rootDir = getenv('WALLABAG_DATA')"
-  ''; # exposes $WALLABAG_DATA
+  '';
 
   installPhase = ''
     mkdir $out/
@@ -31,11 +29,12 @@ stdenv.mkDerivation rec {
     longDescription = ''
       wallabag is a self hostable application for saving web pages.
 
-      To use, point the environment variable $WALLABAG_DATA to a directory called `app` that contains the folder `config` with wallabag's configuration files. These need to be updated every package upgrade. In `app`'s parent folder, a directory called `var` containing wallabag's data will be created.
+      Point the environment variable $WALLABAG_DATA to a data directory that contains the folder `app/config` which must be a clone of wallabag's configuration files with your customized `parameters.yml`. These need to be updated every package upgrade.
       After a package upgrade, empty the `var/cache` folder.
     '';
     license = licenses.mit;
     homepage = http://wallabag.org;
+    maintainers = with maintainers; [ schneefux ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/servers/web-apps/wallabag/wallabag-data.patch
new file mode 100644
index 000000000000..086e93959800
--- /dev/null
+++ b/pkgs/servers/web-apps/wallabag/wallabag-data.patch
@@ -0,0 +1,26 @@
+diff --git a/app/AppKernel.php b/app/AppKernel.php
+index 40726f05..7d44e600 100644
+--- a/app/AppKernel.php
++++ b/app/AppKernel.php
+@@ -58,14 +58,19 @@ class AppKernel extends Kernel
+         return $bundles;
+     }
+ 
++    public function getProjectDir()
++    {
++        return getenv('WALLABAG_DATA') ?: dirname(__DIR__);
++    }
++
+     public function getCacheDir()
+     {
+-        return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
++        return $this->getProjectDir() . '/var/cache/' . $this->getEnvironment();
+     }
+ 
+     public function getLogDir()
+     {
+-        return dirname(__DIR__) . '/var/logs';
++        return $this->getProjectDir() . '/var/logs';
+     }
+ 
+     public function registerContainerConfiguration(LoaderInterface $loader)
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 40d8e0a4fbc4..b7422e311b09 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -19,8 +19,16 @@ buildGoPackage rec {
   '';
 
   installPhase = ''
-    mkdir -p $bin/bin/
+    mkdir -p \
+      $bin/bin \
+      $bin/etc/bash_completion.d \
+      $bin/share/zsh/vendor-completions \
+      $bin/share/man/man1
     cp restic $bin/bin/
+    $bin/bin/restic generate \
+      --bash-completion $bin/etc/bash_completion.d/restic.sh \
+      --zsh-completion $bin/share/zsh/vendor-completions/restic.sh \
+      --man $bin/share/man/man1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix
new file mode 100644
index 000000000000..e505f0bb6db5
--- /dev/null
+++ b/pkgs/tools/graphics/graph-easy/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPerlPackage, fetchurl }:
+
+buildPerlPackage rec {
+  name = "Graph-Easy-${version}";
+  version = "0.76";
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+    sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa";
+  };
+  
+  meta = with stdenv.lib; {
+    homepage = http://search.cpan.org/~tels/Graph-Easy/bin/graph-easy;
+    description = "Render/convert graphs in/from various formats";
+    license = licenses.gpl1;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jensbin ];
+  };
+}
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 817510bfb761..ba38a55dda02 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -22,6 +22,9 @@ in
       mkdir -p "$out/etc/bash_completion.d"
       cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d"
 
+      mkdir -p $out/share/fish/vendor_completions.d/
+      cp -v $out/share/autojump/autojump.fish "$out/share/fish/vendor_completions.d/autojump.fish"
+
       cat <<SCRIPT > $out/bin/autojump-share
       #!/bin/sh
       # Run this script to find the autojump shared folder where all the shell
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index a18c78382715..3c8262068693 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec {
     mkdir -p "$out/man/man1"
     cp "$src/doc/fd.1" "$out/man/man1"
 
-    mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions}
+    mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
     cp target/release/build/fd-find-*/out/fd.bash "$out/share/bash-completion/completions/"
-    cp target/release/build/fd-find-*/out/fd.fish "$out/share/fish/completions/"
+    cp target/release/build/fd-find-*/out/fd.fish "$out/share/fish/vendor_completions.d/"
     cp target/release/build/fd-find-*/out/_fd "$out/share/zsh/site-functions/"
   '';
 
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix
index f68ae1ec2455..86434847b4a2 100644
--- a/pkgs/tools/misc/figlet/default.nix
+++ b/pkgs/tools/misc/figlet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation {
   name = "figlet-2.2.5";
@@ -9,12 +9,17 @@ stdenv.mkDerivation {
     sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z";
   };
 
-  installPhase = "make prefix=$out install";
+  patches = [
+    (fetchpatch {
+      url = https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399;
+      name = "musl-fix-cplusplus-decls.patch";
+      sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j";
+    })
+  ];
 
-  preConfigure = ''
-    mkdir -p $out/{man/man6,bin}
-    makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet CC=cc LD=cc"
-  '';
+  makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ];
+
+  doCheck = true;
 
   meta = {
     description = "Program for making large letters out of ordinary text";
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
new file mode 100644
index 000000000000..322151739843
--- /dev/null
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "hyperfine-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner  = "sharkdp";
+    repo   = "hyperfine";
+    rev    = "refs/tags/v${version}";
+    sha256 = "1ynqyacbx0x971lyd1k406asms58bc7vzl8gca3sg34rx0hx3wzi";
+  };
+
+  cargoSha256 = "109yv1618bi19vh1jjv2ki06mafhcrv35a3a1zsr34kg3gsjv0rb";
+
+  meta = with stdenv.lib; {
+    description = "Command-line benchmarking tool";
+    homepage    = https://github.com/sharkdp/hyperfine;
+    license     = with licenses; [ asl20 /* or */ mit ];
+    maintainers = [ maintainers.thoughtpolice ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 2d36ad17eec7..786b3992a5cc 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchgit, perl, cdrkit, syslinux, xz, openssl }:
+{ stdenv, lib, fetchgit, perl, cdrkit, syslinux, xz, openssl
+, embedScript ? null
+}:
 
 let
   date = "20170922";
@@ -24,7 +26,7 @@ stdenv.mkDerivation {
   makeFlags =
     [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
       "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin"
-    ];
+    ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
 
 
   enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ];
@@ -46,6 +48,8 @@ stdenv.mkDerivation {
     ln -s undionly.kpxe $out/undionly.kpxe.0
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib;
     { description = "Network boot firmware";
       homepage = http://ipxe.org/;
diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix
new file mode 100644
index 000000000000..7b9549a80fea
--- /dev/null
+++ b/pkgs/tools/misc/ministat/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "ministat-${version}";
+  version = "20150715-1";
+
+  src = fetchgit {
+    url = "https://git.decadent.org.uk/git/ministat.git";
+    rev = "refs/tags/debian/${version}";
+    sha256 = "1p4g0yqgsy4hiqhr8gqp8d38zxzrss5qz70s0bw3i2pg4w668k6f";
+  };
+
+  postPatch = ''
+    patch -p1 < debian/patches/fix-ctype-usage.patch
+    patch -p1 < debian/patches/not-bsd
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    cp ministat $out/bin
+    cp ministat.1 $out/share/man/man1/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple tool for statistical comparison of data sets";
+    homepage = https://git.decadent.org.uk/gitweb/?p=ministat.git;
+    license = licenses.beerware;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix
index 3ef039507d4e..556d21ee2fc7 100644
--- a/pkgs/tools/misc/mprime/default.nix
+++ b/pkgs/tools/misc/mprime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, pkgconfig, curl }:
+{ stdenv, lib, fetchurl, unzip, curl, hwloc, gmp }:
 
 let
   srcDir =
@@ -14,25 +14,24 @@ let
     else throwSystem;
 in
 
-stdenv.mkDerivation {
-  name = "mprime-28.7";
+stdenv.mkDerivation rec {
+  name = "mprime-${version}";
+  version = "29.4b7";
 
   src = fetchurl {
-    url = http://www.mersenne.org/ftp_root/gimps/p95v287.source.zip;
-    sha256 = "1k3gxhs3g8hfghzpmidhcwpwyayj8r83v8zjai1z4xgsql4jwby1";
+    url = "http://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip";
+    sha256 = "0idaqm46m4yis7vl014scx57lpccvjbnyy79gmj8caxghyajws0m";
   };
 
-  unpackCmd = "unzip -d src -q $curSrc";
+  unpackCmd = "unzip -d src -q $curSrc || true";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ unzip curl ];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ curl hwloc gmp ];
 
   patches = [ ./makefile.patch ];
 
   buildPhase = ''
     make -C gwnum -f ${gwnum}
-    echo 'override CFLAGS := $(CFLAGS)' $(pkg-config --cflags libcurl) >> ${srcDir}/makefile
-    echo 'override LIBS := $(LIBS)' $(pkg-config --libs libcurl) >> ${srcDir}/makefile
     make -C ${srcDir}
   '';
 
@@ -48,7 +47,7 @@ stdenv.mkDerivation {
       client. It is identical to Prime95 in functionality, except it lacks a
       graphical user interface.
     '';
-    homepage = http://www.mersenne.org/;
+    homepage = "http://www.mersenne.org/";
     # Unfree, because of a license requirement to share prize money if you find
     # a suitable prime. http://www.mersenne.org/legal/#EULA
     license = stdenv.lib.licenses.unfree;
diff --git a/pkgs/tools/misc/mprime/makefile.patch b/pkgs/tools/misc/mprime/makefile.patch
index 7f758af7b7c4..6ed9cf69384d 100644
--- a/pkgs/tools/misc/mprime/makefile.patch
+++ b/pkgs/tools/misc/mprime/makefile.patch
@@ -1,46 +1,41 @@
-diff -ru orig/linux/makefile patched/linux/makefile
---- orig/linux/makefile	2015-08-09 21:06:18.000000000 +0100
-+++ patched/linux/makefile	2016-02-16 16:25:45.988662423 +0000
-@@ -25,8 +25,8 @@
+diff -dur src.old/linux/makefile src.new/linux/makefile
+--- src.old/linux/makefile	2018-01-04 20:49:00.000000000 +0300
++++ src.new/linux/makefile	2018-02-15 12:32:02.913011604 +0300
+@@ -28,8 +28,8 @@
  CPP = g++
  CPPFLAGS = -I.. -I../gwnum -O2 -march=i486 -malign-double
  
 -LFLAGS = -Wl,-M -Wl,-L/usr/local/lib
--LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl
+-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp
 +LFLAGS =
-+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl
++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lrt -lstdc++ -ldl -lgmp
  
  FACTOROBJ = factor32.o
  LINUXOBJS = prime.o menu.o
-diff -ru orig/linux64/makefile patched/linux64/makefile
---- orig/linux64/makefile	2015-08-09 21:06:20.000000000 +0100
-+++ patched/linux64/makefile	2016-02-16 16:25:57.076531585 +0000
-@@ -13,13 +13,13 @@
- #	LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl
- 
- CC = gcc
--CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2 
-+CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2
- 
+diff -dur src.old/linux64/makefile src.new/linux64/makefile
+--- src.old/linux64/makefile	2018-01-04 20:49:00.000000000 +0300
++++ src.new/linux64/makefile	2018-02-15 12:32:28.836286995 +0300
+@@ -26,9 +26,9 @@
  CPP = g++
  CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2
  
 -LFLAGS = -Wl,-M -Wl,-L/usr/local/lib
--LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl
 +LFLAGS =
-+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl
+ #LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl -lgmp
+-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp
++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lrt -lstdc++ -ldl -lgmp
  
  FACTOROBJ = factor64.o
  LINUXOBJS = prime.o menu.o
-diff -ru orig/macosx64/makefile patched/macosx64/makefile
---- orig/macosx64/makefile	2015-08-09 21:06:22.000000000 +0100
-+++ patched/macosx64/makefile	2016-02-16 16:19:03.988415925 +0000
-@@ -10,7 +10,7 @@
+diff -dur src.old/macosx64/makefile src.new/macosx64/makefile
+--- src.old/macosx64/makefile	2018-01-04 20:49:02.000000000 +0300
++++ src.new/macosx64/makefile	2018-02-15 12:33:32.401902535 +0300
+@@ -12,7 +12,7 @@
+ CPP = g++
  CPPFLAGS = -I.. -I../gwnum -I../linux -O2 -DX86_64 -DCOMMAND_LINE_MPRIME -m64
  
- LFLAGS = -m64 -Wl,-no_pie
--LIBS   = ../gwnum/amd64/release/gwnum.a -lm -lpthread -lcurl -framework IOKit -framework CoreFoundation -lstdc++
-+LIBS   = ../gwnum/amd64/release/gwnum.a -lm -lpthread -framework IOKit -framework CoreFoundation -lstdc++
+-LFLAGS = -m64 -Wl,-no_pie -L/usr/local/lib
++LFLAGS = -m64 -Wl,-no_pie
+ LIBS   = ../gwnum/amd64/release/gwnum.a -lm -lpthread -lhwloc -lcurl -framework IOKit -framework CoreFoundation -lstdc++ -lgmp
  
  FACTOROBJ = ../prime95/macosx64/factor64.o
- OBJS = prime.o menu.o
diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix
new file mode 100644
index 000000000000..41913f966534
--- /dev/null
+++ b/pkgs/tools/misc/plotinus/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchFromGitHub
+, gettext
+, libxml2
+, pkgconfig
+, gtk3
+, cmake
+, ninja
+, vala
+, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "plotinus-${version}";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "p-e-w";
+    repo = "plotinus";
+    rev = "v${version}";
+    sha256 = "19k6f6ivg4ab57m62g6fkg85q9sv049snmzq1fyqnqijggwshxfz";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    wrapGAppsHook
+    vala
+    cmake
+    ninja
+    gettext
+    libxml2
+  ];
+  buildInputs = [
+    gtk3
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A searchable command palette in every modern GTK+ application";
+    homepage = https://github.com/p-e-w/plotinus;
+    maintainers = with maintainers; [ samdroid-apps ];
+    platforms = platforms.linux;
+    # No COPYING file, but headers in the source code
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/networking/connman-ncurses/default.nix b/pkgs/tools/networking/connman-ncurses/default.nix
new file mode 100644
index 000000000000..8c4d4fa84865
--- /dev/null
+++ b/pkgs/tools/networking/connman-ncurses/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dbus, json_c, ncurses, connman }:
+
+stdenv.mkDerivation rec {
+  name = "connman-ncurses-${version}";
+  version = "2015-07-21";
+
+  src = fetchFromGitHub {
+    owner = "eurogiciel-oss";
+    repo = "connman-json-client";
+    rev = "3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2";
+    sha256 = "1831r0776fv481g8kgy1dkl750pzv47835dw11sslq2k6mm6i9p1";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ dbus ncurses json_c connman ];
+
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+  
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -va connman_ncurses "$out/bin/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple ncurses UI for connman";
+    homepage = https://github.com/eurogiciel-oss/connman-json-client;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 31688084af5a..21b333f32316 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -124,12 +124,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-2.0${suffix}";
-    suffix = "pre5943_52c777a7";
+    suffix = "pre5950_3a5a241b";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "52c777a79318c85c8fbd8c02174a03511de278db";
-      sha256 = "0qwmyy7l16djrlksfpjfkfkh5v9s0cyg6ca2809m1qb6swfzqqdf";
+      rev = "3a5a241b3209f14f8801b902ba20b5cb0666c9df";
+      sha256 = "0cwjyhgyfzi2dz561nj897zhkbyx6lzi49avcyia2pr4498jcl6k";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix
new file mode 100644
index 000000000000..0c5691a1e106
--- /dev/null
+++ b/pkgs/tools/security/hash_extender/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "hash_extender-${version}";
+  version = "2017-04-10";
+
+  src = fetchFromGitHub {
+    owner = "iagox86";
+    repo = "hash_extender";
+    rev = "d27581e062dd0b534074e11d7d311f65a6d7af21";
+    sha256 = "1npwbgqaynjh5x39halw43i116v89sxkpa1g1bbvc1lpi8hkhhcb";
+  };
+
+  buildInputs = [ openssl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp hash_extender $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tool to automate hash length extension attacks";
+    homepage = https://github.com/iagox86/hash_extender;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ geistesk ];
+  };
+}
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index d03c387a7c6c..13bebe10c623 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "spectre-meltdown-checker-${version}";
-  version = "0.34";
+  version = "0.35";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
     rev = "v${version}";
-    sha256 = "0jlqxzii883yl5iqmywqqqjlhgswn033566a3vpspycj3sr8zrd2";
+    sha256 = "0pzs6iznrar5zkg92gsh6d0zhdi715zwqcb8hh1aaykx9igjb1xw";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
new file mode 100644
index 000000000000..1381f13fd3c5
--- /dev/null
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "acpica-tools-${version}";
+  version = "20180209";
+
+  src = fetchurl {
+    url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
+    sha256 = "1rpdfwa4vwnvyxdp9ygqjckmabc3s8kyg3jyq4n4f0rhr1zl4zy5";
+  };
+
+  NIX_CFLAGS_COMPILE = "-O3";
+
+  enableParallelBuilding = true;
+
+  buildFlags = [
+    "acpibin"
+    "acpidump"
+    "acpiexec"
+    "acpihelp"
+    "acpinames"
+    "acpixtract"
+  ];
+
+  nativeBuildInputs = [ bison flex ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "ACPICA Tools";
+    homepage = "https://www.acpica.org/";
+    license = with licenses; [ gpl2 bsd3 ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ tadfisher ];
+  };
+}
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 6b062513483d..7f20e8135011 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,27 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "30";
+  version = "34";
 
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "1pghj019qr7qpqd9rxfhsr1hm3s0w1hd5cdndpl07vhys8hy4a8a";
+    sha256 = "0ycrdaz0ijkm3xb9fnwzhwi0pdj5c6s636wj4i6lbjbrijbzn4x5";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ popt ];
 
-  postPatch = ''
-     substituteInPlace src/Makefile --replace "-static" ""
-  '';
-
-  installFlags = [
+  makeFlags = [
+    "prefix=$(out)"
     "libdir=$(out)/lib"
-    "mandir=$(out)/share/man"
-    "includedir=$(out)/include"
-    "bindir=$(out)/bin"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 9a93ec2d7674..a93ec8e4e4c9 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -1,23 +1,28 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, asciidoc, docbook_xsl, libxslt  }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "0z3f83vhy464k93bc55i9lr6z41163q96if938p9ndhx2q3a20ql";
+    sha256 = "0ha46vhma2diqxfgasdc9gwlkcrlhc4l65nayvdy4m2ah5bm4qp6";
   };
 
-  cargoSha256 = "1d6s01gmyfzb0vdf7flq6nvlapwcgbj0mzcprzyg4nj5gjkvznrn";
+  cargoSha256 = "0q44qa9myrzg42q0lvclpk5nypmf0q7v3xy5nnsb28j3imvcrs4p";
+
+  nativeBuildInputs = [ asciidoc docbook_xsl libxslt ];
 
   preFixup = ''
     mkdir -p "$out/man/man1"
-    cp "$src/doc/rg.1" "$out/man/man1"
+    cp target/release/build/ripgrep-*/out/rg.1 "$out/man/man1/"
+
+    mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
+    cp target/release/build/ripgrep-*/out/rg.bash "$out/share/bash-completion/completions/"
+    cp target/release/build/ripgrep-*/out/rg.fish "$out/share/fish/vendor_completions.d/"
+    cp "$src/complete/_rg" "$out/share/zsh/site-functions/"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix
new file mode 100644
index 000000000000..527c47ffc34c
--- /dev/null
+++ b/pkgs/tools/virtualization/govc/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+  
+buildGoPackage rec {
+  name = "govc-${version}";
+  version = "0.16.0";
+
+  goPackagePath = "github.com/vmware/govmomi";
+
+  subPackages = [ "govc" ];
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "vmware";
+    repo = "govmomi";
+    sha256 = "09fllx7l2hsjrv1jl7g06xngjy0xwn5n5zng6x8dspgsl6kblyqp";
+  };
+
+  meta = {
+    description = "A vSphere CLI built on top of govmomi";
+    homepage = https://github.com/vmware/govmomi/tree/master/govc;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nicknovitski ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 948a6afb31ce..7e5a97490add 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -171,6 +171,8 @@ with pkgs;
 
   fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };
 
+  graph-easy = callPackage ../tools/graphics/graph-easy { };
+
   packer = callPackage ../development/tools/packer { };
 
   mht2htm = callPackage ../tools/misc/mht2htm { };
@@ -318,9 +320,9 @@ with pkgs;
   makeWrapper = makeSetupHook { deps = [ dieHook ]; }
                               ../build-support/setup-hooks/make-wrapper.sh;
 
-  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
+  makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }:
     callPackage ../build-support/kernel/modules-closure.nix {
-      inherit kernel rootModules allowMissing;
+      inherit kernel firmware rootModules allowMissing;
     };
 
   mkShell = callPackage ../build-support/mkshell { };
@@ -405,6 +407,8 @@ with pkgs;
     ffmpeg = ffmpeg_1;
   };
 
+  acpica-tools = callPackage ../tools/system/acpica-tools { };
+
   actdiag = pythonPackages.actdiag;
 
   actkbd = callPackage ../tools/system/actkbd { };
@@ -1262,6 +1266,8 @@ with pkgs;
 
   meson = callPackage ../development/tools/build-managers/meson { };
 
+  mp3blaster = callPackage ../applications/audio/mp3blaster { };
+
   mp3fs = callPackage ../tools/filesystems/mp3fs { };
 
   mpdas = callPackage ../tools/audio/mpdas { };
@@ -1567,6 +1573,8 @@ with pkgs;
 
   connman-gtk = callPackage ../tools/networking/connman-gtk { };
 
+  connman-ncurses = callPackage ../tools/networking/connman-ncurses { };
+
   connman-notify = callPackage ../tools/networking/connman-notify { };
 
   connmanui = callPackage ../tools/networking/connmanui { };
@@ -2505,6 +2513,8 @@ with pkgs;
 
   gource = callPackage ../applications/version-management/gource { };
 
+  govc = callPackage ../tools/virtualization/govc { };
+
   gpart = callPackage ../tools/filesystems/gpart { };
 
   gparted = callPackage ../tools/misc/gparted { };
@@ -2689,6 +2699,8 @@ with pkgs;
 
   hashcat = callPackage ../tools/security/hashcat { };
 
+  hash_extender = callPackage ../tools/security/hash_extender { };
+
   hash-slinger = callPackage ../tools/security/hash-slinger { };
 
   hal-flash = callPackage ../os-specific/linux/hal-flash { };
@@ -3146,6 +3158,8 @@ with pkgs;
 
   minisign = callPackage ../tools/security/minisign { };
 
+  ministat = callPackage ../tools/misc/ministat { };
+
   mmv = callPackage ../tools/misc/mmv { };
 
   morituri = callPackage ../applications/audio/morituri { };
@@ -4190,6 +4204,8 @@ with pkgs;
     libpng = libpng12;
   };
 
+  plotinus = callPackage ../tools/misc/plotinus { };
+
   plotutils = callPackage ../tools/graphics/plotutils { };
 
   plowshare = callPackage ../tools/misc/plowshare { };
@@ -4410,6 +4426,8 @@ with pkgs;
 
   recoll = callPackage ../applications/search/recoll { };
 
+  reflex = callPackage ../development/tools/reflex { };
+
   reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
 
   reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
@@ -7279,8 +7297,7 @@ with pkgs;
   bam = callPackage ../development/tools/build-managers/bam {};
 
   bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
-  bazel_0_9 = callPackage ../development/tools/build-managers/bazel { };
-  bazel = bazel_0_9;
+  bazel = callPackage ../development/tools/build-managers/bazel { };
 
   bear = callPackage ../development/tools/build-managers/bear { };
 
@@ -12044,6 +12061,8 @@ with pkgs;
 
   grafana = callPackage ../servers/monitoring/grafana { };
 
+  h2o = callPackage ../servers/http/h2o { };
+
   haka = callPackage ../tools/security/haka { };
 
   heapster = callPackage ../servers/monitoring/heapster { };
@@ -12302,7 +12321,8 @@ with pkgs;
 
   softether_4_18 = callPackage ../servers/softether/4.18.nix { };
   softether_4_20 = callPackage ../servers/softether/4.20.nix { };
-  softether = softether_4_20;
+  softether_4_25 = callPackage ../servers/softether/4.25.nix { };
+  softether = softether_4_25;
 
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
@@ -12726,7 +12746,7 @@ with pkgs;
   fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
   fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { };
 
-  fwupd = callPackage ../os-specific/linux/firmware/fwupd { inherit (gnome2) gtk_doc; inherit (python3Packages) pygobject3 pillow; };
+  fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
 
   fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { };
 
@@ -13402,6 +13422,8 @@ with pkgs;
 
   gomodifytags = callPackage ../development/tools/gomodifytags { };
 
+  gotests = callPackage ../development/tools/gotests { };
+
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
@@ -14152,6 +14174,8 @@ with pkgs;
 
   terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
 
+  tex-gyre = callPackage ../data/fonts/tex-gyre { };
+
   tex-gyre-bonum-math = callPackage ../data/fonts/tex-gyre-math { variant = "bonum"; };
 
   tex-gyre-pagella-math = callPackage ../data/fonts/tex-gyre-math { variant = "pagella"; };
@@ -14562,6 +14586,8 @@ with pkgs;
 
   cava = callPackage ../applications/audio/cava { };
 
+  cask = callPackage ../development/tools/build-managers/cask { };
+
   cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
   cbatticon = callPackage ../applications/misc/cbatticon { };
@@ -16482,6 +16508,8 @@ with pkgs;
 
   smtube = libsForQt5.callPackage ../applications/video/smtube {};
 
+  stride = callPackage ../applications/networking/instant-messengers/stride { };
+
   sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
 
   speedread = callPackage ../applications/misc/speedread { };
@@ -16659,6 +16687,8 @@ with pkgs;
 
   pamixer = callPackage ../applications/audio/pamixer { };
 
+  ncpamixer = callPackage ../applications/audio/ncpamixer { };
+
   pan = callPackage ../applications/networking/newsreaders/pan {
     spellChecking = false;
   };
@@ -17354,6 +17384,8 @@ with pkgs;
 
   surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
 
+  sunvox = callPackage ../applications/audio/sunvox { };
+
   swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
 
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
@@ -17362,7 +17394,11 @@ with pkgs;
 
   syncplay = callPackage ../applications/networking/syncplay { };
 
-  syncthing = callPackage ../applications/networking/syncthing { };
+  inherit (callPackages ../applications/networking/syncthing { })
+    syncthing
+    syncthing-cli
+    syncthing-discovery
+    syncthing-relay;
 
   syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { };
 
@@ -17956,6 +17992,8 @@ with pkgs;
       );
   };
 
+  wsjtx = qt5.callPackage ../applications/misc/wsjtx { };
+
   wtftw = callPackage ../applications/window-managers/wtftw {};
 
   wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
@@ -18330,6 +18368,7 @@ with pkgs;
 
   cataclysm-dda = callPackage ../games/cataclysm-dda {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
+    ncurses = ncurses5;
   };
 
   cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix {
@@ -18431,6 +18470,8 @@ with pkgs;
 
   factorio = callPackage ../games/factorio { releaseType = "alpha"; };
 
+  factorio-experimental = callPackage ../games/factorio { releaseType = "alpha"; experimental = true; };
+
   factorio-headless = callPackage ../games/factorio { releaseType = "headless"; };
 
   factorio-demo = callPackage ../games/factorio { releaseType = "demo"; };
@@ -19004,6 +19045,7 @@ with pkgs;
   gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
 
   gnomeExtensions = {
+    appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { };
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
     clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
     dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
@@ -19539,6 +19581,13 @@ with pkgs;
     cudnnSupport = cudaSupport;
   };
 
+  caffe2 = callPackage ../development/libraries/science/math/caffe2 {
+    eigen3 = eigen3_3;
+    inherit (python3Packages) python future six numpy pydot;
+    protobuf = protobuf3_1;
+    python-protobuf = python3Packages.protobuf3_1;
+  };
+
   cntk = callPackage ../applications/science/math/cntk rec {
     cudaSupport = pkgs.config.cudaSupport or false;
     cudnnSupport = cudaSupport;
@@ -19910,6 +19959,8 @@ with pkgs;
 
   hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; };
 
+  hyperfine = callPackage ../tools/misc/hyperfine { };
+
   epkowa = callPackage ../misc/drivers/epkowa { };
 
   illum = callPackage ../tools/system/illum { };
@@ -20590,4 +20641,6 @@ with pkgs;
   tlwg = callPackage ../data/fonts/tlwg { };
 
   safeDiscardStringContext = callPackage ../build-support/safe-discard-string-context.nix { };
+
+  simplehttp2server = callPackage ../servers/simplehttp2server { };
 }
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 12a62ba3851b..419fc485dd01 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -69,7 +69,7 @@ in rec {
     version = "8.6.1";
   };
   coq_8_7 = callPackage ../applications/science/logic/coq {
-    version = "8.7.1";
+    version = "8.7.2";
   };
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 1a37d58c70d1..43182b3f2aaa 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -331,13 +331,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   Dafny = buildDotnetPackage rec {
     baseName = "Dafny";
-    version = "1.9.8";
+    version = "2.1.0";
 
     src = fetchurl {
       url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz";
-      sha256 = "0n4pk4cv7d2zsn4xmyjlxvpfl9avq79r06c7kzmrng24p3k4qj6s";
+      sha256 = "1iyhy0zpi6wvqif7826anzgdipgsy5bk775ds9qqwfw27j7x6fy5";
     };
 
+    postPatch = ''
+      sed -i \
+        -e 's/ Visible="False"//' \
+        -e "s/Exists(\$(CodeContractsInstallDir))/Exists('\$(CodeContractsInstallDir)')/" \
+        Source/*/*.csproj
+    '';
+
     preBuild = ''
       ln -s ${pkgs.z3} Binaries/z3
     '';
@@ -345,7 +352,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     buildInputs = [ Boogie ];
 
     xBuildFiles = [ "Source/Dafny.sln" ];
-    xBuildFlags = [ ];
+    xBuildFlags = [ "/p:Configuration=Checked" "/p:Platform=Any CPU" "/t:Rebuild" ];
 
     outputFiles = [ "Binaries/*" ];
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9f2c93498ea6..689c088abdcb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4834,10 +4834,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Encode = buildPerlPackage rec {
-    name = "Encode-2.95";
+    name = "Encode-2.96";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
-      sha256 = "d662794c6f834382527f67ca62e1715887f504cfd09e119a1302e584dd3cdcde";
+      sha256 = "5dcb19fa5e62c6ca9294f28e9f4676f36477b1025f7e0dca92479633334b3cb1";
     };
     meta = {
       description = "Character encodings in Perl";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ef5b2b49680..5608cd85ef26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -230,7 +230,7 @@ in {
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
-  
+
   gssapi = callPackage ../development/python-modules/gssapi { };
 
   h5py = callPackage ../development/python-modules/h5py {
@@ -254,7 +254,7 @@ in {
   };
 
   mwoauth = callPackage ../development/python-modules/mwoauth { };
-  
+
   neuron = pkgs.neuron.override {
     inherit python;
   };
@@ -359,7 +359,7 @@ in {
   };
 
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
-  
+
   python-sql = callPackage ../development/python-modules/python-sql { };
 
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };
@@ -5152,6 +5152,30 @@ in {
 
   };
 
+  imbalanced-learn = buildPythonPackage rec {
+    name = "imbalanced-learn-${version}";
+    version = "0.3.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/i/imbalanced-learn/${name}.tar.gz";
+      sha256 = "0j76m0rrsvyqj9bimky9m7b609y5v6crf9apigww3xvcnchhj901";
+    };
+
+    preConfigure = ''
+      export HOME=$PWD
+    '';
+
+    propagatedBuildInputs = with self; [ scikitlearn ];
+    buildInputs = with self; [ nose pytest pandas ];
+
+    meta = {
+      description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance";
+      homepage = https://github.com/scikit-learn-contrib/imbalanced-learn;
+      license = with licenses; [ mit ];
+    };
+
+  };
+
   imread = buildPythonPackage rec {
     name = "python-imread-${version}";
     version = "0.6";
@@ -5262,10 +5286,14 @@ in {
     };
   };
 
+  JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi {};
+
   jdcal = callPackage ../development/python-modules/jdcal { };
 
   internetarchive = callPackage ../development/python-modules/internetarchive {};
 
+  JPype1 = callPackage ../development/python-modules/JPype1 {};
+
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier {};
 
   jug = callPackage ../development/python-modules/jug {};
@@ -14657,7 +14685,7 @@ in {
       substituteInPlace "setup.cfg"                                     \
               --replace "/usr/local/include" "${pkgs.sqlite.dev}/include"   \
               --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"
-      export LDSHARED="$CC -pthread -shared"
+      ${stdenv.lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}
     '';
 
     meta = {