From 35954ae8bab6f50999766747d8239febb33cef72 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Fri, 8 Sep 2017 23:31:47 -0800
Subject: [PATCH 01/77] kproperty: init at 3.0.2

---
 .../libraries/kproperty/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/kproperty/default.nix

diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix
new file mode 100644
index 00000000000..52b5d944b41
--- /dev/null
+++ b/pkgs/development/libraries/kproperty/default.nix
@@ -0,0 +1,29 @@
+{
+  mkDerivation, lib, fetchurl,
+  extra-cmake-modules,
+  qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons
+}:
+
+mkDerivation rec {
+  pname = "kproperty";
+  version = "3.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ];
+
+  propagatedBuildInputs = [ qtbase ];
+
+  meta = with lib; {
+    description = "A property editing framework with editor widget similar to what is known from Qt Designer";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zraexy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d30e7f1fab..b0ef68de685 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10125,6 +10125,8 @@ with pkgs;
 
     kdiagram = callPackage ../development/libraries/kdiagram { };
 
+    kproperty = callPackage ../development/libraries/kproperty { };
+
     kirigami = kirigami_1;
 
     libcommuni = callPackage ../development/libraries/libcommuni { };

From b3bbfd9fc49822c706b96d259920587b4e33d0d9 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Fri, 8 Sep 2017 23:33:41 -0800
Subject: [PATCH 02/77] kreport: init at 3.0.2

---
 .../development/libraries/kreport/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/kreport/default.nix

diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
new file mode 100644
index 00000000000..561e964c961
--- /dev/null
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -0,0 +1,27 @@
+{
+  mkDerivation, lib, fetchurl,
+  extra-cmake-modules,
+  qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2
+}:
+
+mkDerivation rec {
+  pname = "kreport";
+  version = "3.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python2 ];
+
+  meta = with lib; {
+    description = "A framework for creation and generation of reports in multiple formats";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zraexy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0ef68de685..67fc08c9d4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10127,6 +10127,8 @@ with pkgs;
 
     kproperty = callPackage ../development/libraries/kproperty { };
 
+    kreport = callPackage ../development/libraries/kreport { };
+
     kirigami = kirigami_1;
 
     libcommuni = callPackage ../development/libraries/libcommuni { };

From 635c48de8f414ffa6a465f2cb5db29a87e4aabc9 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Fri, 8 Sep 2017 23:38:19 -0800
Subject: [PATCH 03/77] kdb: init at 3.0.2

---
 pkgs/development/libraries/kdb/default.nix | 29 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/kdb/default.nix

diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
new file mode 100644
index 00000000000..399d5914c2d
--- /dev/null
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -0,0 +1,29 @@
+{
+  mkDerivation, lib, fetchurl,
+  extra-cmake-modules,
+  qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql
+}:
+
+mkDerivation rec {
+  pname = "kdb";
+  version = "3.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    sha256 = "1n11xhqk3sf4a5nzvnrnj7bj21yqqqkm2d1xzfx3q82fkyah8s49";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ];
+
+  propagatedBuildInputs = [ qtbase ];
+
+  meta = with lib; {
+    description = "A database connectivity and creation framework for various database vendors";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zraexy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67fc08c9d4d..84ffd202669 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10123,6 +10123,8 @@ with pkgs;
       kirigami_1
       kirigami_2;
 
+    kdb = callPackage ../development/libraries/kdb { };
+
     kdiagram = callPackage ../development/libraries/kdiagram { };
 
     kproperty = callPackage ../development/libraries/kproperty { };

From eb903ccc31d0ac99153893ab8d6483858a9fba8a Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Fri, 15 Sep 2017 09:04:00 -0800
Subject: [PATCH 04/77] kexi: init at 3.0.2

---
 pkgs/applications/office/kexi/default.nix | 47 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/office/kexi/default.nix

diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
new file mode 100644
index 00000000000..66aee6bd962
--- /dev/null
+++ b/pkgs/applications/office/kexi/default.nix
@@ -0,0 +1,47 @@
+{
+  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools,
+  boost, qttools, qtwebkit,
+  breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
+  kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
+  kwidgetsaddons, kxmlgui,
+  kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql
+}:
+
+mkDerivation rec {
+  pname = "kexi";
+  version = "3.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
+    sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+  buildInputs = [
+    boost qttools qtwebkit
+    breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
+    kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets
+    kwidgetsaddons kxmlgui
+    kdb kproperty kreport lcms2 libmysql marble postgresql
+  ];
+
+  propagatedUserEnvPkgs = [ kproperty ];
+
+  meta = with lib; {
+    description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker";
+    longDescription = ''
+      Kexi is a visual database applications creator.
+      It can be used for creating database schemas,
+      inserting data, performing queries, and processing data.
+      Forms can be created to provide a custom interface to your data.
+      All database objects - tables, queries and forms - are stored in the database,
+      making it easy to share data and design.
+    '';
+    homepage = http://kexi-project.org/;
+    maintainers = with maintainers; [ zraexy ];
+    platforms = platforms.linux;
+    license = with licenses; [ gpl2 lgpl2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84ffd202669..31ff47663db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15019,6 +15019,8 @@ with pkgs;
 
   kermit = callPackage ../tools/misc/kermit { };
 
+  kexi = libsForQt5.callPackage ../applications/office/kexi { };
+
   keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { };
 
   keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { };

From 3f2a3d299bf47ec49e19e079e394438129b1c6c5 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Fri, 15 Sep 2017 09:06:49 -0800
Subject: [PATCH 05/77] calligra: 2.9.11 -> 3.0.1

---
 pkgs/applications/office/calligra/2.nix       | 55 ++++++++++++++++
 pkgs/applications/office/calligra/default.nix | 66 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  7 +-
 3 files changed, 99 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/applications/office/calligra/2.nix

diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix
new file mode 100644
index 00000000000..76027f29a70
--- /dev/null
+++ b/pkgs/applications/office/calligra/2.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
+, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
+, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
+, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
+, kactivities, okular, git, oxygen-icons5, makeWrapper
+# TODO: not found
+#, xbase, openjpeg
+# TODO: package libWPS, Spnav, m2mml, LibEtonyek
+}:
+
+stdenv.mkDerivation rec {
+  name = "calligra-2.9.11";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${name}/${name}.tar.xz";
+    sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
+  };
+
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
+
+  buildInputs = [
+    kdelibs4 lcms2 libpng eigen
+    exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
+    libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
+    freetds fftw glew libkdcraw opencolorio kdepimlibs
+    kactivities okular git
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapProgram $i \
+        --prefix PATH ':' "${pstoedit.out}/bin" \
+        --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A suite of productivity applications";
+    longDescription = ''
+      Calligra Suite is a set of applications written to help
+      you to accomplish your work. Calligra includes efficient
+      and capable office components: Words for text processing,
+      Sheets for computations, Stage for presentations, Plan for
+      planning, Flow for flowcharts, Kexi for database creation,
+      Krita for painting and raster drawing, and Karbon for
+      vector graphics.
+    '';
+    homepage = http://calligra.org;
+    maintainers = with maintainers; [ phreedom ebzzry ];
+    inherit (kdelibs4.meta) platforms;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 76027f29a70..bec19d675cb 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,55 +1,65 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
-, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
-, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
-, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
-, kactivities, okular, git, oxygen-icons5, makeWrapper
-# TODO: not found
-#, xbase, openjpeg
-# TODO: package libWPS, Spnav, m2mml, LibEtonyek
+{
+  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
+  boost, qtwebkit, qtx11extras, shared_mime_info,
+  breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
+  kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
+  kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross,
+  knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
+  kwindowsystem, kxmlgui, sonnet, threadweaver,
+  kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
+  eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen,
+  librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
+  poppler, pstoedit, qca-qt5, vc
+# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
 }:
 
-stdenv.mkDerivation rec {
-  name = "calligra-2.9.11";
+mkDerivation rec {
+  pname = "calligra";
+  version = "3.0.1";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${name}/${name}.tar.xz";
-    sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
+    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+    sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
   };
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
 
   buildInputs = [
-    kdelibs4 lcms2 libpng eigen
-    exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
-    libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
-    freetds fftw glew libkdcraw opencolorio kdepimlibs
-    kactivities okular git
+    boost qtwebkit qtx11extras shared_mime_info
+    kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
+    kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews
+    kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
+    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver
+    kcontacts akonadi akonadi-calendar akonadi-contacts
+    eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge
+    libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
   ];
 
-  enableParallelBuilding = true;
+  propagatedUserEnvPkgs = [ kproperty ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
   postInstall = ''
     for i in $out/bin/*; do
       wrapProgram $i \
         --prefix PATH ':' "${pstoedit.out}/bin" \
-        --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
+        --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share"
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A suite of productivity applications";
     longDescription = ''
       Calligra Suite is a set of applications written to help
       you to accomplish your work. Calligra includes efficient
       and capable office components: Words for text processing,
-      Sheets for computations, Stage for presentations, Plan for
-      planning, Flow for flowcharts, Kexi for database creation,
-      Krita for painting and raster drawing, and Karbon for
+      Sheets for computations, Plan for planning, and Karbon for
       vector graphics.
     '';
-    homepage = http://calligra.org;
-    maintainers = with maintainers; [ phreedom ebzzry ];
-    inherit (kdelibs4.meta) platforms;
-    license = licenses.gpl2;
+    homepage = https://www.calligra.org/;
+    maintainers = with maintainers; [ phreedom ebzzry zraexy ];
+    platforms = platforms.linux;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31ff47663db..6d4e514328a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13674,10 +13674,15 @@ with pkgs;
 
   calibre = libsForQt5.callPackage ../applications/misc/calibre { };
 
-  calligra = kde4.callPackage ../applications/office/calligra {
+  calligra2 = kde4.callPackage ../applications/office/calligra/2.nix {
     vc = vc_0_7;
   };
 
+  calligra = libsForQt5.callPackage ../applications/office/calligra {
+    inherit (kdeApplications) akonadi-calendar akonadi-contacts;
+    openjpeg = openjpeg_1;
+  };
+
   camlistore = callPackage ../applications/misc/camlistore { };
 
   canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };

From 7463ae4572f33983658e8c6dba9defb81c9edf83 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 18 Sep 2017 19:48:16 +0200
Subject: [PATCH 06/77] nixpkgs: add stdenv tests to unstable and darwin-tested

---
 pkgs/top-level/release.nix | 42 +++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 41ab5da8067..d6cefb8d184 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -38,13 +38,31 @@ let
           meta.description = "Release-critical builds for the Nixpkgs darwin channel";
           constituents =
             [ jobs.tarball
-              jobs.stdenv.x86_64-darwin
-              jobs.ghc.x86_64-darwin
               jobs.cabal2nix.x86_64-darwin
-              jobs.ruby.x86_64-darwin
-              jobs.python.x86_64-darwin
-              jobs.rustc.x86_64-darwin
+              jobs.emacs.x86_64-darwin
+              jobs.ghc.x86_64-darwin
+              jobs.git.x86_64-darwin
               jobs.go.x86_64-darwin
+              jobs.mysql.x86_64-darwin
+              jobs.nix-repl.x86_64-darwin
+              jobs.nix.x86_64-darwin
+              jobs.nox.x86_64-darwin
+              jobs.openssh.x86_64-darwin
+              jobs.openssl.x86_64-darwin
+              jobs.postgresql.x86_64-darwin
+              jobs.python.x86_64-darwin
+              jobs.python3.x86_64-darwin
+              jobs.ruby.x86_64-darwin
+              jobs.rustc.x86_64-darwin
+              jobs.stdenv.x86_64-darwin
+              jobs.vim.x86_64-darwin
+
+              jobs.tests.cc-wrapper.x86_64-darwin
+              jobs.tests.cc-wrapper-clang.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-39.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin
+              jobs.tests.stdenv-inputs.x86_64-darwin
               jobs.tests.macOSSierraShared.x86_64-darwin
             ];
         };
@@ -76,6 +94,20 @@ let
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin
               jobs.vim.x86_64-darwin
+
+              jobs.tests.cc-wrapper.x86_64-linux
+              jobs.tests.cc-wrapper.x86_64-darwin
+              jobs.tests.cc-wrapper-clang.x86_64-linux
+              jobs.tests.cc-wrapper-clang.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx.x86_64-linux
+              jobs.tests.cc-wrapper-libcxx.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-39.x86_64-linux
+              jobs.tests.cc-wrapper-clang-39.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-39.x86_64-linux
+              jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin
+              jobs.tests.stdenv-inputs.x86_64-linux
+              jobs.tests.stdenv-inputs.x86_64-darwin
+              jobs.tests.macOSSierraShared.x86_64-darwin
             ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
 

From 5449dd2bb743b791590647cee4da24699bbbddf8 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 27 Sep 2017 16:10:37 +0000
Subject: [PATCH 07/77] mednafen: 0.9.47 -> 0.9.48, disable PIC, unversioned
 docs

---
 pkgs/misc/emulators/mednafen/default.nix | 42 ++++++++++++++----------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index a03695eed77..1172a89caf3 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -1,36 +1,42 @@
-{ stdenv, fetchurl, pkgconfig
-, libX11, mesa, freeglut
-, libjack2, libcdio, libsndfile, libsamplerate
-, SDL, SDL_net, zlib
-}:
+{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2
+, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
-
   name = "mednafen-${version}";
-  version = "0.9.47";
+  version = "0.9.48";
 
   src = fetchurl {
     url = "https://mednafen.github.io/releases/files/${name}.tar.xz";
-    sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si";
+    sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k";
   };
 
-  buildInputs =
-  [ pkgconfig libX11 mesa freeglut libjack2 libcdio
-    libsndfile libsamplerate SDL SDL_net zlib ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [
+    freeglut
+    mesa
+    libcdio
+    libjack2
+    libsamplerate
+    libsndfile
+    libX11
+    SDL
+    SDL_net
+    zlib
+  ];
+
+  hardeningDisable = [ "pic" ];
 
-  # Install docs
   postInstall = ''
-    mkdir -p $out/share/doc/$name
-    cd Documentation
-    install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt
+    mkdir -p $out/share/doc
+    mv Documentation $out/share/doc/mednafen
   '';
 
   meta = with stdenv.lib; {
     description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
-    homepage = http://mednafen.github.io/;
+    homepage = https://mednafen.github.io/;
     license = licenses.gpl2;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From 333a425e36cc2305fc70fc15266645a0f1281d80 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Wed, 27 Sep 2017 16:13:38 +0000
Subject: [PATCH 08/77] mednafen-server: use $out/share/mednafen-server for
 standard.conf

---
 pkgs/misc/emulators/mednafen/server.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 91a74171da9..75eeeea4c00 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -1,25 +1,21 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-
   name = "mednafen-server-${version}";
   version = "0.5.2";
 
   src = fetchurl {
-    url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz";
+    url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz";
     sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq";
   };
 
-  postInstall = ''
-    mkdir -p $out/share/$name
-    install -m 644 -t $out/share/$name standard.conf
-  '';
+  postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf";
 
   meta = with stdenv.lib; {
     description = "Netplay server for Mednafen";
-    homepage = http://mednafen.github.io/;
+    homepage = https://mednafen.github.io/;
     license = licenses.gpl2;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From a093bf8b88606c00188227245600038f5422f86e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 1 Oct 2017 14:47:41 +0200
Subject: [PATCH 09/77] gnome3.gnome_control_center: fix thumbnailers path

Just like Nautilus (see #29970), GNOME Control Center also uses
gnome-desktop for generating thumbnails. In particular, it tries
to make a thumbnail from a file choosen as a profile picture, and
when it does not succeed, it will not allow that file to be chosen.
Of course, whithout a thumbnailer, it will always fail.

https://github.com/GNOME/gnome-control-center/blob/43129a1cfd30374c3ff45c54eae9ee5cd68ae1b6/panels/user-accounts/um-photo-dialog.c#L190-L192

Since gnome-desktop scans `thumbnailers` directories under the paths
in `XDG_DATA_DIRS`, gdk-pixbuf  had to be added to the path to provide
access to image thumbnailer.
---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index b116c2902da..a6cc7ec962a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
   preFixup = with gnome3; ''
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share"
+      # Thumbnailers (for setting user profile pictures)
+      --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+      --prefix XDG_DATA_DIRS : "${librsvg}/share"
     )
     for i in $out/share/applications/*; do
       substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"

From dbb8958fefd486a3eb53c8db1af7e2452047a608 Mon Sep 17 00:00:00 2001
From: bricewge <brice.wge@gmail.com>
Date: Mon, 2 Oct 2017 23:39:08 +0200
Subject: [PATCH 10/77] git-crypt: patch don't hard code path to git-crypt

Fix #30034
---
 .../version-management/git-and-tools/git-crypt/default.nix   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index e5e67605970..98cce617833 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl makeWrapper ];
 
+  patchPhase = ''
+    substituteInPlace commands.cpp \
+      --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"'
+  '';
+
   installPhase = ''
     make install PREFIX=$out
     wrapProgram $out/bin/* --prefix PATH : ${gnupg1compat}/bin

From 98cb45ece3cfc0af195c5023481385f85fcf46ae Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Mon, 2 Oct 2017 19:06:29 -0400
Subject: [PATCH 11/77] Update keepassx-community to 2.2.1

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 6ae86486b47..5de202f8f73 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc";
+    sha256 = "1g9qz81i7rsfywl03bwl3cg7q91vp24519b91y5liiyrqrq0zx94";
   };
 
   cmakeFlags = [ 

From 9c53b9cff9ca6cb50e5d02ccd05e7453c8f6d08a Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Tue, 3 Oct 2017 14:05:57 -0400
Subject: [PATCH 12/77] mupdf: fix library linking

Previously, libmupdf.so did not have DT_NEEDED references to its
dependencies. Packages which linked against libmupdf would have to also
manually link against its dependencies as well.
---
 pkgs/applications/misc/mupdf/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 9fe275b490c..5651405633f 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchpatch, pkgconfig
-, freetype, harfbuzz, openjpeg, jbig2dec
+, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg
 , enableX11 ? true, libX11, libXext
 , enableCurl ? true, curl, openssl
 }:
@@ -26,11 +26,17 @@ stdenv.mkDerivation rec {
       url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614";
       sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc";
     })
+
+    (fetchpatch {
+      name = "mupdf-1.11-shared_libs-1.patch";
+      url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.11-shared_libs-1.patch";
+      sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j";
+    })
   ];
 
   makeFlags = [ "prefix=$(out)" ];
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ freetype harfbuzz openjpeg jbig2dec ]
+  buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ]
                 ++ lib.optionals enableX11 [ libX11 libXext ]
                 ++ lib.optionals enableCurl [ curl openssl ];
   outputs = [ "bin" "dev" "out" "man" "doc" ];
@@ -41,13 +47,6 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    for i in $out/lib/*.a; do
-      so="''${i%.a}.so"
-      gcc -shared -o $so.${version} -Wl,--whole-archive $i -Wl,--no-whole-archive
-      ln -s $so.${version} $so
-      rm $i
-    done
-
     mkdir -p "$out/lib/pkgconfig"
     cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF
     prefix=$out

From 7f511709deace4f9f28012165b84c7335ae781d7 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Tue, 3 Oct 2017 14:04:56 -0400
Subject: [PATCH 13/77] k2pdfopt: fix mupdf linking

---
 pkgs/applications/misc/k2pdfopt/default.nix    | 18 +++++++++++++++---
 pkgs/applications/misc/k2pdfopt/k2pdfopt.patch |  6 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 587e6a588a7..03ed7554af5 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -2,7 +2,7 @@
 , zlib, libpng
 , enableGSL ? true, gsl
 , enableGhostScript ? true, ghostscript
-, enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf
+, enableMuPDF ? true, mupdf
 , enableJPEG2K ? true, jasper
 , enableDJVU ? true, djvulibre
 , enableGOCR ? false, gocr # Disabled by default due to crashes
@@ -51,7 +51,19 @@ stdenv.mkDerivation rec {
          url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27";
          sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693";
         })
+
+        (fetchpatch {
+          name = "mupdf-1.10a-shared_libs-1.patch";
+          url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.10a-shared_libs-1.patch";
+          sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab";
+        })
       ];
+
+      # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11
+      preConfigure = ''
+        # Don't remove mujs because upstream version is incompatible
+        rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+      '';
     });
     leptonica_modded = leptonica.overrideAttrs (attrs: {
       prePatch = ''
@@ -75,8 +87,8 @@ stdenv.mkDerivation rec {
     [ zlib libpng ] ++
     optional enableGSL gsl ++
     optional enableGhostScript ghostscript ++
-    optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++
-    optionals enableJPEG2K [ jasper ] ++
+    optional enableMuPDF mupdf_modded ++
+    optional enableJPEG2K jasper ++
     optional enableDJVU djvulibre ++
     optional enableGOCR gocr ++
     optionals enableTesseract [ leptonica_modded tesseract_modded ];
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
index a393e30fc72..cf7e4896b80 100644
--- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
+++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
@@ -17,11 +17,11 @@ index 4a2378b..502c477 100644
 -# willus.h
 -# HAVE_GSL_LIB
 +pkg_check_modules(GSL gsl)
-+if(MUPDF_FOUND)
++if(GSL_FOUND)
 +  set(HAVE_GSL_LIB 1)
 +  include_directories(SYSTEM ${GSL_INCLUDEDIR})
 +  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
-+endif(MUPDF_FOUND)
++endif(GSL_FOUND)
  
  
  # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
@@ -30,7 +30,7 @@ index 4a2378b..502c477 100644
    message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
    set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} 
 -    -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
-+    -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz
++ 
    )
  endif(MUPDF_FOUND)
  

From a8972678bf4d26f1b046335a127cb4311e0f50ae Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 02:21:00 +0200
Subject: [PATCH 14/77] vala: add 0.38.0

---
 pkgs/development/compilers/vala/default.nix | 18 +++++++++++++-----
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 42b81a21a67..baf48d7a532 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
-, glib, libiconv, libintlOrEmpty
+{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz
+, glib, libiconv, libintlOrEmpty, libtool, expat
 }:
 
 let
-  generic = { major, minor, sha256 }:
+  generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }:
   stdenv.mkDerivation rec {
     name = "vala-${major}.${minor}";
 
@@ -12,9 +12,9 @@ let
       inherit sha256;
     };
 
-    nativeBuildInputs = [ pkgconfig flex bison libxslt ];
+    nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs;
 
-    buildInputs = [ glib libiconv ] ++ libintlOrEmpty;
+    buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs;
 
     meta = with stdenv.lib; {
       description = "Compiler for GObject type system";
@@ -57,5 +57,13 @@ in rec {
     sha256  = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m";
   };
 
+  vala_0_38 = generic {
+    major   = "0.38";
+    minor   = "1";
+    sha256  = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h";
+    extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ];
+    extraBuildInputs = [ graphviz ];
+  };
+
   vala = vala_0_34;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da57a8eda06..6e54e3f9ee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6264,6 +6264,7 @@ with pkgs;
     vala_0_28
     vala_0_32
     vala_0_34
+    vala_0_38
     vala;
 
   valadoc = callPackage ../development/tools/valadoc { };

From 5f90e527a415436da01390300065bb140cce9ddc Mon Sep 17 00:00:00 2001
From: Teal Gaure <~@Teal.Gr>
Date: Wed, 4 Oct 2017 13:02:36 +0200
Subject: [PATCH 15/77] dovecot: 2.2.27 -> 2.2.32, dovecot_pigeonhole: 0.4.10
 -> 0.4.20

---
 pkgs/servers/mail/dovecot/default.nix                    | 4 ++--
 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 91b9ed972d8..33da203c502 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.27";
+  name = "dovecot-2.2.32";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9";
+    sha256 = "0bmwyvi1crmrca2knvknsf517x53w7gxrclwyrvrhddgw98j22qn";
   };
 
   preConfigure = ''
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 385cf7d35ba..3df0b41c2ca 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.4.10";
+  version = "0.4.20";
 
   src = fetchurl {
     url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
-    sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9";
+    sha256 = "0nxy007wmyamwj01yfiqbqjnbsd98z783b811rcavwi5iw5pvqbg";
   };
 
   buildInputs = [ dovecot openssl ];

From 97d9f0b5bba3251f5287037dc31e9c5aaae9cd61 Mon Sep 17 00:00:00 2001
From: Diego Zamboni <diego@zzamboni.org>
Date: Wed, 4 Oct 2017 21:50:21 +0200
Subject: [PATCH 16/77] vagrant: fix Ruby and libffi libraries on Darwin

On Darwin, keep the Ruby and libffi libraries and binaries bundled
with Vagrant instead of linking to the Nix ones, to avoid errors about
libraries not found.
---
 pkgs/development/tools/vagrant/default.nix | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 91c0054fe91..c61d521ecab 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -85,6 +85,22 @@ in stdenv.mkDerivation rec {
     ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin
     ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin
 
+    # libiconv: iconv
+    rm opt/vagrant/embedded/bin/iconv
+    ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
+
+    # libxml: xml2-config, xmlcatalog, xmllint
+    rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}
+    ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin
+    ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin
+    ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin
+
+    # libxslt: xslt-config, xsltproc
+    rm opt/vagrant/embedded/bin/{xslt-config,xsltproc}
+    ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin
+    ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin
+
+  '' + (stdenv.lib.optionalString (! stdenv.isDarwin) ''
     # ruby: erb, gem, irb, rake, rdoc, ri, ruby
     rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby}
     ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin
@@ -101,24 +117,10 @@ in stdenv.mkDerivation rec {
       ln -s $lib opt/vagrant/embedded/lib/''${lib##*/}
     done
 
-    # libiconv: iconv
-    rm opt/vagrant/embedded/bin/iconv
-    ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
-
-    # libxml: xml2-config, xmlcatalog, xmllint
-    rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}
-    ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin
-    ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin
-    ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin
-
-    # libxslt: xslt-config, xsltproc
-    rm opt/vagrant/embedded/bin/{xslt-config,xsltproc}
-    ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin
-    ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin
-
     # libffi
     ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6
 
+  '') + ''
     mkdir -p "$out"
     cp -r opt "$out"
     cp -r usr/bin "$out"

From f61d734bced495621215425b2685fd646fe10d1d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 4 Sep 2017 04:30:25 +0200
Subject: [PATCH 17/77] =?UTF-8?q?gnome3.pomodoro:=200.11.2=20=E2=86=92=200?=
 =?UTF-8?q?.13.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/misc/pomodoro/default.nix         | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
index 37cdfc730ab..63f59357db5 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
@@ -1,40 +1,34 @@
-{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
-  glib, gobjectIntrospection, telepathy_glib
+{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
+  dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3,
+  glib, gobjectIntrospection, libpeas
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.11.2";
+  version = "0.13.3";
   name = "gnome-shell-pomodoro-${version}";
 
   src = fetchFromGitHub {
-      owner = "codito";
-      repo = "gnome-pomodoro";
-      rev = "${version}";
-      sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l";
+    owner = "codito";
+    repo = "gnome-pomodoro";
+    rev = "${version}";
+    sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2";
   };
 
-  configureScript = ''./autogen.sh'';
+  configureScript = "./autogen.sh";
 
-  buildInputs = [
-    which intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-    gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
-    gnome3.defaultIconTheme
+  nativeBuildInputs = [
+    autoconf-archive libtool intltool appstream-glib
+    wrapGAppsHook pkgconfig
   ];
 
-  preBuild = ''
-    sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
-      vapi/Makefile
-  '';
-
-  preFixup = ''
-    wrapProgram $out/bin/gnome-pomodoro \
-        --prefix XDG_DATA_DIRS : \
-        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
-  '';
+  buildInputs = [
+    glib gobjectIntrospection libpeas
+    dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gnome3.gsettings_desktop_schemas
+    gnome3.gnome_common gnome3.gnome_shell gtk3
+    gnome3.defaultIconTheme
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/codito/gnome-shell-pomodoro;

From 0ae2e5dcbce94392cce6e5f4f7d43b48c4d5f924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 4 Oct 2017 17:48:51 -0300
Subject: [PATCH 18/77] jwm: 1621 -> 1651

---
 pkgs/applications/window-managers/jwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 83c4e6828e1..fbea1d4e9a4 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1621";
+  version = "1651";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "1cxi9yd3wwzhh06f6myk15cav7ayvzxdaxhvqb3570nwj21zlnsm";
+    sha256 = "097wqipg1h7h19a5bqdx7iq60fkjrx2niwsgg1f8cfz106yhbp6q";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From 50bca782b367b4cd0337a4dd751424b3d2fd4665 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 17 Sep 2017 17:01:54 +0200
Subject: [PATCH 19/77] simple-scan: move to gnome3 package set

---
 .../gnome-3/core}/simple-scan/default.nix                     | 0
 pkgs/desktops/gnome-3/default.nix                             | 4 +++-
 pkgs/top-level/all-packages.nix                               | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename pkgs/{applications/graphics => desktops/gnome-3/core}/simple-scan/default.nix (100%)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
similarity index 100%
rename from pkgs/applications/graphics/simple-scan/default.nix
rename to pkgs/desktops/gnome-3/core/simple-scan/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7be1f79be4c..fcb36fb8ded 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -30,7 +30,7 @@ let
   optionalPackages = with gnome3; [ baobab eog epiphany evince
     gucharmap nautilus totem vino yelp gnome-bluetooth
     gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-system-log gnome-system-monitor
+    gnome-system-log gnome-system-monitor simple-scan
     gnome_terminal gnome-user-docs evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
@@ -230,6 +230,8 @@ let
 
   rest = callPackage ./core/rest { };
 
+  simple-scan = callPackage ./core/simple-scan { };
+
   sushi = callPackage ./core/sushi { };
 
   totem = callPackage ./core/totem { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da57a8eda06..0beb4886159 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16245,7 +16245,7 @@ with pkgs;
 
   shutter = callPackage ../applications/graphics/shutter { };
 
-  simple-scan = callPackage ../applications/graphics/simple-scan { };
+  simple-scan = gnome3.simple-scan;
 
   siproxd = callPackage ../applications/networking/siproxd { };
 

From e7b277f3c5d52ff446561de10bb1821309247c68 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 5 Oct 2017 00:06:53 +0200
Subject: [PATCH 20/77] gnome3.simple-scan: move src to a separate file

---
 pkgs/desktops/gnome-3/core/simple-scan/default.nix |  9 +--------
 pkgs/desktops/gnome-3/core/simple-scan/src.nix     | 10 ++++++++++
 2 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/simple-scan/src.nix

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 0c800ce9859..0b453d5c533 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -3,14 +3,7 @@
 , gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "simple-scan-${version}";
-  version = "${major_version}.0.1";
-  major_version = "3.22";
-
-  src = fetchurl {
-    url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz";
-    sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5";
-  };
+  inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ];
   nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix
new file mode 100644
index 00000000000..cea148891a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/simple-scan/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "simple-scan-3.22.0.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz;
+    sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50";
+  };
+}

From 0e2e3afd65ee98c2fdf58b167711794a729a25d5 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Thu, 5 Oct 2017 12:17:23 +0200
Subject: [PATCH 21/77] llvm: download source over https
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The source distribution contains binaries (probably for testing) that
make the Avira virus scanner treat it as malware on account of a “bad
ELF header”. Apart from being preferable in general, the HTTPS download
makes the file opaque to the overeager AV scanner in transparent
proxying setups.

Also adapt to the fact that the canonical downloads now point to a URL
like this:

    https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
---
 pkgs/development/compilers/llvm/4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index c1d1ce055d7..25bb008567f 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -10,7 +10,7 @@ let
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz";
+    url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 

From ef6130fd78984f703636374226c38531246a8370 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Oct 2017 12:02:58 +0200
Subject: [PATCH 22/77] gnome3.gnome_online_accounts: build with Vala bindings

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 29f6ae3e860..f2a23b63ea0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
 , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
 , telepathy_glib, intltool, dbus_libs, icu, glib_networking
 , libsoup, docbook_xsl_ns, docbook_xsl, gnome3
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
-                  libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup
+                  libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup vala
                   docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {

From 1713479f85e9eb7abcb0efb1be54fc5a44163ad2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Oct 2017 18:22:22 +0200
Subject: [PATCH 23/77] duplicity: Fix gio backend

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

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 313167b1ae2..d55783f7f2c 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec {
 
   buildInputs = [ librsync makeWrapper python2Packages.wrapPython ];
   propagatedBuildInputs = with python2Packages; [
-    boto cffi cryptography ecdsa enum idna
+    boto cffi cryptography ecdsa enum idna pygobject3
     ipaddress lockfile paramiko pyasn1 pycrypto six
   ];
   checkInputs = with python2Packages; [ lockfile mock pexpect ];

From d16b7191c3dd2e5cfe64e41f64674a7190d0ccf3 Mon Sep 17 00:00:00 2001
From: pasqui23 <p3dimaria@hotmail.it>
Date: Wed, 4 Oct 2017 12:04:49 +0200
Subject: [PATCH 24/77] deja-dup: init at 36.1

---
 pkgs/applications/backup/deja-dup/default.nix | 83 +++++++++++++++++++
 .../backup/deja-dup/fix-paths.patch           | 12 +++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 97 insertions(+)
 create mode 100644 pkgs/applications/backup/deja-dup/default.nix
 create mode 100644 pkgs/applications/backup/deja-dup/fix-paths.patch

diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
new file mode 100644
index 00000000000..4d3a9a385d6
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -0,0 +1,83 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
+, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
+, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
+, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror
+, appstream-glib, desktop_file_utils, atk, pango, duplicity
+}:
+
+stdenv.mkDerivation rec {
+  name = "deja-dup-${version}";
+  version = "36.1";
+
+  src = fetchurl {
+    url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz";
+    sha256 = "1s48k2sxrpwkzp37s4x7934lyg5194c47nv9ks15rksd5s0alnld";
+  };
+
+  patches = [
+    ./fix-paths.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \
+      "/bin/rm" \
+      "${coreutils}/bin/rm"
+  '';
+
+  # couldn't find gio/gdesktopappinfo.h
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig vala_0_38 gettext intltool itstool
+    appstream-glib desktop_file_utils libxml2 wrapGAppsHook
+  ];
+
+  buildInputs = [
+   libnotify gnome3.libpeas glib gtk3 libsecret
+   pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
+   at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror
+  ];
+
+  propagatedUserEnvPkgs = [ duplicity ];
+
+  postInstall = ''
+    glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+  # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed
+  postFixup =
+    let
+      rpath = stdenv.lib.makeLibraryPath [
+        glib
+        gtk3
+        gnome3.gnome_online_accounts
+        gnome3.libpeas
+        gnome3.nautilus
+        libgpgerror
+        libsecret
+        # Transitive
+        atk
+        pango
+      ];
+    in ''
+      # Unwrap accidentally wrapped library
+      mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
+
+      for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do
+        patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf"
+      done
+    '';
+
+  meta = with stdenv.lib; {
+    description = "A simple backup tool";
+    longDescription = ''
+      Déjà Dup is a simple backup tool. It hides the complexity \
+      of backing up the Right Way (encrypted, off-site, and regular) \
+      and uses duplicity as the backend.
+    '';
+    homepage = https://launchpad.net/deja-dup;
+    license = with licenses; gpl3;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch
new file mode 100644
index 00000000000..1cc57e6a54a
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/fix-paths.patch
@@ -0,0 +1,12 @@
+diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build
+index 04b136f3..ed8f7cba 100644
+--- a/deja-dup/nautilus/meson.build
++++ b/deja-dup/nautilus/meson.build
+@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'],
+     link_with: [dirhandling],
+     dependencies: [nautilus_dep],
+     install: true,
+-    install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir'))
++    install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0'))
+ 
+ endif
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1dc8cc11bd..5a557793415 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -951,6 +951,8 @@ with pkgs;
 
   deisctl = callPackage ../development/tools/deisctl {};
 
+  deja-dup = callPackage ../applications/backup/deja-dup { };
+
   devmem2 = callPackage ../os-specific/linux/devmem2 { };
 
   dbus-broker = callPackage ../os-specific/linux/dbus-broker {};

From 0317d5d083a7d58c75bd6df2acb31dde44efcb0c Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 5 Oct 2017 15:05:37 +0300
Subject: [PATCH 25/77] wine: replace samba3 with samba4

Unbreak security assertion via samba3 which no more supported.
---
 pkgs/misc/emulators/wine/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 9fb90875b97..0f59892cce1 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optional cairoSupport           pkgs.cairo
   ++ lib.optional tiffSupport            pkgs.libtiff
   ++ lib.optional odbcSupport            pkgs.unixODBC
-  ++ lib.optional netapiSupport          pkgs.samba3_light
+  ++ lib.optional netapiSupport          pkgs.samba4
   ++ lib.optional cursesSupport          pkgs.ncurses
   ++ lib.optional vaSupport              pkgs.libva-full
   ++ lib.optional pcapSupport            pkgs.libpcap

From 8c34112be912605be3a0798021c3b85a97e89ac8 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 5 Oct 2017 15:06:20 +0300
Subject: [PATCH 26/77] wineUnstable: 2.17 -> 2.18

Staging updated as well
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index aaaec67c751..fb384aee746 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.17";
+    version = "2.18";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y";
+    sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h";
+    sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From aee224c8a5dad4e5e5a11b0e6fabc8a90eba984f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Oct 2017 09:49:40 -0400
Subject: [PATCH 27/77] linux: 4.9.52 -> 4.9.53

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 6531323c1d5..e9b9fb54bfc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.52";
+  version = "4.9.53";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "12h4w6x0zcl8kpia2y7myv7w7i0dihw4g8v638fs8bzk3d7h7pgz";
+    sha256 = "095k7kpzic0c2vhwnfm5vcp9j60lyf4qyx2pj9vkp68bpcrmm49j";
   };
 } // (args.argsOverride or {}))

From 0bd1f7a92f2d17501d650967a2a1883238646853 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Oct 2017 09:50:00 -0400
Subject: [PATCH 28/77] linux: 4.13.4 -> 4.13.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix
index c45afd1cbeb..043a39ec95a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13.4";
+  version = "4.13.5";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "087lv2laf4wx28z9zqg9s275nzygica0hc1g8vn5ql6yb7mrb7m0";
+    sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59";
   };
 } // (args.argsOverride or {}))

From 85f0eef69cb29572184c315f575120158b4fb617 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 5 Oct 2017 09:54:09 -0500
Subject: [PATCH 29/77] dropbox: 35.4.20 -> 36.4.22

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index b9dae2d4200..0972cc759ab 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,10 +24,10 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "35.4.20";
+  version = "36.4.22";
   sha256 = {
-    "x86_64-linux" = "09qxr94bcyjn5ky20yapljxi2n2nbk6ldcpx2h0ysy8jp6zbrn78";
-    "i686-linux"   = "1rd4b26dbjf779g085si65lac74bk6lcx8k7i3nqk3vrvbva9n40";
+    "x86_64-linux" = "0hhnigwxqmr00zmlysc1y1k4bzrdrcabcnw44bniarwa2l4fw0v0";
+    "i686-linux"   = "15l7m33b0qlz8m6h7kh1fkxs37dq8jqy04b3qf693ns7wb5l0sqm";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch = {

From 14594db4810306996e143fd3cb28df8a641cea0f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 5 Oct 2017 23:02:01 +0800
Subject: [PATCH 30/77] cantata: 2.1.0 -> 2.2.0

---
 pkgs/applications/audio/cantata/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index f09791d9aa1..bd87d37041a 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "2.1.0";
+  version = "2.2.0";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     owner  = "CDrummond";
     repo   = "cantata";
     rev    = "v${version}";
-    sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh";
+    sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
   };
 
   buildInputs = [ vlc ]
@@ -86,17 +86,16 @@ stdenv.mkDerivation rec {
 
   # This is already fixed upstream but not released yet. Maybe in version 2.
   preConfigure = ''
-    sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
+    # sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/cdrummond/cantata;
+    homepage    = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";
-    license = licenses.gpl3;
-
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ fuuzetsu peterhoeg ];
     # Technically Cantata can run on Windows so if someone wants to
     # bother figuring that one out, be my guest.
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fuuzetsu ];
+    platforms   = platforms.linux;
   };
 }

From d04790c9e8c089afd8525d9c63f4ba721058f4c2 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@gmail.com>
Date: Thu, 5 Oct 2017 07:19:11 -0800
Subject: [PATCH 31/77] docs: 17.03 -> 17.09

---
 README.md                                  | 8 ++++----
 maintainers/scripts/hydra-eval-failures.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1a0fb5014de..b3d5347a6f6 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add
 ```
 
 For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest
+custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest
 release and `nixos-unstable` for the latest successful build of master:
 
 ```
 % git remote update channels
-% git rebase channels/nixos-17.03
+% git rebase channels/nixos-17.09
 ```
 
 For pull-requests, please rebase onto nixpkgs `master`.
@@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
 * [Manual (NixOS)](https://nixos.org/nixos/manual/)
 * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))
 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03)
+* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09)
 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents)
+* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents)
 
 Communication:
 
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 5233e062445..ddc3c7c4a96 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -49,8 +49,8 @@ def get_maintainers(attr_name):
 @click.command()
 @click.option(
     '--jobset',
-    default="nixos/release-17.03",
-    help='Hydra project like nixos/release-17.03')
+    default="nixos/release-17.09",
+    help='Hydra project like nixos/release-17.09')
 def cli(jobset):
     """
     Given a Hydra project, inspect latest evaluation

From a05f1e2ec4ee979aec0d696ff973bdcaef16b8ae Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 5 Oct 2017 23:21:44 +0800
Subject: [PATCH 32/77] cantata clean up

---
 pkgs/applications/audio/cantata/default.nix | 38 +++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index bd87d37041a..35fe510cbb2 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -38,9 +38,10 @@ let
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
-in
 
-stdenv.mkDerivation rec {
+  withUdisks = (withTaglib && withDevices);
+
+in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
@@ -60,35 +61,30 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional  withLame lame
     ++ stdenv.lib.optional  withMtp libmtp
     ++ stdenv.lib.optional  withMusicbrainz libmusicbrainz5
-    ++ stdenv.lib.optional  (withTaglib && withDevices) udisks2;
+    ++ stdenv.lib.optional  withUdisks udisks2;
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   enableParallelBuilding = true;
 
   cmakeFlags = stdenv.lib.flatten [
-    (fstat withQt5 "QT5")
-    (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
-    (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
-    (fstat withCdda "CDPARANOIA")
-    (fstat withCddb "CDDB")
-    (fstat withLame "LAME")
-    (fstat withMtp "MTP")
-    (fstat withMusicbrainz "MUSICBRAINZ")
+    (fstat withQt5            "QT5")
+    (fstats withTaglib        [ "TAGLIB" "TAGLIB_EXTRAS" ])
+    (fstats withReplaygain    [ "FFMPEG" "MPG123" "SPEEXDSP" ])
+    (fstat withCdda           "CDPARANOIA")
+    (fstat withCddb           "CDDB")
+    (fstat withLame           "LAME")
+    (fstat withMtp            "MTP")
+    (fstat withMusicbrainz    "MUSICBRAINZ")
     (fstat withOnlineServices "ONLINE_SERVICES")
-    (fstat withDynamic "DYNAMIC")
-    (fstat withDevices "DEVICES_SUPPORT")
-    (fstat withHttpServer "HTTP_SERVER")
-    (fstat withStreams "STREAMS")
+    (fstat withDynamic        "DYNAMIC")
+    (fstat withDevices        "DEVICES_SUPPORT")
+    (fstat withHttpServer     "HTTP_SERVER")
+    (fstat withStreams        "STREAMS")
+    (fstat withUdisks         "UDISKS2")
     "-DENABLE_HTTPS_SUPPORT=ON"
-    "-DENABLE_UDISKS2=ON"
   ];
 
-  # This is already fixed upstream but not released yet. Maybe in version 2.
-  preConfigure = ''
-    # sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
-  '';
-
   meta = with stdenv.lib; {
     homepage    = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";

From eeda400b300ab1252911820d149ae5dd1bffe9f1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 5 Oct 2017 18:27:50 +0200
Subject: [PATCH 33/77] josm: 12914 -> 12921

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 286be3cefc9..38eba46138e 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "12914";
+  version = "12921";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "104yih9xfgkpcqg8sqgwkpij2l6pwm12jx6kif45j11sg7hxlh8x";
+    sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm";
   };
 
   buildInputs = [ jre8 makeWrapper ];

From 9e754a6f86eefe47332031b63eb0088c76f8a985 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 5 Oct 2017 17:09:50 +0000
Subject: [PATCH 34/77] ocamlPackages.ssl: 0.5.3 -> 0.5.4

---
 pkgs/development/compilers/opa/default.nix                | 2 +-
 pkgs/development/ocaml-modules/eliom/default.nix          | 4 ++--
 pkgs/development/ocaml-modules/lwt/default.nix            | 4 ++--
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 6 +++---
 pkgs/development/ocaml-modules/ssl/default.nix            | 6 +++---
 pkgs/top-level/ocaml-packages.nix                         | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 9501b5a3a06..7b9e00b105d 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ which perl jdk openssl coreutils zlib ncurses
     makeWrapper gcc binutils gnumake nodejs
   ] ++ (with ocamlPackages; [
-    ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4
+    ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4
   ]);
 
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index b981aa548e0..42afec7e439 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
   js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
-  ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
+  ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp,
   reactivedata, opam, ppx_tools, ppx_deriving, findlib
 , ocamlbuild
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec
 
   propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
                             ocsigen_deriving js_of_ocaml
-                            calendar cryptokit ocamlnet react ocaml_ssl ocaml_pcre ];
+                            calendar cryptokit ocamlnet react ssl ocaml_pcre ];
 
   installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index c29f571a63e..4d751dac476 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
-, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
+, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
 , ppx_tools, result, cppo
 , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
 , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
@@ -30,7 +30,7 @@ buildOcaml rec {
   ++ stdenv.lib.optional ppxSupport ppx_tools;
 
   propagatedBuildInputs = [ result ]
-  ++ optionals [ react ocaml_ssl ]
+  ++ optionals [ react ssl ]
   ++ [ libev ];
 
   configureScript = "ocaml setup.ml -configure";
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 39375bc8ea1..081f9edbecf 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, which, react, ocaml_ssl,
+{ stdenv, fetchurl, ocaml, findlib, which, react, ssl,
 lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
 , camlzip, pgocaml
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
   };
 
-  buildInputs = [ocaml which findlib react ocaml_ssl lwt
+  buildInputs = [ocaml which findlib react ssl lwt
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
   ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   ''
   rm -rf $out/var/run
   wrapProgram $out/bin/ocsigenserver \
-    --prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
+    --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
   '';
 
   dontPatchShebangs = true;
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index 81b8c28b452..3886af37512 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-ssl-${version}";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchzip {
-    url = "https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-${version}.tar.gz";
-    sha256 = "0h2k19zpdvq1gqwrmmgkibw4j48l71vv6ajzxs0wi71y80c1vhwm";
+    url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz";
+    sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3";
   };
 
   buildInputs = [which ocaml findlib];
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7e601e88558..e45256bd3dc 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -439,8 +439,6 @@ let
 
     ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { };
 
-    ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };
-
     ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
 
     ocf = callPackage ../development/ocaml-modules/ocf { };
@@ -606,6 +604,8 @@ let
 
     sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
 
+    ssl = callPackage ../development/ocaml-modules/ssl { };
+
     stog = callPackage ../applications/misc/stog { };
 
     stringext = callPackage ../development/ocaml-modules/stringext { };

From bc03222bde69ca16dfd761d9d3031ebca14fee4f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 5 Oct 2017 21:06:48 +0200
Subject: [PATCH 35/77] types: remove loeOf

---
 lib/types.nix | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 62c6a978af9..c48e3b3000c 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -240,25 +240,6 @@ rec {
         functor = (defaultFunctor name) // { wrapped = elemType; };
       };
 
-    # List or element of ...
-    loeOf = elemType: mkOptionType rec {
-      name = "loeOf";
-      description = "element or list of ${elemType.description}s";
-      check = x: isList x || elemType.check x;
-      merge = loc: defs:
-        let
-          defs' = filterOverrides defs;
-          res = (head defs').value;
-        in
-        if isList res then concatLists (getValues defs')
-        else if lessThan 1 (length defs') then
-          throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
-        else if !isString res then
-          throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
-        else res;
-      functor = (defaultFunctor name) // { wrapped = elemType; };
-    };
-
     # Value of given type but with no merging (i.e. `uniq list`s are not concatenated).
     uniq = elemType: mkOptionType rec {
       name = "uniq";

From 3aeccdebb48668bdb0ede368a469ab38c89ec125 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 5 Oct 2017 22:11:34 +0300
Subject: [PATCH 36/77] libx86: fix illegal instruction error

---
 pkgs/development/libraries/libx86/non-x86.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch
index 0d41cd737f0..286057c4ba8 100644
--- a/pkgs/development/libraries/libx86/non-x86.patch
+++ b/pkgs/development/libraries/libx86/non-x86.patch
@@ -5,7 +5,7 @@ diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
  ifeq ($(BACKEND),x86emu)
  	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
  	x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o
-+	CFLAGS += -DX86EMU
++	CFLAGS += -DX86EMU -fno-delete-null-pointer-checks
  else
  	OBJECTS += lrmi.o
  endif

From e455bdcd5198d12cc2c5f3dc7b6a1843b889b108 Mon Sep 17 00:00:00 2001
From: dupgit <olivier.delhomme@free.fr>
Date: Thu, 5 Oct 2017 21:43:16 +0200
Subject: [PATCH 37/77] tmux 2.5 -> tmux 2.6

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

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index a749f250c11..61370ff890b 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -13,7 +13,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "tmux-${version}";
-  version = "2.5";
+  version = "2.6";
 
   outputs = [ "out" "man" ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "tmux";
     repo = "tmux";
     rev = version;
-    sha256 = "0zwjngfaqrlwwbzicc5pq5pyws8f1qghcajvj0hwkipj51hqyswf";
+    sha256 = "0605y0nwfmf0mnq075vk80897c2cvhxxvxinqq7hvrpjf2ph5mww";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 3e5b594732a8c6642335f537faa95a6fcc3d9ec3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Oct 2017 16:06:19 -0400
Subject: [PATCH 38/77] linux-copperhead: 4.13.4.a -> 4.13.5.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index d0d5466ff0f..d141d7f4211 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.13.4";
+  version = "4.13.5";
   revision = "a";
-  sha256 = "0l6xg06w0qicb64h8f6ldic947kn9a68wnad8pjwm89vy8vy4zqm";
+  sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 51b557b2c860d860abc6914c2a618ea3e516d384 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 5 Oct 2017 22:41:37 +0200
Subject: [PATCH 39/77] CODEOWNERS: add @rycee for Eclipse IDE

---
 .github/CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6a1cf6e4ee8..24983cb5287 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,3 +50,6 @@ pkgs/development/tools/erlang/*	@gleber
 
 # Jetbrains
 pkgs/applications/editors/jetbrains @edwtjo
+
+# Eclipse
+pkgs/applications/editors/eclipse @rycee

From 4086a9cf45ef6d098b31262e814aeb58e630e098 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 5 Oct 2017 21:32:47 +0000
Subject: [PATCH 40/77] ocamlPackages.pprint: 20140424 -> 20171003

---
 .../development/ocaml-modules/pprint/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix
index 83732eb1f75..899806c4dae 100644
--- a/pkgs/development/ocaml-modules/pprint/default.nix
+++ b/pkgs/development/ocaml-modules/pprint/default.nix
@@ -2,13 +2,23 @@
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.02"
+  then {
+    version = "20171003";
+    sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx";
+  } else {
+    version = "20140424";
+    sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk";
+}; in
+
 stdenv.mkDerivation {
 
-  name = "ocaml-pprint-20140424";
+  name = "ocaml${ocaml.version}-pprint-${param.version}";
 
   src = fetchurl {
-    url = http://gallium.inria.fr/~fpottier/pprint/pprint-20140424.tar.gz;
-    sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk";
+    url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];

From 3200f7a576916add974c17a4d3579cc56b388c47 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Thu, 5 Oct 2017 17:41:29 -0400
Subject: [PATCH 41/77] mupdf and k2pdfopt: update mirror

---
 pkgs/applications/misc/k2pdfopt/default.nix | 2 +-
 pkgs/applications/misc/mupdf/default.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 03ed7554af5..015ef876064 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
         (fetchpatch {
           name = "mupdf-1.10a-shared_libs-1.patch";
-          url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.10a-shared_libs-1.patch";
+          url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch";
           sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab";
         })
       ];
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 5651405633f..61febf5a7ff 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
     (fetchpatch {
       name = "mupdf-1.11-shared_libs-1.patch";
-      url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.11-shared_libs-1.patch";
+      url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch";
       sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j";
     })
   ];

From 7ca1db2123f952ab10f6730bfbc05df7344653b4 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Thu, 5 Oct 2017 23:00:04 +0100
Subject: [PATCH 42/77] vscode: 1.16.1 -> 1.17.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f72af1908c5..02b8d991eae 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.16.1";
+  version = "1.17.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "1k06rish1a1hqrkvzy21lg05vmzd345aa65g3d08ikh6508mp100";
-    "x86_64-linux" = "1l2xbdvjfmf05cqcjcj3w2450vi7wvkm5zdwkmfhh01fnvbrygnw";
-    "x86_64-darwin" = "0bxv3qlhcqn5sb5l5pjhi5560vi1sl844hx3r5x48gmmgd8yziaj";
+    "i686-linux" = "1s6nkzdsgfn5x7y91bwb6d7sw4b8s335myc0yhbsfpfks5pgi331";
+    "x86_64-linux" = "1av7xcb2sig5p344y2v1zjspg5nl9bds03r1yvgssm7mcy9l1gqk";
+    "x86_64-darwin" = "1fn9i5vs4b6xir51zavx7i8m68bwqa1hfr03aagy8byg9v8w5dx8";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 0ee6f8612ed13a0b1aaf0b703db42785c7baf302 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Thu, 5 Oct 2017 19:33:18 -0300
Subject: [PATCH 43/77] dd-agent: fix multiple tags in the config file

---
 nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index 8d3d4f2065e..beaa2c01b29 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -23,7 +23,7 @@ let
     # proxy_password: password
 
     # tags: mytag0, mytag1
-    ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
+    ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep ", " cfg.tags }"}
 
     # collect_ec2_tags: no
     # recent_point_threshold: 30

From 3780220f3ab0a61c1712820fae371e6b6ee998df Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 6 Oct 2017 00:55:24 +0200
Subject: [PATCH 44/77] perl-Server-Starter: 0.32 -> 0.33

---
 pkgs/top-level/perl-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 02afd115f3d..f5742880016 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11976,13 +11976,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ServerStarter = buildPerlModule {
-    name = "Server-Starter-0.32";
+  ServerStarter = buildPerlModule rec {
+    name = "Server-Starter-0.33";
     src = fetchurl {
-      url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.32.tar.gz;
-      sha256 = "a8ecc19f05f3c3b079e1c7f2c007a6df2b9a2912b9848a8fb51bd78c7b13ac1a";
+      url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz";
+      sha256 = "109cc1ede244f2edb7e020c507d4a1ff7a8074f22a8f7c30253fb00af1aba6f6";
     };
-    buildInputs = [ TestRequires TestSharedFork TestTCP ];
+    buildInputs = [ ModuleBuild TestRequires TestSharedFork TestTCP ];
     meta = {
       homepage = https://github.com/kazuho/p5-Server-Starter;
       description = "A superdaemon for hot-deploying server programs";

From 9c7a0d2cb6d524c062b067e2cb368b0a7aa696a8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 6 Oct 2017 00:55:54 +0200
Subject: [PATCH 45/77] perl-Set-Object: 1.34 -> 1.35

---
 pkgs/top-level/perl-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f5742880016..51fb51be688 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12013,11 +12013,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SetObject = buildPerlPackage {
-    name = "Set-Object-1.34";
+  SetObject = buildPerlPackage rec {
+    name = "Set-Object-1.35";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.34.tar.gz;
-      sha256 = "1dipd6k572pzqjzbj9vagb2k347qcg29lsxzx9y214bhnw7fgvjp";
+      url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
+      sha256 = "189a4d7cc3e583faa8518a63a95cf4aa3a320f79b5c6f5e40970687244080ee7";
+    };
+    meta = {
+      description = "Unordered collections (sets) of Perl Objects";
+      license = stdenv.lib.licenses.artistic2;
     };
   };
 

From 53c708379484da5c96887a9426d4796894fcf63f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 6 Oct 2017 00:56:20 +0200
Subject: [PATCH 46/77] perl-Variable-Magic: 0.58 -> 0.61

Also add meta section.
---
 pkgs/top-level/perl-packages.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 51fb51be688..ad9a8f885fd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15460,10 +15460,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   VariableMagic = buildPerlPackage rec {
-    name = "Variable-Magic-0.58";
+    name = "Variable-Magic-0.61";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz";
-      sha256 = "1yhh3zbawx68sw93xrnvfnqq5pb2pmbk20rckqxbwkq1n8c6lv83";
+      url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
+      sha256 = "b8afe92e54c72a2ed2ca1b08ce90518b855734f7d33c454d0f66f2c1ccf8a6d7";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/Variable-Magic/;
+      description = "Associate user-defined magic to variables from Perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 

From 4a3ed5d531fb4d52cf88f4281575b223dc316866 Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Sat, 30 Sep 2017 19:57:18 -0700
Subject: [PATCH 47/77] dep: init at 0.3.1

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

diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
new file mode 100644
index 00000000000..e22be524f02
--- /dev/null
+++ b/pkgs/development/tools/dep/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "dep-${version}";
+  version = "0.3.1";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/golang/dep";
+  subPackages = [ "cmd/dep" ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "golang";
+    repo = "dep";
+    sha256 = "0dsiaqfrp7ihhx10qapkl6zm3dw3rwdgcr9rkvmq8zprcp7njz90";
+  };
+
+  buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/golang/dep;
+    description = "Go dependency management tool";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.carlsverre ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c945bbe4060..02c36c484ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12665,6 +12665,8 @@ with pkgs;
 
   delve = callPackage ../development/tools/delve { };
 
+  dep = callPackage ../development/tools/dep { };
+
   go-bindata = callPackage ../development/tools/go-bindata { };
 
   go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };

From a6d570dd496c4b9d897b8c8c69844c72bc7d3b66 Mon Sep 17 00:00:00 2001
From: David Pflug <david@tpflug.com>
Date: Thu, 5 Oct 2017 20:39:25 -0400
Subject: [PATCH 48/77] tqsl: init at 2.3.1

---
 lib/maintainers.nix                           |  1 +
 .../misc/tqsl/cmake_lib_path.patch            | 12 ++++++
 pkgs/applications/misc/tqsl/default.nix       | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 54 insertions(+)
 create mode 100644 pkgs/applications/misc/tqsl/cmake_lib_path.patch
 create mode 100644 pkgs/applications/misc/tqsl/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ccde5c5e25b..9a53cf2f3c6 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -164,6 +164,7 @@
   dotlambda = "Robert Schütz <rschuetz17@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
   dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
+  dpflug = "David Pflug <david@pflug.email>";
   drets = "Dmytro Rets <dmitryrets@gmail.com>";
   drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
   dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>";
diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch
new file mode 100644
index 00000000000..5eed9383463
--- /dev/null
+++ b/pkgs/applications/misc/tqsl/cmake_lib_path.patch
@@ -0,0 +1,12 @@
+diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt
+--- tqsl-2.3.1/src/CMakeLists.txt	2017-04-17 20:53:22.000000000 -0400
++++ tqsl-2.3.1b/src/CMakeLists.txt	2017-10-05 21:14:39.048329343 -0400
+@@ -54,7 +54,7 @@
+ if(NOT APPLE AND NOT WIN32)
+ set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/")
+ set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h)
+-install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX))
++install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX})
+ install(FILES config.xml DESTINATION share/TrustedQSL)
+ install(FILES ${HEADERS_TO_INSTALL} DESTINATION include)
+ endif()
diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix
new file mode 100644
index 00000000000..829ed258562
--- /dev/null
+++ b/pkgs/applications/misc/tqsl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
+
+let
+  lib_suffix =
+  if stdenv.system == "x86_64-linux" then
+    "64"
+  else
+    "";
+in
+stdenv.mkDerivation rec {
+  name = "tqsl-${version}";
+  version = "2.3.1";
+
+  src = fetchurl {
+    url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
+    sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [
+    cmake
+    expat
+    openssl
+    zlib
+    db
+    curl
+    wxGTK
+  ];
+
+  patches = [ ./cmake_lib_path.patch ];
+
+  meta = with stdenv.lib; {
+    description = "Software for using the ARRL Logbook of the World";
+    homepage = https://lotw.arrl.org/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.dpflug ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f232f8acfcf..ccd8cdb65ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16722,6 +16722,8 @@ with pkgs;
 
   toxic = callPackage ../applications/networking/instant-messengers/toxic { };
 
+  tqsl = callPackage ../applications/misc/tqsl { };
+
   transcode = callPackage ../applications/audio/transcode { };
 
   transcribe = callPackage ../applications/audio/transcribe { };

From 0d7e0b4ec2277cc94bc00efb0df5bb37079b01a2 Mon Sep 17 00:00:00 2001
From: Joel Rivera <rivera@joel.mx>
Date: Tue, 3 Oct 2017 00:07:19 -0500
Subject: [PATCH 49/77] enpass: 5.4.0.post4 ->  5.6.0

The file was generated with the update script that is part
of the nix expressions for enpass.

Also, it seems that 5.4 has some issues with dropbox sync,
this was the original rationale to look for a newer version.
---
 pkgs/tools/security/enpass/data.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json
index b3625d928b5..28d568d30ae 100644
--- a/pkgs/tools/security/enpass/data.json
+++ b/pkgs/tools/security/enpass/data.json
@@ -1,12 +1,12 @@
 {
   "amd64": {
-    "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb", 
-    "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579", 
-    "version": "5.4.0.post4"
+    "path": "pool/main/e/enpass/enpass_5.6.0_amd64.deb", 
+    "sha256": "129ae4b4bfb8e0b4fa9acdfb3aebac3dd894364f2f31e9cd3bd5d3567e3a13b7", 
+    "version": "5.6.0"
   }, 
   "i386": {
-    "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb", 
-    "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692", 
-    "version": "5.4.0.post4"
+    "path": "pool/main/e/enpass/enpass_5.6.0_i386.deb", 
+    "sha256": "c456002194c0be08a2c0da68ecf224425e35c46de5292098208e4e2b1f6d88ae", 
+    "version": "5.6.0"
   }
 }
\ No newline at end of file

From 48b273ac49499368fe8c9b3d322f784957896377 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Oct 2017 10:12:41 -0400
Subject: [PATCH 50/77] atom: 1.20.1 -> 1.21.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 8c77687d875..33d78591151 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0mr82m3yv18ljai3r4ncr65bqhjwxyf1si77iza4ijk5zv1llp7i";
+    sha256 = "0xnja2jdjjryisxgyxhh8ik861snl9wdpmr3rjlnalfglghqqb5h";
     name = "${name}.deb";
   };
 
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
       --set-rpath "${atomEnv.libPath}" \
       $out/share/atom/resources/app/apm/bin/node
 
-    rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git
-    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/node_modules/dugite/git/bin/git
+    rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
 
     find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
 

From 1d74f31a0a618175bc7afeafc53c44677081a40f Mon Sep 17 00:00:00 2001
From: Rommel Martinez <ebzzry@ebzzry.io>
Date: Fri, 6 Oct 2017 15:16:39 +0800
Subject: [PATCH 51/77] maintainers.nix: update email

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ccde5c5e25b..74972203af0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -170,7 +170,7 @@
   dtzWill = "Will Dietz <nix@wdtz.org>";
   dywedir = "Vladyslav M. <dywedir@protonmail.ch>";
   e-user = "Alexander Kahl <nixos@sodosopa.io>";
-  ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
+  ebzzry = "Rommel Martinez <ebzzry@ebzzry.io>";
   edanaher = "Evan Danaher <nixos@edanaher.net>";
   edef = "edef <edef@edef.eu>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";

From cb593780f3b0d7de4a72346dca208de9df348379 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Fri, 6 Oct 2017 10:55:36 +0200
Subject: [PATCH 52/77] trivial-builders.nix: fix writeShellScriptBin

The check should be performed on the target shell script, not on the output directory.
---
 pkgs/build-support/trivial-builders.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 14553c33e03..32214db6584 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -68,7 +68,7 @@ rec {
         ${text}
         '';
       checkPhase = ''
-        ${stdenv.shell} -n $out
+        ${stdenv.shell} -n $out/bin/${name}
       '';
     };
 

From f432fdfb318af5ea9f8596a31de51654a9229bb5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 6 Oct 2017 11:05:13 +0100
Subject: [PATCH 53/77] direnv: fix homepage URL

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

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 1606fffe397..13f4e5e0b9c 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -42,7 +42,7 @@ buildGoPackage rec {
       In short, this little tool allows you to have project-specific
       environment variables.
     '';
-    homepage = http://direnv.net;
+    homepage = https://direnv.net;
     license = licenses.mit;
     maintainers = with maintainers; [ zimbatm ];
   };

From 92852fd193eb5954c9e667e26894819d64423230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 6 Oct 2017 11:56:35 +0200
Subject: [PATCH 54/77] ccid: change patchPhase to postPatch

This stops the derivation from overriding the default patchPhase, which
right now prevents adding a list of patches in the "patches" attribute.
---
 pkgs/tools/security/ccid/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index e450cf5952e..9eb5858b057 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56";
   };
 
-  patchPhase = ''
+  postPatch = ''
     patchShebangs .
     substituteInPlace src/Makefile.in --replace /bin/echo echo
   '';

From 55f5699d42f92d91ab2c1a155c3ff21b56c8790e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 6 Oct 2017 11:11:01 +0100
Subject: [PATCH 55/77] direnv: 2.12.2 -> 2.13.1

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

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 13f4e5e0b9c..cfad499a432 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "direnv-${version}";
-  version = "2.12.2";
+  version = "2.13.1";
   goPackagePath = "github.com/direnv/direnv";
 
   src = fetchFromGitHub {
     owner = "direnv";
     repo = "direnv";
     rev = "v${version}";
-    sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b";
+    sha256 = "1j2jkxzd6rh4ms39izqfm4w8h12dg0ccvqsj0z1z4hb3f1jqcgbz";
   };
 
   postConfigure = ''

From 53d754da34293f77e9532837d37b67db541c057e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Oct 2017 03:00:44 +0200
Subject: [PATCH 56/77] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.6-11-g74d58ee from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6bc86c2d10432de6fe50cb2835e7d01406380c17.
---
 .../haskell-modules/hackage-packages.nix      | 1078 +++++++++++++----
 1 file changed, 819 insertions(+), 259 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d8c2d47374a..5524dce42d9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5750,7 +5750,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Frames_0_2_1" = callPackage
+  "Frames_0_2_1_1" = callPackage
     ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml
      , HUnit, pipes, pretty, primitive, readable, regex-applicative
      , template-haskell, temporary, text, transformers
@@ -5758,8 +5758,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.2.1";
-       sha256 = "1mj2s4afj5wlpg3893j2nd5z98vcxqxi83s1z82lknaq6i7n805q";
+       version = "0.2.1.1";
+       sha256 = "19sgkra9i5mn8nbys1h17vhl2j1yhd43hhg4bjr35nz9hj1cjfjs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -6262,8 +6262,8 @@ self: {
      }:
      mkDerivation {
        pname = "GenI";
-       version = "0.25.0";
-       sha256 = "1mxx8mcrlq54gb436jyk8g9k2i56ybp3m3gzi7bmjda6qpf7b8l8";
+       version = "0.25.0.1";
+       sha256 = "0jdalwm1qhr0adlxfbmw7valqiqmfziv4xrlyprw2nycic99p7gm";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -6536,6 +6536,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Glob_0_9_0" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, filepath
+     , HUnit, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "Glob";
+       version = "0.9.0";
+       sha256 = "08q2s8ms5klir1pipbsvb5pwdh6hj784p9dkbph7spk2jcqm67lv";
+       libraryHaskellDepends = [
+         base containers directory dlist filepath transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers directory dlist filepath HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+         transformers transformers-compat
+       ];
+       homepage = "http://iki.fi/matti.niemenmaa/glob/";
+       description = "Globbing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GlomeTrace" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -9045,8 +9069,8 @@ self: {
        pname = "HarmTrace";
        version = "2.2.1";
        sha256 = "1f0m154fqal44i16bq9lxzsxj1810rmjvg7a17q5p80phg3dzarj";
-       revision = "1";
-       editedCabalFile = "0jnj3srkbwi88v8b7zqmkd5zxrc8vsgibf8a0zs82jra0a9jvg6g";
+       revision = "2";
+       editedCabalFile = "0n1qh6bn1r7hwa7aafgs7pvjh8c1qavq2s9vc56989p73llwl1qr";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -9066,8 +9090,8 @@ self: {
      }:
      mkDerivation {
        pname = "HarmTrace-Base";
-       version = "1.5.3.1";
-       sha256 = "1plr7rf8658pbys7gw78xsqqjnn0pm84am88hp2iawsi20qfz9mf";
+       version = "1.6.0.0";
+       sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b";
        libraryHaskellDepends = [
          base binary containers ghc-prim ListLike uu-parsinglib
        ];
@@ -20083,17 +20107,17 @@ self: {
   "accelerate-llvm-native" = callPackage
     ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
      , c2hs, Cabal, cereal, containers, directory, dlist, fclabels
-     , filepath, ghc, ghc-prim, libffi, llvm-hs, llvm-hs-pure, mtl
-     , template-haskell, time, unix, vector
+     , filepath, ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure
+     , mtl, template-haskell, time, unique, unix, vector
      }:
      mkDerivation {
        pname = "accelerate-llvm-native";
-       version = "1.1.0.0";
-       sha256 = "0jg46i12vxf4fr5w0s8wwdh701ba088l4ign7yfvmzbhgcpvan5d";
+       version = "1.1.0.1";
+       sha256 = "0hxws9lsmcsrhj0gxwnl86mcsg8x7wyv13lbb2lrglkychqkkv5l";
        libraryHaskellDepends = [
          accelerate accelerate-llvm base bytestring Cabal cereal containers
-         directory dlist fclabels filepath ghc ghc-prim libffi llvm-hs
-         llvm-hs-pure mtl template-haskell time unix vector
+         directory dlist fclabels filepath ghc ghc-prim hashable libffi
+         llvm-hs llvm-hs-pure mtl template-haskell time unique unix vector
        ];
        libraryToolDepends = [ c2hs ];
        description = "Accelerate backend for multicore CPUs";
@@ -21666,6 +21690,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aeson-injector_1_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, containers, deepseq
+     , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific
+     , servant-docs, swagger2, tasty, tasty-hunit, tasty-quickcheck
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-injector";
+       version = "1.1.0.0";
+       sha256 = "1dkl7sgzi9hzc86a27wfch7p33sj1h8zh7xsah3fbqjbz4y8z9wf";
+       libraryHaskellDepends = [
+         aeson base bifunctors deepseq hashable lens servant-docs swagger2
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base containers HUnit lens QuickCheck quickcheck-text
+         scientific swagger2 tasty tasty-hunit tasty-quickcheck text vector
+       ];
+       description = "Injecting fields into aeson values";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-iproute" = callPackage
     ({ mkDerivation, aeson, base, iproute, text }:
      mkDerivation {
@@ -22428,8 +22475,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.7.4";
-       sha256 = "0p18s265yf2ficygvgzrngl2ax1zf73h56mz3jv3iigjrsjf4rj2";
+       version = "0.7.4.2";
+       sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1";
        libraryHaskellDepends = [
          aivika aivika-transformers base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -25698,6 +25745,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ansigraph_0_3_0_4" = callPackage
+    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "ansigraph";
+       version = "0.3.0.4";
+       sha256 = "0gyim5a4b0gc4z45hsbxwl3gn3xcad3068xwcgwh8gc4ikannki9";
+       libraryHaskellDepends = [ ansi-terminal base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/BlackBrane/ansigraph";
+       description = "Terminal-based graphing via ANSI and Unicode";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antagonist" = callPackage
     ({ mkDerivation, antisplice, base, chatty, chatty-utils, ironforge
      , mtl, shakespeare, text, time, time-locale-compat, yesod
@@ -34632,6 +34693,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp;};
 
+  "bitset-word8" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck
+     , template-haskell, th-lift-instances
+     }:
+     mkDerivation {
+       pname = "bitset-word8";
+       version = "0.1.0.1";
+       sha256 = "1lsjaxv7858r5xl8a0lffghlmj3w853ndmmfybki7cfwcqr3mhk2";
+       libraryHaskellDepends = [
+         base bytestring containers template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/nshimaza/bitset-word8#readme";
+       description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bitspeak" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib
      , bindings-gobject, gtk2, pango
@@ -36719,7 +36797,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_25" = callPackage
+  "brick_0_26_1" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-clist
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
      , template-haskell, text, text-zipper, transformers, vector, vty
@@ -36727,8 +36805,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.25";
-       sha256 = "0yj1lw8a82xw5kkaqq5dhffzw8gcjb8cb1wjbsyc3hgcscy9vn9m";
+       version = "0.26.1";
+       sha256 = "05jajgb0k1346gg4jc44d921x1bsjwxsaw0ibrf3icaq7x5m11rk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37482,8 +37560,8 @@ self: {
      }:
      mkDerivation {
        pname = "butcher";
-       version = "1.1.0.2";
-       sha256 = "0pwlmz3ns4fiq1w0c0a9di0q1z9jc009si0imh7j48iswakm0la1";
+       version = "1.2.0.0";
+       sha256 = "0i18j6pw67bh2bb04zh4x4cbxyy9n7x65yyqfcl3qvl7mz4wzd7k";
        libraryHaskellDepends = [
          base bifunctors containers deque either extra free microlens
          microlens-th mtl multistate pretty transformers unsafe void
@@ -38062,13 +38140,13 @@ self: {
      }) {};
 
   "byteunits" = callPackage
-    ({ mkDerivation, base, Cabal, QuickCheck, safe }:
+    ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }:
      mkDerivation {
        pname = "byteunits";
-       version = "0.2.0.2";
-       sha256 = "1n0gbjjhxx6rv07sck3bx70bd96pkgl0vx5qyqbby9gdfndil4vl";
+       version = "0.3.0.2";
+       sha256 = "1nfr56zxzvh0lf2qqmjb2jiaslmsr4a73bflvh9y5zqp1aivchgq";
        libraryHaskellDepends = [ base safe ];
-       testHaskellDepends = [ base Cabal QuickCheck ];
+       testHaskellDepends = [ base Cabal HUnit QuickCheck ];
        description = "Human friendly conversion between byte units (KB, MB, GB...)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38140,8 +38218,8 @@ self: {
      }:
      mkDerivation {
        pname = "c-mosquitto";
-       version = "0.1.0.1";
-       sha256 = "0scghhz6d9i3rbdl95dvfc03ds99nx0hgmsx29n1d8v8bvvmkpz4";
+       version = "0.1.2.0";
+       sha256 = "1q2g7wv11d8p5ykbh0m7xd8jx4lvm73i503rz5pvsgmgm39fwy98";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45786,19 +45864,19 @@ self: {
   "colorless" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, errors
      , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl
-     , random, scientific, text, unordered-containers, vector
+     , random, scientific, text, tuple, unordered-containers, vector
      }:
      mkDerivation {
        pname = "colorless";
-       version = "2.1.0";
-       sha256 = "1dr8isfvwhfh3j59yrvvyjrqq17iw0qi5xapfhgv7xjsq8lw2wpx";
+       version = "2.2.4";
+       sha256 = "0w9mrdfnj0g1dis88zbpcfjwxl3n3m93k14rwvy4lwxpykafjvr5";
        libraryHaskellDepends = [
          aeson base bytestring containers errors exceptions lifted-async
          monad-control monad-logger mtl random scientific text
          unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base containers hspec scientific text vector
+         aeson base containers hspec scientific text tuple vector
        ];
        description = "Colorless";
        license = stdenv.lib.licenses.bsd3;
@@ -47256,14 +47334,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "concurrency_1_2_0_0" = callPackage
+  "concurrency_1_2_1_0" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.2.0.0";
-       sha256 = "08mqacgidcqsr633h4msbq2as8q1j5fim0jz9j46lpd1p1ksygn5";
+       version = "1.2.1.0";
+       sha256 = "1361ywfwbymnw1siaysswl0hfh5hq8zgzkazy226civxcap4pi47";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -47635,8 +47713,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-algorithms";
-       version = "0.0.4.0";
-       sha256 = "0d142r0ljcdyd6z92k4nn19a0sain4fdqmfdr1wiibwq4bdcfzqw";
+       version = "0.0.5.0";
+       sha256 = "0c8r4iydvzlp1q2szqnxpk8g95dn905ymzsa3isxdh9cjjqm5lbi";
        libraryHaskellDepends = [
          async base bytestring bzlib-conduit conduit conduit-combinators
          conduit-extra containers deepseq directory filepath mtl resourcet
@@ -50585,14 +50663,18 @@ self: {
      }) {};
 
   "crdt" = callPackage
-    ({ mkDerivation, base, containers, QuickCheck, tasty
+    ({ mkDerivation, base, containers, enummapset, lattices, microlens
+     , microlens-ghc, microlens-mtl, mtl, QuickCheck, tasty
      , tasty-quickcheck
      }:
      mkDerivation {
        pname = "crdt";
-       version = "0.5";
-       sha256 = "11svy9z96964b9cfh2x7cnibq785vnb4v9r6jvhbakda634c61mg";
-       libraryHaskellDepends = [ base containers ];
+       version = "1.0";
+       sha256 = "0s9naq4bakivgs9bqjrp9pli3yfj9ync69pif61q7jsb0gw8w9ny";
+       libraryHaskellDepends = [
+         base containers enummapset lattices microlens microlens-ghc
+         microlens-mtl mtl
+       ];
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck
        ];
@@ -57187,8 +57269,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.1.1.0";
-       sha256 = "0yh998p0n89ma3698qiiw42yrchn2jp5h3jfjpsw0vs9jqh144l1";
+       version = "0.1.1.1";
+       sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://www.github.com/mkloczko/derive-storable/";
@@ -58847,8 +58929,8 @@ self: {
     ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }:
      mkDerivation {
        pname = "dimensions";
-       version = "0.3.0.0";
-       sha256 = "00932v3j629ik2n4flq74zcxvvqxgsl88sifyn2ppdwvp535cmhm";
+       version = "0.3.1.0";
+       sha256 = "1img3byk6jyfjqn1diss2067k88ii6hg5g92yaghkizh1d2vmyi0";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/achirkin/easytensor#readme";
@@ -60044,8 +60126,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.10";
-       sha256 = "08fmyqiwxi0r8v1qndgjnj6gd74982sdailkxv4471kbskhr9dnp";
+       version = "0.4.11";
+       sha256 = "0rpmmyl3bal61q1gg6kk57i8whvard8r6f6w57pdgspp2sy5bhh7";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -60617,8 +60699,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker";
-       version = "0.4.0.2";
-       sha256 = "1y2bk71zz3m6dm9b1cnkfyvi2x62v1kc08h9pbpxs43r82fz2xa0";
+       version = "0.4.1.0";
+       sha256 = "1ywqi7mcyb39fir040gfnk8cb57ysa8mnhcss5x2jvhgqfg3vffw";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit conduit-combinators
          conduit-extra containers data-default-class directory exceptions
@@ -61118,28 +61200,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dotenv_0_5_0_2" = callPackage
+  "dotenv_0_5_1_0" = callPackage
     ({ mkDerivation, base, base-compat, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.5.0.2";
-       sha256 = "0jdm8ci2d1iafxiq8r27iclmgrmr9d3md3slc0wv01magsdsl0hb";
+       version = "0.5.1.0";
+       sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base base-compat exceptions megaparsec text transformers
+         base base-compat exceptions megaparsec process text transformers
        ];
        executableHaskellDepends = [
          base base-compat megaparsec optparse-applicative process text
          transformers
        ];
        testHaskellDepends = [
-         base base-compat exceptions hspec hspec-megaparsec megaparsec text
-         transformers
+         base base-compat exceptions hspec hspec-megaparsec megaparsec
+         process text transformers
        ];
        homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
@@ -62362,9 +62444,11 @@ self: {
        pname = "dyckword";
        version = "0.1.0.4";
        sha256 = "1904dy0f30jbv3b43vpkfsczr27xsfsnvmh21xhd9y4lvdah0rbr";
+       revision = "1";
+       editedCabalFile = "0w0az7jkkyfvaldh44b9pmqlwrfvjxmfk07hvrdiwxl62klg4plq";
        libraryHaskellDepends = [ base exact-combinatorics text ];
        testHaskellDepends = [ ansi-terminal base hspec text ];
-       homepage = "https://github.com/johanneshilden/dyckword#readme";
+       homepage = "https://github.com/laserpants/dyckword#readme";
        description = "A library for working with binary Dyck words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62817,14 +62901,14 @@ self: {
      }:
      mkDerivation {
        pname = "easytensor";
-       version = "0.3.0.0";
-       sha256 = "1a6y6lrnc82354jqfrns4bb3pwhiwnidfcgfwzg38wsdmpq5rhg9";
+       version = "0.3.1.0";
+       sha256 = "07shnpbnh3qq28yhcrhwhhb8m8b9x5ad36cj5f5hxqghfhih7k6b";
        libraryHaskellDepends = [ base dimensions ghc-prim ];
        testHaskellDepends = [ base Cabal dimensions QuickCheck ];
        benchmarkHaskellDepends = [ base dimensions time ];
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -65700,10 +65784,8 @@ self: {
      }:
      mkDerivation {
        pname = "ersatz-toysat";
-       version = "0.2.1.0";
-       sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq";
-       revision = "1";
-       editedCabalFile = "0xkpi1m3brgf4mkqmzv45a9wfmvj09hp0bzcq0kcv47p7p5qcvql";
+       version = "0.2.2.0";
+       sha256 = "056yyls1mhl20sbngk43lip9gi092c1da0snx6fcs0vbv8gm0j4v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65955,20 +66037,23 @@ self: {
      }) {};
 
   "ethereum-analyzer" = callPackage
-    ({ mkDerivation, base, bimap, bytestring, containers
-     , ethereum-analyzer-deps, extra, fgl, graphviz, hexstring, hoopl
-     , hspec, text
+    ({ mkDerivation, aeson, base, bimap, bytestring, containers
+     , ethereum-analyzer-deps, extra, fgl, GenericPretty, graphviz
+     , hexstring, hoopl, hspec, pretty, protolude, split, text
+     , unordered-containers, wl-pprint-text
      }:
      mkDerivation {
        pname = "ethereum-analyzer";
-       version = "1.3.0";
-       sha256 = "18ri9wdcxh10sz5jlgsybjdvbwpcqbq2jjph15iwl4wwmlnzfqx1";
+       version = "2.0.0";
+       sha256 = "1nrvlziqhszns4hwbhg53k0jcd3xbc4gfg60snvh4i4x2cj6r3pz";
        libraryHaskellDepends = [
-         base bimap bytestring containers ethereum-analyzer-deps extra fgl
-         graphviz hexstring hoopl text
+         aeson base bimap bytestring containers ethereum-analyzer-deps extra
+         fgl GenericPretty graphviz hexstring hoopl pretty protolude split
+         text unordered-containers wl-pprint-text
        ];
        testHaskellDepends = [
-         base bytestring ethereum-analyzer-deps extra hoopl hspec text
+         base bytestring ethereum-analyzer-deps extra GenericPretty hoopl
+         hspec protolude text wl-pprint-text
        ];
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A Ethereum contract analyzer";
@@ -65980,12 +66065,13 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, conduit-combinators
      , directory, ethereum-analyzer, ethereum-analyzer-deps, exceptions
      , hexstring, hflags, http-conduit, json-rpc, monad-logger, mtl
-     , protolude, text, tostring, unordered-containers, vector
+     , optparse-applicative, optparse-text, protolude, text, tostring
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "ethereum-analyzer-cli";
-       version = "1.3.0";
-       sha256 = "0bbqvg6kl4dsfyh9gb9n0bys5v6c4clqf7sg91p5k0znap8sj06c";
+       version = "2.0.0";
+       sha256 = "12n9x7c6cqki96ydkvb0ldbl3nra1lcvr4p47hnnw3dcna99dxhh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65995,7 +66081,8 @@ self: {
          unordered-containers vector
        ];
        executableHaskellDepends = [
-         base ethereum-analyzer-deps hflags monad-logger protolude
+         base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger
+         optparse-applicative optparse-text protolude text
        ];
        homepage = "https://github.com/ethereumK/ethereum-analyzer";
        description = "A CLI frontend for ethereum-analyzer";
@@ -66010,8 +66097,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-deps";
-       version = "1.3.0";
-       sha256 = "102i96a150mm68cxy4qm8pfdzjm0m6ip846g08dzvdx8cl9si1iy";
+       version = "2.0.0";
+       sha256 = "1kjnxg7j8343amy77m96xx6wzqk4gph1gmpb1ffqky2a70n8bngn";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base16-bytestring binary bytestring
          containers deepseq fast-logger global-lock monad-logger split text
@@ -66031,8 +66118,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-webui";
-       version = "1.3.0";
-       sha256 = "0ffpgb4y25qkbzrarhcnzfq92fal5i1p986cy9ipg3dd7y7dham1";
+       version = "2.0.0";
+       sha256 = "1b4pc6nfn3cc38n0f8pvgmc32pk1shnm0r9227xxi07093m8az1w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68494,8 +68581,8 @@ self: {
      }:
      mkDerivation {
        pname = "fastparser";
-       version = "0.3.0.1";
-       sha256 = "05ag040bw5ca05yl9l4nqdmsh9my1b2jnf5qc9kbwk5i8zqkfv15";
+       version = "0.3.1";
+       sha256 = "0qs3i1cxcdgyi2595qcqalqflpfkqgg6krw7dmjq4kk4pmnm6yw4";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing containers kan-extensions
          microlens thyme transformers vector-space
@@ -70191,6 +70278,33 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "find-clumpiness_0_2_3_1" = callPackage
+    ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness
+     , containers, hierarchical-clustering, listsafe, mtl
+     , optparse-applicative, text, text-show, tree-fun
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "find-clumpiness";
+       version = "0.2.3.1";
+       sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base BiobaseNewick bytestring clumpiness containers
+         hierarchical-clustering listsafe mtl text text-show tree-fun
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base BiobaseNewick bytestring clumpiness containers
+         optparse-applicative text tree-fun unordered-containers
+       ];
+       homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
+       description = "Find the clumpiness of labels in a tree";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "find-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -70255,6 +70369,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fingertree_0_1_2_1" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "fingertree";
+       version = "0.1.2.1";
+       sha256 = "03vchlbhx9ipjx1w8y4pfc4awb1gjjgr5f95h977lknzb5ad9fx5";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       description = "Generic finger-tree structure, with example instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fingertree-psqueue" = callPackage
     ({ mkDerivation, base, fingertree }:
      mkDerivation {
@@ -72174,20 +72306,22 @@ self: {
      }) {};
 
   "forest-fire" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cli, containers
-     , pretty-tree, process, text
+    ({ mkDerivation, aeson, base, bytestring, cli, containers, HUnit
+     , mtl, process, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "forest-fire";
-       version = "0.1.1.1";
-       sha256 = "1v8lj9bx0hjkhjr4iv672x84016hsn80nhcfqdknl87vz5bk7z9s";
+       version = "0.2";
+       sha256 = "1y50nlj2k2glzypr3nvwcx7pdf7bwn0n4d4vks5n8balvx6yaniq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers pretty-tree process text
+         aeson base bytestring containers process text
        ];
        executableHaskellDepends = [ base cli ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit mtl tasty tasty-hunit
+       ];
        homepage = "https://github.com/toothbrush/forest-fire#readme";
        description = "Recursively delete CloudFormation stacks and their dependants";
        license = stdenv.lib.licenses.bsd3;
@@ -74786,29 +74920,32 @@ self: {
   "gdax" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base
      , base64-bytestring, byteable, bytestring, containers, cryptohash
-     , exceptions, http-client, http-client-tls, lens, lens-aeson, mtl
-     , scientific, tasty, tasty-hunit, tasty-quickcheck, tasty-th, text
-     , time, uuid, vector, websockets, wreq, wuss
+     , exceptions, hashable, http-client, http-client-tls, lens
+     , lens-aeson, mtl, regex-tdfa, regex-tdfa-text, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th, text, time
+     , unordered-containers, uuid, vector, websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "gdax";
-       version = "0.5.0.1";
-       sha256 = "0bjypc6szmdz0ldbbj3n5a4qf78x00yxvml2n647q5p4laan843a";
+       version = "0.6.0.0";
+       sha256 = "08b7j5dcs5indpd6gb6pc3aw692jqvm26vfnq12mpssdbv7fzf6y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring byteable bytestring
-         cryptohash exceptions http-client http-client-tls lens lens-aeson
-         mtl scientific text time uuid vector websockets wreq wuss
+         containers cryptohash exceptions hashable http-client
+         http-client-tls lens lens-aeson mtl regex-tdfa regex-tdfa-text
+         scientific text time unordered-containers uuid vector websockets
+         wreq wuss
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bytestring text
+         aeson aeson-pretty base base64-bytestring bytestring text vector
          websockets wuss
        ];
        testHaskellDepends = [
-         aeson base base64-bytestring bytestring containers exceptions lens
-         lens-aeson mtl tasty tasty-hunit tasty-quickcheck tasty-th text
-         time vector websockets wuss
+         aeson aeson-pretty base base64-bytestring bytestring containers
+         exceptions lens lens-aeson mtl tasty tasty-hunit tasty-quickcheck
+         tasty-th text time unordered-containers vector websockets wuss
        ];
        homepage = "https://github.com/AndrewRademacher/gdax";
        description = "API Wrapping for Coinbase's GDAX exchange";
@@ -75651,8 +75788,8 @@ self: {
      }:
      mkDerivation {
        pname = "geni-util";
-       version = "0.25.0";
-       sha256 = "0jpsiydbamyp3c7q61gw8c4jdcdgj7cvavli5x287krpm74s361z";
+       version = "0.25.0.1";
+       sha256 = "1p62m885w3wpin8g2lcjzrk8a0gslkrxml6d66m38m6lflgwrm6h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -76599,6 +76736,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-events_0_7_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "ghc-events";
+       version = "0.7.0";
+       sha256 = "12vs1vpi969391k1n7apg2sd399dl5xdkjgb8rbn9sj0dmp9l946";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers text vector
+       ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base bytestring ];
+       description = "Library and tool for parsing .eventlog files from GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-events-analyze" = callPackage
     ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg
      , filepath, ghc-events, lens, mtl, optparse-applicative, parsec
@@ -78757,8 +78914,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20170925";
-       sha256 = "0kzqndnazqhm777gaym7lp6rknhll3b6lr19y4cxqpr1baslvcf0";
+       version = "6.20171003";
+       sha256 = "0fyyad5fbdacwyg8b1m6fp1qqkdhp1hgp5r1isivmxfbk15xgvai";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -83509,8 +83666,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphite";
-       version = "0.4.1.0";
-       sha256 = "1qk3inkd9lrvhds553z0jvflpalmr02hgx4656x0qp2yqh9nvp96";
+       version = "0.4.2.0";
+       sha256 = "11pa89d916c5kk08gwwnsrji4d16ccbqw0wrcn4fnp59nfcjs53l";
        libraryHaskellDepends = [
          base bytestring cassava containers graphviz hashable process
          QuickCheck random unordered-containers vector
@@ -89668,8 +89825,8 @@ self: {
        pname = "hashids";
        version = "1.0.2.3";
        sha256 = "0d15h8q4llq7x82g3r3pnyj1lw3ryj5q4nvi2i152agpx0sl5mzc";
-       revision = "1";
-       editedCabalFile = "0yp2lsk906qibir9r3lvln44y8lpjx34w7kmwkqw1a5irzpnxnyc";
+       revision = "2";
+       editedCabalFile = "1l4zz47c0kcpwi7l4dsizddi2c1a6k3v6a0b6w4wjylvzd066fz0";
        libraryHaskellDepends = [ base bytestring containers split ];
        testHaskellDepends = [ base bytestring containers split ];
        homepage = "http://hashids.org/";
@@ -96859,6 +97016,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hgrep" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, ghc
+     , ghc-exactprint, hscolour, lens, optparse-applicative, pcre-heavy
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "hgrep";
+       version = "0.1";
+       sha256 = "1pddn24pw8yv1lp3ihbwnanyvrc1nr974sfba2w91shr8m1kimaf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring ghc ghc-exactprint hscolour lens
+         pcre-heavy template-haskell
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base optparse-applicative
+       ];
+       homepage = "https://github.com/thumphries/hgrep";
+       description = "Search Haskell source code from the command line";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hgrev" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , process, template-haskell
@@ -98465,6 +98645,8 @@ self: {
        pname = "hledger";
        version = "1.4";
        sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75";
+       revision = "1";
+       editedCabalFile = "16q9ji8qrgpxchxmx0k77qq3hhfz5h09qyc7r3pkav04nx3pv1sg";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -98551,8 +98733,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.10";
-       sha256 = "1sslida2pl8r7lfab6lwkws0fq2a8h14rqq01qnxdg2pmfl6q69y";
+       version = "0.2.0.11";
+       sha256 = "1y5f7xdw1rriz2d7qxnkywyjsa09bk6712rks3l1zkihi5i3fnr7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -98573,8 +98755,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.2.6";
        sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36";
-       revision = "2";
-       editedCabalFile = "0a9ciakp892i0g8kf199lh4x0gzisbjaidihhinkf7gk3f40p3il";
+       revision = "3";
+       editedCabalFile = "0avx22jx969dzg865rgpcvg5n844fqinhsnxir0cbmilpfj5a33k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98647,6 +98829,8 @@ self: {
        pname = "hledger-lib";
        version = "1.4";
        sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq";
+       revision = "1";
+       editedCabalFile = "0nyf7cvv5qhz1n48qj3ib1d56q694zj1b1wfqlrzzfj2a7mi2p4c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
@@ -98679,6 +98863,8 @@ self: {
        pname = "hledger-ui";
        version = "1.4";
        sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33";
+       revision = "2";
+       editedCabalFile = "1cm2nbz0wvy05n33km9h69qwch51gc44dk1jzi26ivqqqxy6h6jj";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -98726,6 +98912,8 @@ self: {
        pname = "hledger-web";
        version = "1.4";
        sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h";
+       revision = "1";
+       editedCabalFile = "14ayvky2pjaj2hnxajpb5h0hi2r6fl2ps401abn4apk36y3w16ab";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -99673,6 +99861,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hoauth2_1_4_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, exceptions
+     , http-conduit, http-types, microlens, text, unordered-containers
+     , uri-bytestring, uri-bytestring-aeson, wai, warp
+     }:
+     mkDerivation {
+       pname = "hoauth2";
+       version = "1.4.0";
+       sha256 = "0wksa14mj7pyd6mjv81m1djqs8s79sri8a1by14l626pgai7p3h0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions http-conduit http-types microlens
+         text unordered-containers uri-bytestring uri-bytestring-aeson
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text
+         uri-bytestring wai warp
+       ];
+       homepage = "https://github.com/freizl/hoauth2";
+       description = "Haskell OAuth2 authentication client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hob" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango
@@ -99939,21 +100152,30 @@ self: {
      }) {};
 
   "hol" = callPackage
-    ({ mkDerivation, base, bytestring, containers, pretty, QuickCheck
-     , text, transformers
+    ({ mkDerivation, base, bytestring, containers, filepath, parsec
+     , pretty, process, QuickCheck, text, transformers
      }:
      mkDerivation {
        pname = "hol";
-       version = "1.1";
-       sha256 = "0d3m343zgnffjk5dnv7i5w5nj3jjbw17fnrrwb10vq177fkbq4gz";
+       version = "1.2";
+       sha256 = "121nz9v05fj7qph9x1c7vg7zasvcm2bdlqsk8y0apvgx1wh58cdp";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers pretty text transformers
+         base bytestring containers filepath parsec pretty process text
+         transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring containers filepath parsec pretty process
+         QuickCheck text transformers
        ];
        testHaskellDepends = [
-         base bytestring containers pretty QuickCheck text transformers
+         base bytestring containers filepath parsec pretty process
+         QuickCheck text transformers
        ];
        benchmarkHaskellDepends = [
-         base bytestring containers pretty text transformers
+         base bytestring containers filepath parsec pretty process text
+         transformers
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
@@ -101175,8 +101397,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.19.1";
-       sha256 = "0ncq8kpmsz6lhqajap9ql5ln3pva9hxwk69hsi3x0dgjvkivpsaf";
+       version = "0.19.2";
+       sha256 = "0kwsy3qwhvc55czszddbq16nz2wniwx7m04i9fkywxcrifjkk7n4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101511,6 +101733,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpio_0_9_0_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , doctest, exceptions, filepath, hlint, hspec, monad-control
+     , monad-logger, mtl, optparse-applicative, protolude, QuickCheck
+     , text, transformers, transformers-base, unix, unix-bytestring
+     }:
+     mkDerivation {
+       pname = "hpio";
+       version = "0.9.0.0";
+       sha256 = "1j69y396k08af6pvxj0l1687fdfknsyv3xhy7lhhibglv6nskg48";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory exceptions filepath
+         monad-control monad-logger mtl protolude QuickCheck text
+         transformers transformers-base unix unix-bytestring
+       ];
+       executableHaskellDepends = [
+         async base exceptions mtl optparse-applicative protolude text
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers directory doctest exceptions filepath hlint hspec
+         protolude QuickCheck
+       ];
+       homepage = "https://github.com/quixoftic/hpio#readme";
+       description = "Monads for GPIO in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -101993,6 +102246,19 @@ self: {
        license = "GPL";
      }) {};
 
+  "hs-bibutils_6_2" = callPackage
+    ({ mkDerivation, base, syb }:
+     mkDerivation {
+       pname = "hs-bibutils";
+       version = "6.2";
+       sha256 = "0nzw06qn8ff6k2bl92fmd1wwxcy8m0r9lm34mg41ffnm8jm2scfn";
+       libraryHaskellDepends = [ base syb ];
+       homepage = "https://github.com/wilx/hs-bibutils";
+       description = "Haskell bindings to bibutils, the bibliography conversion utilities";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hs-blake2" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
      , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -104040,15 +104306,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_1;};
 
-  "hslua_0_8_0" = callPackage
+  "hslua_0_9_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, fail
      , lua5_1, mtl, QuickCheck, quickcheck-instances, tasty
      , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.8.0";
-       sha256 = "0zl7znhbwnqcdvy9v18x3ch8vxk719k5lx55nr65996wb193nwmc";
+       version = "0.9.0";
+       sha256 = "1ka6vacjrs4y7c83ay7zpvw3kgv19snb50jmfb8j00dprap5wwgq";
        configureFlags = [ "-fsystem-lua" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
@@ -104085,15 +104351,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hslua-aeson_0_3_0" = callPackage
+  "hslua-aeson_0_3_0_1" = callPackage
     ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
      , ieee754, QuickCheck, quickcheck-instances, scientific, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hslua-aeson";
-       version = "0.3.0";
-       sha256 = "1vsgncxxdwachbqp7pbckij94621zccz001hs774asvyc12anp38";
+       version = "0.3.0.1";
+       sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w";
        libraryHaskellDepends = [
          aeson base hashable hslua scientific text unordered-containers
          vector
@@ -108413,8 +108679,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.0.0";
-       sha256 = "0l3vyygyan5j52af8g5s24435hxy0pr6j89yqzy5mp3dv12qlr53";
+       version = "2.0.1";
+       sha256 = "14pgl4q2m0hqz6xnj8gg9n5jlqqvl07xrqw3fn2m4gj9hcf768pq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113614,10 +113880,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.9.2";
-       sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj";
-       revision = "2";
-       editedCabalFile = "1l6gj2678rbaryby9gzsqvyjyknyfc2r6xj27kbcb02cz4igga7m";
+       version = "0.9.3";
+       sha256 = "0r8kxdxh08plmal9q2i098hlgxvii67ylprzwqzrwa1i9qlcv7v6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -121130,8 +121394,8 @@ self: {
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "language-vhdl";
-       version = "0.1.2.8";
-       sha256 = "1065j91bzwsn04xgg8sfdpdfvg2630ss6ic37ynibpxm619mq93a";
+       version = "0.1.3";
+       sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka";
        libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/markus-git/language-vhdl";
        description = "VHDL AST and pretty printer in Haskell";
@@ -121368,7 +121632,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lattices_1_6_0" = callPackage
+  "lattices_1_7" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty
      , tasty-quickcheck, transformers, universe-base
@@ -121377,8 +121641,8 @@ self: {
      }:
      mkDerivation {
        pname = "lattices";
-       version = "1.6.0";
-       sha256 = "0v0nl212cawd2pwbka7w8vl0gmrf1r0yv40dmwl5ffq33v5ihxd0";
+       version = "1.7";
+       sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc";
        libraryHaskellDepends = [
          base base-compat containers deepseq hashable semigroupoids tagged
          universe-base universe-reverse-instances unordered-containers
@@ -121413,6 +121677,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lawless-concurrent-machines" = callPackage
+    ({ mkDerivation, async, base, containers, lifted-async, machines
+     , monad-control, semigroups, tasty, tasty-hunit, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "lawless-concurrent-machines";
+       version = "0.3.1";
+       sha256 = "17y523yahblrd5zq7f5nvr93fg4bqr9aj0zi915l16ffv8hqvply";
+       libraryHaskellDepends = [
+         async base containers lifted-async machines monad-control
+         semigroups time transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base machines tasty tasty-hunit time transformers
+       ];
+       benchmarkHaskellDepends = [ base machines time ];
+       description = "Concurrent networked stream transducers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lax" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -123134,9 +123419,9 @@ self: {
 
   "liblawless" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, binary
-     , boomerang, bytestring, concurrent-machines, containers
-     , containers-unicode-symbols, contravariant, data-textual, dns
-     , exceptions, filepath, hjsonschema, lens, lifted-async
+     , boomerang, bytestring, containers, containers-unicode-symbols
+     , contravariant, data-textual, dns, exceptions, filepath
+     , hjsonschema, lawless-concurrent-machines, lens, lifted-async
      , lifted-base, machines, managed, monad-control, mtl, network
      , network-ip, parsers, pathtype, protolude, QuickCheck, random
      , semigroups, stm, stm-chans, stm-containers, temporary
@@ -123146,13 +123431,13 @@ self: {
      }:
      mkDerivation {
        pname = "liblawless";
-       version = "0.25.2";
-       sha256 = "0s1qahk7yabggjv4zkqxiy4yygzbq8zwbh5nvh46zm0r09q802s1";
+       version = "0.26.0";
+       sha256 = "0izkk1rfiny4fnjazbpq04wzhcjgfwsr9fs10lpn9ifp4ckahynj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
-         concurrent-machines containers containers-unicode-symbols
-         contravariant data-textual dns exceptions hjsonschema lens
+         containers containers-unicode-symbols contravariant data-textual
+         dns exceptions hjsonschema lawless-concurrent-machines lens
          lifted-async lifted-base machines managed monad-control mtl network
          network-ip parsers pathtype protolude QuickCheck random semigroups
          stm stm-chans stm-containers temporary text text-printer time
@@ -123795,13 +124080,15 @@ self: {
      }) {};
 
   "light" = callPackage
-    ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl }:
+    ({ mkDerivation, base, containers, gjk2d, lens, linear, mtl
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "light";
-       version = "0.2.0.0";
-       sha256 = "1nrzh3z2fxkzws80amxw112idwlwb7r07igr0381jryfacip0ryy";
+       version = "0.2.0.1";
+       sha256 = "1lhwir14di3chnj6xn28cwkzmim5d4cq39da82ils6mhghjgzjbg";
        libraryHaskellDepends = [ base containers gjk2d lens linear mtl ];
-       testHaskellDepends = [ base containers lens linear ];
+       testHaskellDepends = [ base containers lens linear QuickCheck ];
        homepage = "https://github.com/suzumiyasmith/light#readme";
        description = "a simple physics engine";
        license = stdenv.lib.licenses.bsd3;
@@ -126321,8 +126608,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.2.2";
-       sha256 = "0hxw0j3zp6vs4si1v8ziy0g2a06smny6fmjqhd9v5hvdcfnqnm9b";
+       version = "1.2.3";
+       sha256 = "0r3f2chnzyizm0kz7crjynycs2kzbvh5aw3a0qwc66gbignjnbkw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127476,6 +127763,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid_2_9_9" = callPackage
+    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
+     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
+     , mtl, parsec, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lucid";
+       version = "2.9.9";
+       sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers hashable mmorph mtl text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text transformers
+       ];
+       homepage = "https://github.com/chrisdone/lucid";
+       description = "Clear to write, read and edit DSL for HTML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lucid-extras" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid
      , text
@@ -128201,8 +128513,8 @@ self: {
      }:
      mkDerivation {
        pname = "mackerel-client";
-       version = "0.0.5";
-       sha256 = "17ppg6nzm8q6fz1y630vzda1rgc8fkhxhjabmvis79h2k3q994s5";
+       version = "0.1.0";
+       sha256 = "0x1i311281pswpcgwgjfhk4x2576h8ycg1i3ira29hyph1q0r7a0";
        libraryHaskellDepends = [
          aeson base bytestring data-default directory filepath htoml
          http-client http-client-tls http-types parsec split text
@@ -128270,8 +128582,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.4.0.2";
-       sha256 = "0jc86l0cz9nnp11fdn10qyb78g1klaq6qlipqrzrq5vil419vdss";
+       version = "2.4.1.3";
+       sha256 = "1766dk570fpakjxbk50ll8a29kl67s4wvkwwifacz1h39iqj8984";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128284,7 +128596,7 @@ self: {
          base hspec hspec-megaparsec megaparsec mtl text
        ];
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
-       homepage = "https://github.com/vmchale/madlang#readme";
+       homepage = "https://hub.darcs.net/vmchale/madlang";
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129446,15 +129758,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "markup_4_0_1" = callPackage
+  "markup_4_0_3" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad
      , lucid, mmorph, monad-control, monad-logger, mtl, path-extra
      , resourcet, text, transformers-base, urlpath
      }:
      mkDerivation {
        pname = "markup";
-       version = "4.0.1";
-       sha256 = "1g2vdwwk0if46q0gc1gw4zpbxjbq6lpii0yab6yazdk4a2snakmx";
+       version = "4.0.3";
+       sha256 = "1a4n89j8z3sgyigbxkc10lb3kz6x5bf0kdcs1k0hydcj0vdvwqh3";
        libraryHaskellDepends = [
          base blaze-html blaze-markup clay comonad lucid mmorph
          monad-control monad-logger mtl path-extra resourcet text
@@ -131284,6 +131596,8 @@ self: {
        pname = "mercury-api";
        version = "0.1.0.1";
        sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr";
+       revision = "1";
+       editedCabalFile = "0k8k9lcvpwkvz4w0ydrxzzmfgch8885h6vdybvqi7ra4kvhf4gzs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -135389,8 +135703,8 @@ self: {
      }:
      mkDerivation {
        pname = "morph";
-       version = "0.1.1.1";
-       sha256 = "1p25jy5ri2jlxsrbw8c12zvhc625bfh0zba9bjy9vx3yg5wmaciv";
+       version = "0.1.1.2";
+       sha256 = "0imhi6yd7phfgd8mykdcd6p1fs28rzp367pzpznrg41nh7arjv6h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140086,6 +140400,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport-tests_0_2_4_2" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
+     , network-transport, random
+     }:
+     mkDerivation {
+       pname = "network-transport-tests";
+       version = "0.2.4.2";
+       sha256 = "1iyb4zm2iw805qfnlhnlwm2hh1ajhzgzlghsn8g3hnpdgszw896b";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring containers mtl network-transport
+         random
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Unit tests for Network.Transport implementations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-zeromq" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, containers
      , criterion, data-accessor, distributed-process
@@ -140510,8 +140842,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.8.0.6";
-       sha256 = "12lynhl8kn5vpp9ajaiv0vylbyzf16bykprjvg16nvvw5maww1ll";
+       version = "0.8.0.7";
+       sha256 = "0k8ncavrwkq6wmn8yb87cb9cz6m47iw94k4nl2b0pc1ziik7klip";
        libraryHaskellDepends = [
          async base binary bytestring monad-loops template-haskell unix
        ];
@@ -143133,6 +143465,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, contravariant, dotenv, hspec
+     , hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, semigroups, text
+     , time, time-locale-compat, transformers, uuid, void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.6.0.0";
+       sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors semigroups text time time-locale-compat transformers
+         uuid void
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant dotenv hspec hspec-discover
+         multiset postgresql-simple product-profunctors profunctors
+         QuickCheck semigroups text time transformers
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -143485,15 +143845,15 @@ self: {
 
   "openflow" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
-     , deepseq-generics, hashable, network
+     , deepseq, deepseq-generics, hashable, network
      }:
      mkDerivation {
        pname = "openflow";
-       version = "0.3.0";
-       sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2";
+       version = "0.3.1";
+       sha256 = "0gyld73v5jjfd0ddkp62kxx05f5nr7rnald5ci7r4idp0lwndk22";
        libraryHaskellDepends = [
-         aeson base bimap binary bytestring containers deepseq-generics
-         hashable network
+         aeson base bimap binary bytestring containers deepseq
+         deepseq-generics hashable network
        ];
        homepage = "https://github.com/AndreasVoellmy/openflow";
        description = "OpenFlow";
@@ -149666,8 +150026,8 @@ self: {
        pname = "pgdl";
        version = "10.9";
        sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z";
-       revision = "4";
-       editedCabalFile = "04kg2i0y7yb0577kk8v1v7rgji80agmi0aq350lf0rl77r2ksy85";
+       revision = "5";
+       editedCabalFile = "1asqw4k0v57ysi7yqlk506vnkb162swfv2230s8q43r6kvj7171k";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -153593,8 +153953,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "3.2.0";
-       sha256 = "02ga7i1b4nin05lnh0dwr52w7xhz723an0zlypjccka1i7l42pvz";
+       version = "3.3.0";
+       sha256 = "0ilny7vj5ch77kic1bmpm160phv3yxm1cd3ksj6j8gc2nvaysrr8";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
@@ -155208,6 +155568,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "primes-type" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, HTF, primes }:
+     mkDerivation {
+       pname = "primes-type";
+       version = "0.2.0.2";
+       sha256 = "0d2nhb0kbpls4ybipnjf2bf73dz1as5qhb0cjz59nmsipkqcr45s";
+       libraryHaskellDepends = [ base deepseq primes ];
+       testHaskellDepends = [ base HTF primes ];
+       benchmarkHaskellDepends = [ base criterion primes ];
+       homepage = "https://github.com/kindaro/primes-type#readme";
+       description = "Type-safe prime numbers";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "primesieve" = callPackage
     ({ mkDerivation, base, foundation, primesieve }:
      mkDerivation {
@@ -155812,6 +156186,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "producer" = callPackage
+    ({ mkDerivation, base, checkers, QuickCheck, tasty, tasty-auto
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "producer";
+       version = "0.1.0.0";
+       sha256 = "0dg0yj5b39ghhh6jx9mp9mya3wwzgv6ldkvqxplr1bv3bvxvjkrr";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base checkers QuickCheck tasty tasty-auto tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/etorreborre/producer-hs#readme";
+       description = "Simple streaming datatype";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "product-isomorphic" = callPackage
     ({ mkDerivation, base, template-haskell, th-data-compat }:
      mkDerivation {
@@ -156299,6 +156691,30 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "prometheus-effect" = callPackage
+    ({ mkDerivation, base, bytestring, clock, hashable, http-streams
+     , http-types, io-streams, mtl, retry, safe-exceptions, streaming
+     , streaming-bytestring, streaming-utils, streaming-wai, text
+     , transformers, unordered-containers, vector, vector-algorithms
+     , wai
+     }:
+     mkDerivation {
+       pname = "prometheus-effect";
+       version = "1.0.0";
+       sha256 = "132mzsi5g6fmc2141vd1dwix2an0a00xq15ypr74larz7c7v6qk7";
+       revision = "1";
+       editedCabalFile = "01mkdbif7girjyi3aganp9c8m0di6zv3ddw8brqwlw6r4h3w2imf";
+       libraryHaskellDepends = [
+         base bytestring clock hashable http-streams http-types io-streams
+         mtl retry safe-exceptions streaming streaming-bytestring
+         streaming-utils streaming-wai text transformers
+         unordered-containers vector vector-algorithms wai
+       ];
+       homepage = "https://github.com/ocharles/prometheus-effect";
+       description = "Instrument applications with metrics and publish/push to Prometheus";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prometheus-metrics-ghc" = callPackage
     ({ mkDerivation, base, doctest, prometheus-client, utf8-string }:
      mkDerivation {
@@ -160900,15 +161316,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_2_5_2" = callPackage
+  "rattletrap_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, binary-bits
      , bytestring, containers, data-binary-ieee754, filepath, hspec
      , template-haskell, temporary, text, vector
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.5.2";
-       sha256 = "13l4gx7l0qniyny5llniwmymk8kbi7lak1gq68hyx9wnmjhbw585";
+       version = "3.0.0";
+       sha256 = "0n24q5vjbrv093n1nchf7pkn0ibkp75zm5mbjrmdwvr6vlb1ih73";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162381,8 +162797,8 @@ self: {
        pname = "reducers";
        version = "3.12.1";
        sha256 = "0pkddg0s3cn759miq0nfrq7lnp3imk5sx784ihsilsbjh9kvffz4";
-       revision = "1";
-       editedCabalFile = "1gn2s6r503cmxh8agcbif8q322503ix1igiks4kdz3rn97aliay6";
+       revision = "2";
+       editedCabalFile = "00zxyyaj0grvr214qdrg68114b93iwp27vmww254s2yq9z701gf8";
        libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
@@ -162392,6 +162808,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reducers_3_12_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, fingertree
+     , hashable, semigroupoids, semigroups, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "reducers";
+       version = "3.12.2";
+       sha256 = "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65";
+       libraryHaskellDepends = [
+         array base bytestring containers fingertree hashable semigroupoids
+         semigroups text transformers unordered-containers
+       ];
+       homepage = "http://github.com/ekmett/reducers/";
+       description = "Semigroups, specialized containers and a general map/reduce framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reedsolomon" = callPackage
     ({ mkDerivation, base, bytestring, criterion, exceptions, gitrev
      , loop, mtl, primitive, profunctors, QuickCheck, random, tasty
@@ -167337,9 +167772,9 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "rss-conduit_0_4_1_0" = callPackage
-    ({ mkDerivation, atom-conduit, base, bytestring, conduit
-     , conduit-combinators, containers, data-default
+  "rss-conduit_0_4_2_0" = callPackage
+    ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
+     , conduit, conduit-combinators, containers, data-default
      , dublincore-xml-conduit, hlint, lens-simple, mono-traversable
      , QuickCheck, quickcheck-instances, resourcet, safe
      , safe-exceptions, singletons, tasty, tasty-hunit, tasty-quickcheck
@@ -167348,19 +167783,20 @@ self: {
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.4.1.0";
-       sha256 = "0lal33vjsdz5k63ljlx4430an1x3hgw6nn1aixf531bwdglxgg5c";
+       version = "0.4.2.0";
+       sha256 = "1fgaf15i2fbr1v2kd0s80zkbafsl50sv4b48my0nvs8vqhha5n7y";
        libraryHaskellDepends = [
          atom-conduit base conduit conduit-combinators containers
          dublincore-xml-conduit lens-simple safe safe-exceptions singletons
          text time timerep uri-bytestring vinyl xml-conduit xml-types
        ];
        testHaskellDepends = [
-         atom-conduit base bytestring conduit conduit-combinators
-         data-default dublincore-xml-conduit hlint lens-simple
-         mono-traversable QuickCheck quickcheck-instances resourcet
-         safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text
-         time uri-bytestring vinyl xml-conduit xml-types
+         atom-conduit base blaze-builder bytestring conduit
+         conduit-combinators data-default dublincore-xml-conduit hlint
+         lens-simple mono-traversable QuickCheck quickcheck-instances
+         resourcet safe-exceptions singletons tasty tasty-hunit
+         tasty-quickcheck text time uri-bytestring vinyl xml-conduit
+         xml-types
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
@@ -168945,10 +169381,10 @@ self: {
     ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }:
      mkDerivation {
        pname = "scalendar";
-       version = "1.1.0";
-       sha256 = "077v0k745z1hs8k8yb5s6ln1ing8b5fllp7gw2kcrlrw108ijvwb";
-       revision = "5";
-       editedCabalFile = "02p4iy6vypz6q0zh5wmy3lp1s9zrcvqn9xx8vczl8000wa0asn7p";
+       version = "1.1.1";
+       sha256 = "1hsj1wa4x4qf6vwnxpfl40cx1ghrkdalz5a0nq0si83ykdq14ylf";
+       revision = "1";
+       editedCabalFile = "0ivxl975nlrpzz3rpq4hc9zi4rp7b3lvjn6izp4l83fm3crkl15i";
        libraryHaskellDepends = [ base containers text time ];
        testHaskellDepends = [
          base containers hspec QuickCheck text time
@@ -169257,26 +169693,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "schematic_0_3_0_0" = callPackage
+  "schematic_0_3_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hjsonschema
      , hspec, hspec-core, hspec-discover, hspec-smallcheck, HUnit, lens
-     , mtl, regex-compat, scientific, singletons, smallcheck, tagged
-     , text, unordered-containers, validationt, vector, vinyl
+     , mtl, profunctors, regex-tdfa, regex-tdfa-text, scientific
+     , singletons, smallcheck, tagged, text, unordered-containers
+     , validationt, vector, vinyl
      }:
      mkDerivation {
        pname = "schematic";
-       version = "0.3.0.0";
-       sha256 = "0nrq36s646h6lrfqw9hf7ysmc8b2x7dkrj07x1dy2x1ihph5my12";
+       version = "0.3.2.0";
+       sha256 = "0bzxab3ijnc5qxglcw4kbcznv22r8n11h5qrsgwlyh3r4qa0by72";
        libraryHaskellDepends = [
-         aeson base bytestring containers hjsonschema mtl regex-compat
-         scientific singletons smallcheck tagged text unordered-containers
-         validationt vector vinyl
+         aeson base bytestring containers hjsonschema mtl profunctors
+         regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged
+         text unordered-containers validationt vector vinyl
        ];
        testHaskellDepends = [
          aeson base bytestring containers hjsonschema hspec hspec-core
-         hspec-discover hspec-smallcheck HUnit lens regex-compat singletons
-         smallcheck tagged text unordered-containers validationt vinyl
+         hspec-discover hspec-smallcheck HUnit lens regex-tdfa
+         regex-tdfa-text singletons smallcheck tagged text
+         unordered-containers validationt vinyl
        ];
+       homepage = "http://github.com/typeable/schematic";
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170032,6 +170471,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scuttlebutt-types" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , cryptonite, ed25519, hspec, memory, text
+     }:
+     mkDerivation {
+       pname = "scuttlebutt-types";
+       version = "0.2.0";
+       sha256 = "0aghmdc16x0i7mzldx7gdq1n6g81kccq8gp24klf0000vbj8xa7h";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptonite ed25519 memory
+         text
+       ];
+       testHaskellDepends = [ aeson base bytestring hspec text ];
+       description = "generic types for Secure Scuttlebutt";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scyther-proof" = callPackage
     ({ mkDerivation, alex, array, base, cmdargs, containers, directory
      , filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time
@@ -170524,22 +170980,21 @@ self: {
      }) {};
 
   "secp256k1" = callPackage
-    ({ mkDerivation, base, base16-bytestring, binary, bytestring, Cabal
-     , cryptohash, entropy, HUnit, largeword, mtl, QuickCheck
-     , string-conversions, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
+     , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "secp256k1";
-       version = "0.4.8";
-       sha256 = "0jnvsfmjrac8l07l32xi1vlbbjpvzhmsb1fv5ajvjkw7yrd4byqk";
+       version = "0.5.2";
+       sha256 = "1havyn28i2044vxgla2j46qsv4wngy8y6wkkh9v3c1vi35sfzimq";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
-         base base16-bytestring binary bytestring entropy largeword mtl
-         QuickCheck string-conversions
+         base base16-bytestring bytestring cereal entropy mtl QuickCheck
+         string-conversions
        ];
        testHaskellDepends = [
-         base base16-bytestring binary bytestring cryptohash entropy HUnit
+         base base16-bytestring bytestring cereal cryptohash entropy HUnit
          mtl QuickCheck string-conversions test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -172798,25 +173253,26 @@ self: {
      }) {};
 
   "servant-rawm" = callPackage
-    ({ mkDerivation, base, bytestring, filepath, http-client
-     , http-media, http-types, resourcet, servant, servant-client
-     , servant-docs, servant-server, text, transformers, wai
-     , wai-app-static, warp
+    ({ mkDerivation, base, bytestring, containers, filepath
+     , http-client, http-media, http-types, lens, resourcet, servant
+     , servant-client, servant-docs, servant-server, text, transformers
+     , wai, wai-app-static, warp
      }:
      mkDerivation {
        pname = "servant-rawm";
-       version = "0.1.0.0";
-       sha256 = "0h3s0sca9x612lr2ndv0vccdyscb93amqiwg511rwh6i5y0jrv7d";
+       version = "0.2.0.0";
+       sha256 = "029lwzy0r28l1axpmrlcazsqa38q7a6fbq1vzh484dhfy9j2j5wj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring filepath http-client http-media http-types
-         resourcet servant servant-client servant-docs servant-server wai
-         wai-app-static
+         base bytestring containers filepath http-client http-media
+         http-types lens resourcet servant servant-client servant-docs
+         servant-server wai wai-app-static
        ];
        executableHaskellDepends = [
          base bytestring http-client http-media http-types servant
-         servant-client servant-server text transformers wai warp
+         servant-client servant-docs servant-server text transformers wai
+         warp
        ];
        homepage = "https://github.com/cdepillabout/servant-rawm";
        description = "Embed a raw 'Application' in a Servant API";
@@ -176066,8 +176522,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "simple-smt";
-       version = "0.7.0";
-       sha256 = "19c7hvjqcdzwvyyas58zyjs1i8zawmnqc84mm5sk7rp0wf3ic6c7";
+       version = "0.7.1";
+       sha256 = "1h7acjqis9qrj4i5k4aspjjrd8a86bkhhcn6ib3aa8s384ar0wfv";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
@@ -183740,6 +184196,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "storable-tuple_0_0_3_3" = callPackage
+    ({ mkDerivation, base, base-orphans, storable-record, utility-ht }:
+     mkDerivation {
+       pname = "storable-tuple";
+       version = "0.0.3.3";
+       sha256 = "0dfzhxgkn1l6ls7zh6iifhyvhm8l47n40z0ar23c6ibsa94w1ynw";
+       libraryHaskellDepends = [
+         base base-orphans storable-record utility-ht
+       ];
+       homepage = "http://code.haskell.org/~thielema/storable-tuple/";
+       description = "Storable instance for pairs and triples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "storablevector" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, non-negative
      , QuickCheck, random, sample-frame, syb, transformers, unsafe
@@ -184645,14 +185116,14 @@ self: {
 
   "strict-types" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , foundation, hashable, text, unordered-containers, vector
+     , hashable, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "strict-types";
-       version = "0.1.0.6";
-       sha256 = "0dp0179g20g62vn6c5wv2d7d9kwwix40rxzwfig6f0pi8rm16jxj";
+       version = "0.1.2";
+       sha256 = "0yapmsia9lmgjgvmcpk9m1z6gc63qic6vvnmnxvmh2k9887n41li";
        libraryHaskellDepends = [
-         array base bytestring containers deepseq foundation hashable text
+         array base bytestring containers deepseq hashable text
          unordered-containers vector
        ];
        homepage = "https://github.com/pepeiborra/strict-types";
@@ -185111,6 +185582,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_4_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
+     , http-client, http-client-tls, http-types, markdown-unlit
+     , template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "strive";
+       version = "4.0.0";
+       sha256 = "11z7xxq8157pgpp48argcik0l2323lvjf2rxn01rdk7sx5gby9mh";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default gpolyline http-client
+         http-client-tls http-types template-haskell text time transformers
+       ];
+       testHaskellDepends = [ base bytestring markdown-unlit time ];
+       homepage = "https://github.com/tfausak/strive#readme";
+       description = "A client for the Strava V3 API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strptime" = callPackage
     ({ mkDerivation, base, bytestring, text, time }:
      mkDerivation {
@@ -185408,8 +185899,8 @@ self: {
      }:
      mkDerivation {
        pname = "styx";
-       version = "1.3";
-       sha256 = "0bqpqixdwdh2j28mdg52a0yvzrjs8gwmyapknqb2mlhf1w3f21cp";
+       version = "1.3.1";
+       sha256 = "0g2pgczmk647ckyfq6yvb8isjjswjvymz4l065w4m79by9wkjlmb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -186215,22 +186706,23 @@ self: {
      }) {};
 
   "swagger-petstore" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, exceptions, hspec, http-api-data, http-client
-     , http-client-tls, http-media, http-types, iso8601-time, microlens
-     , monad-logger, mtl, network, QuickCheck, random, safe-exceptions
-     , semigroups, text, time, transformers, unordered-containers
-     , vector
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, containers, deepseq, exceptions, hspec
+     , http-api-data, http-client, http-client-tls, http-media
+     , http-types, iso8601-time, katip, microlens, mtl, network
+     , QuickCheck, random, safe-exceptions, semigroups, text, time
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "swagger-petstore";
-       version = "0.0.1.1";
-       sha256 = "1zpxs97lrpv4ailn6mqdx6ihbzilcsjcycrc8qj1v1f1lg00m9k6";
+       version = "0.0.1.2";
+       sha256 = "1027kj163mjp78gxl1g77jgxg5n6q5xkhvy4zdx3wlcjc2b3mjah";
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers exceptions
-         http-api-data http-client http-client-tls http-media http-types
-         iso8601-time microlens monad-logger mtl network random
-         safe-exceptions text time transformers unordered-containers vector
+         aeson base base64-bytestring bytestring case-insensitive containers
+         deepseq exceptions http-api-data http-client http-client-tls
+         http-media http-types iso8601-time katip microlens mtl network
+         random safe-exceptions text time transformers unordered-containers
+         vector
        ];
        testHaskellDepends = [
          aeson base bytestring containers hspec iso8601-time mtl QuickCheck
@@ -186830,8 +187322,8 @@ self: {
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "3.6.3";
-       sha256 = "1w7kyk4030zy2p200qwb61qf17iasvrpzhpz0n8a186lvikc7dlk";
+       version = "3.7";
+       sha256 = "1x6hl048247d3h8bi3b94kqmgsmcc0d751n2mdyxim26cg1vnwzf";
        libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl syb
          template-haskell tree-view
@@ -191236,6 +191728,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "texmath_0_9_4_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.9.4.4";
+       sha256 = "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -192383,6 +192900,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-data-compat_0_0_2_5" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "th-data-compat";
+       version = "0.0.2.5";
+       sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "Compatibility for data definition template of TH";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-desugar" = callPackage
     ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
      , template-haskell, th-expand-syns, th-lift, th-orphans
@@ -192635,6 +193164,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-reify-compat_0_0_1_3" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "th-reify-compat";
+       version = "0.0.1.3";
+       sha256 = "0byl2n0lj55vx2kyka172bwvw8zcyag78cnqs7y9yp4kl8ivwh8z";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/khibino/haskell-th-reify-compat/";
+       description = "Compatibility for the result type of TH reify";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-reify-many" = callPackage
     ({ mkDerivation, base, containers, mtl, safe, template-haskell
      , th-expand-syns
@@ -193005,6 +193547,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "thread-hierarchy" = callPackage
+    ({ mkDerivation, base, containers, hspec, lifted-base
+     , monad-control, transformers-base
+     }:
+     mkDerivation {
+       pname = "thread-hierarchy";
+       version = "0.1.0.1";
+       sha256 = "05qpm77711r9viwij5vznrmk8ij89lxhpwxdk8dpk0rq2ll5iyyq";
+       libraryHaskellDepends = [
+         base containers lifted-base monad-control transformers-base
+       ];
+       testHaskellDepends = [ base containers hspec ];
+       homepage = "https://github.com/nshimaza/thread-hierarchy#readme";
+       description = "Simple Haskel thread management in hierarchical manner";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "thread-local-storage" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, criterion }:
      mkDerivation {
@@ -195894,12 +196453,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers_0_5_4_0" = callPackage
+  "transformers_0_5_5_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "transformers";
-       version = "0.5.4.0";
-       sha256 = "16l8p2yq8v12n1ri4zbv04m0acnfl4y69bddbbsmmn52i8rkyzzq";
+       version = "0.5.5.0";
+       sha256 = "198ric8gr1y58scckr468d11y2g45mzc5pkaa40shj7xgj1bh7mi";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -196445,12 +197004,13 @@ self: {
      }:
      mkDerivation {
        pname = "treefold";
-       version = "0.1.0.0";
-       sha256 = "1svpbrvw7j35kp25mcddallfl9miafdyb2dm2wbmj461sh95qd7g";
+       version = "0.2.0.0";
+       sha256 = "0kzx1p9cznj8v0c7bhjj503qav2c9b4dw67likvzqrdqf348vhs5";
        libraryHaskellDepends = [ base parallel ];
        testHaskellDepends = [ base doctest hedgehog ];
        benchmarkHaskellDepends = [ base containers criterion random ];
        homepage = "https://github.com/oisdk/treefold";
+       description = "Provides folds which try to combine elements in a balanced way";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -198816,8 +199376,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-wire-utils";
-       version = "0.1.0.0";
-       sha256 = "0c5j3akhbimppfx9vsz5d93jil67ml58pn249sgmczg22ybg5v96";
+       version = "0.2.0.0";
+       sha256 = "0v5gdydkd2gr3rb2p7js19j3w1v8zzck65mfywmlihp3ngfb8h2d";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring text time
        ];
@@ -201361,8 +201921,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-parse";
-       version = "0.1.0.0";
-       sha256 = "0wkqlnbfnzzqr6pw2f934w2z9x8hgghg4cwf3l5kazbaj25cangx";
+       version = "0.1.0.1";
+       sha256 = "0dw9wms9x50yf0snk0qv628nmxsdp3ksnmjqz66lhdfzd1s5zv0k";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default http-types lens text
        ];
@@ -201557,7 +202117,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "urlpath_6_0_3" = callPackage
+  "urlpath_7_0_0" = callPackage
     ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
      , monad-control, monad-control-aligned, monad-logger, mtl
      , path-extra, resourcet, split, strict, text, transformers
@@ -201565,8 +202125,8 @@ self: {
      }:
      mkDerivation {
        pname = "urlpath";
-       version = "6.0.3";
-       sha256 = "0nyh47ra4y8q2pjbd1azkg0khqpq9qw2k8dxnhv4jf8jvjpf9zrk";
+       version = "7.0.0";
+       sha256 = "0al003vwbr286rj9la5w01zfj1q3jccfia6iy38w3d0hajkmw6qj";
        libraryHaskellDepends = [
          attoparsec-uri base exceptions mmorph monad-control
          monad-control-aligned monad-logger mtl path-extra resourcet split
@@ -203487,12 +204047,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-space_0_11" = callPackage
+  "vector-space_0_12" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
        pname = "vector-space";
-       version = "0.11";
-       sha256 = "154d09f2a27ph38xgfdwg65bif9rgb9k92avgfjrylk649zpwi4h";
+       version = "0.12";
+       sha256 = "16nzp2m6pcbqp27dm54v9a009j7jdjkrhw2hm1rgvh5jh4alyzi3";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
@@ -208292,8 +208852,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "wiringPi";
-       version = "1.0.1";
-       sha256 = "1i4sidhhwmvn15996cv4415nylcra204pa51zd133pnckcqxbb5k";
+       version = "1.0.1.1";
+       sha256 = "12n21ycl977pw848mh26pplckgrdxrndv7igii99ypvrp0n307ak";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -212415,8 +212975,8 @@ self: {
      }:
      mkDerivation {
        pname = "yarn-lock";
-       version = "0.3.1";
-       sha256 = "0plsv7qhl43y85dwzybbik2fx1bm23lz8m5l1fyhd363v9f2df7x";
+       version = "0.3.4";
+       sha256 = "0w7ss3lpx37bm3cqigjgddjqm6pwi5117mz60jyw1d70xrgw8wbz";
        libraryHaskellDepends = [
          base containers either megaparsec protolude text
        ];

From 929eadebb0339ace4b72e7e678ee8108f3c01d62 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Oct 2017 10:23:59 +0200
Subject: [PATCH 57/77] git-annex: update to version 6.20171003

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5941209d7a7..10440572597 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -98,7 +98,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "03fa03n4zkpj5z3ma1ahvnxd85dni2aikqayqf838jvfl7bd5b9n";
+      sha256 = "0ky3avbda1avccalkh7ifjnll37cjjmdyypw9m1glsrzgzmr5lbr";
     };
   })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From be86af09b4f60ea7c37d5358e5e7b9797702bdd6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 6 Oct 2017 12:49:42 +0200
Subject: [PATCH 58/77] u3-tool: init at 0.3

---
 pkgs/tools/filesystems/u3-tool/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/filesystems/u3-tool/default.nix

diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix
new file mode 100644
index 00000000000..65eafe76710
--- /dev/null
+++ b/pkgs/tools/filesystems/u3-tool/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "u3-tool";
+  version = "0.3";
+  name = "${pname}-${version}";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk";
+    homepage = https://sourceforge.net/projects/u3-tool/ ;
+    license = licenses.gpl2;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ makefu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d017f39cb5..e98e74647b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1446,6 +1446,8 @@ with pkgs;
 
   cuetools = callPackage ../tools/cd-dvd/cuetools { };
 
+  u3-tool = callPackage ../tools/filesystems/u3-tool { };
+
   unifdef = callPackage ../development/tools/misc/unifdef { };
 
   unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };

From 3e37e20fa56bfc97a5de7bbd350c8dfad49f01bc Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Fri, 6 Oct 2017 08:33:57 -0700
Subject: [PATCH 59/77] bazel: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e0c027ee632..8701db8d161 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.6.0";
+  version = "0.6.1";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "13jr00jb34ibpqvy1qzzmswc7zfcy82ks7w36iwzh7jlm4l3grd0";
+    sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns";
   };
 
   sourceRoot = ".";

From 882bceac5d0a898b9d602a221a4fede654c41eb0 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 6 Oct 2017 12:57:03 +0200
Subject: [PATCH 60/77] rawtherapee: 5.2 -> 5.3

---
 pkgs/applications/graphics/rawtherapee/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 3edb97e3e20..0e83de135c5 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,21 +1,22 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
 , libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
+, lensfun
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.2";
+  version = "5.3";
   name = "rawtherapee-" + version;
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
     rev = version;
-    sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k";
+    sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
   };
 
   buildInputs = [
     pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
-    lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx
+    lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun
   ];
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 36b0d24a1aa44c21afffdb5b40b5e458790c2000 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 7 Oct 2017 03:12:16 +0900
Subject: [PATCH 61/77] thunderbird-bin: 52.3.0 -> 52.4.0

---
 .../thunderbird-bin/release_sources.nix       | 474 +++++++++---------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index ed811cf82ae..7ac8091e1c1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.3.0";
+  version = "52.4.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ar/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ar/thunderbird-52.4.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "55c80c62ad45ece24f90b99a994d35aa130e2a42be5512e6efcebbcf66a6b26905cd28a42944bddc1b1c0c6ba9c488331c88ff478983c8ff8ab61c3fa7c6d234";
+      sha512 = "28a0114c665250f419d77f1f3898af6533e1b8b82b546ecd3ca9baf801751fd189239093eaecdabab9a9318fd47020b647086a31676158a21656ff7c477dbbf8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ast/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ast/thunderbird-52.4.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "714006603d091000b777130c45bfb5a0e4e2ed3c782d7bf17c1244d4c860a13dc0be58adaf447307149a2a5da90a1a08c3aac0a598c764d2bd491eef5c161c1e";
+      sha512 = "f7b9d53202597ef666ca87eb1f8cbb439af386eb78460558e8bef33502a7eac591d43751beb52319d046d780fb38a78e685fa8cb3baaa6abfef439bed6ab3d1a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/be/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/be/thunderbird-52.4.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "be529be10ab41deab394e8a2b18f5247e64dd00fccb16cd3f95924baf0a9f1924a05f1fea97346ea171d416d44b4cdb9e5d38ea678ad1f64912aac0224f4ee63";
+      sha512 = "a9a39cf4477e469774f2ce7b7012948911009ff2ab26948a177f3efa9e8ccbcb7d7f3d3ab609742fe1d177253dcdeacb78f7b4a9874f3156f6f54203d0ed42ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bg/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bg/thunderbird-52.4.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "4726efa8ca6b72fea6acec1f8c0aec6b208f495b3dfaa68d6e26797f4998c5e3150e4e3b725e0042dc953c7b9d88c97468fa03e382b636b057c8dd451126710c";
+      sha512 = "38fc89a687344467f98cb2e31967aa53f3c502a8f288b5d65e6aa91a578b250c17750ea998d32d58511920a0a5a1224e77e2691a381b7526585e341712d82cbd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/bn-BD/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/bn-BD/thunderbird-52.4.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "d0f16014b3dce0b6de06233038a8585ee6a8ec2b7a45ae406dbb71370d931bdd51100d1d68ce29ddd2329efb6eed033d1856ddf29b6515484247e6f11c4f7dd7";
+      sha512 = "437d943339c4955b5264f95bdd4aaa2a91d448a393e6561bbb41c078a960100962c1d51bad73172c5f5cd691f713ab34c218ff5c3e3cde3641d8a6ad604f6d75";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/br/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/br/thunderbird-52.4.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c52c416dda11dd69e78a7ace3d6309b1cc8327adaac74cf831af42b75bf4da9dabec50771014189128dec79487d224f0ad6e9c335a5343c75bf54f828829058d";
+      sha512 = "5c43e3cc4366792b7c7a44ae36fe2bd9e6b459f540868dcee767193826648b03a4e4a447f83f5787036e48c96e75639a305304e050a91f0925d9ee4db97e5b75";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ca/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ca/thunderbird-52.4.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d0ab90bd0262476565ac48d597c699529cdfa2d4773397f1a458f7d97989b982bd9dc34c2a689d03a1a0f67c53d67ff86af1010bb0e5db55f61bfc68db96011b";
+      sha512 = "c2243ee5f160f786ebced364432b4a3b489699a3f024a8da327cfaa3c5e2d0d58884870311416fcb019723d5bfec8294440c701c6c453c15346f5f765c4449c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cs/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cs/thunderbird-52.4.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "ae3e3c12f0e75b449ea6d6d24858bf6036e9db8b7d6a08156d5a9026cbdb53d736a1b459109cc6dddae3d0d6c08856e829beabc8a53c20ba8741cfc0c18d395f";
+      sha512 = "332faf549d1d988defdce1531fb4cc81e5f1565423f3e24ebfe16581275224539ed50857dec04c8aa66cc55372a76b676816831d08842bbafd227ca3058f9b5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/cy/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/cy/thunderbird-52.4.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c6ff55856517ed5b99ad30e649b1ac31d7d529706eb8154eb235817f4b168331e57e845d6648e2bcea574b3233587cadb63c118614598e0dcfabe3ae3d5370b1";
+      sha512 = "bfe220ed1e1d8d156f0c1cf7ea11b0778bc0b23f7335b90c65bf581c9e2cd22db9a7f5d48d7a6a95f1d21693714a216d2a24249f36aed7ce097f205d4d05d6f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/da/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/da/thunderbird-52.4.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c0bff66366fcd9b7c62c352dbd25bec95a444b3bcc513598ec834191e7eef47a07cd0ab6a72dbe7b9f14dd323c085f4b8bb4b31ac0f2536d08b08d1c86693bb6";
+      sha512 = "dcff4359821cb6b24ba129671a1716394afd642a5c4b887a1905baf82cf5d2a94512a547780cd42b1478f443f59db5a3363a52d719824af050dd69af54f97a02";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/de/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/de/thunderbird-52.4.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "010b56755f7107e32df25481a2febc7d0468bd27a6ec5521af32d80382c96653a2989a70e2dd7350452ebfb25f5691a161ff5fd74228b9b3670475942f7b0f6b";
+      sha512 = "f5071c052814eab801f3d2c98751c05486b211f23b511b27a1ad5810634b763ada3bd890288e4934c16a28742ef023ef089de9d84a188f6e19d07f471b289583";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/dsb/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/dsb/thunderbird-52.4.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "735d07ecbbff46b242a103676fb8190e082fe71f8a64f19f82f18a42dae50328cd4e473bd06722a20521cbce50afceb24b61d144b4ebdd1cb83a8ff3b041530a";
+      sha512 = "522d365f32b28620a7936cf5a8fb230db6fee8c1ae055a27e6649cff8559811684168eacf019ec16d6268e405607a576d46e1d5ba4759c1e3fd10736d7560370";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/el/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/el/thunderbird-52.4.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "29361a698dab6b4d3f369393ec4c06797c1a37fe4bbce8b48f0f5216225fb26125b4f0c814255c0c964a24fb37c2865dce64197d1584385c01f0e655947d9884";
+      sha512 = "ecf3dcadb1a82310494063cc317ee248b91c30594ba89a9c58a71349a423cf9e66c5bd06be4d1488ee6cd5027187bae1364144037b9ac3cd4bc8af7cd4396810";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-GB/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-GB/thunderbird-52.4.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "8d3fc25a21aa2f38089bbfa8013104de0c6c6e95407289ecc82f5c003e732d51bf160106dff07b202d6a6d0fee989a08e75bf616cd98ac1b080605b631c2be69";
+      sha512 = "8ddde6cd0270cffc26cdb4c4513213405b71ea4315d69a3b1bef602bbd58eca30bc09d0ddd41996cd77881e2d678dd13a93d07fa833210780dba146a931db383";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/en-US/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/en-US/thunderbird-52.4.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ce05330aa7032f0cae542578cb49f7e8bbc7971be455817126bc77212ebd35ec701691ed91758e7c5b663f4731ed19c2864728908816e71023be36d13ba98bfb";
+      sha512 = "edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-AR/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-AR/thunderbird-52.4.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "52058cd4b0eaa68756fd7b7ffa294fe0720a876fe176199cc67892b3d33615a92238c4fc90ce7cf9b70b3a57f3272ca7bdab8499b3d6d864775e97ab2f91c68a";
+      sha512 = "931644cbf5e7b4f032f607a52a78f553a7a2ee8fc77fb7d0e73e6d276a6a1ba4a724cc91921c5ef5ac5ad21a3536ffbff264b80eb8d8a658133a24ca0b869456";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/es-ES/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/es-ES/thunderbird-52.4.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "f447cfcf7c4febbe5244f5004e2b6a19bd03a7dc1cac5b609af8726bf9cd915e1ca2ff81aac65ac62386390b28aa1d3a6f2283d8c479b4d97c6df34e54918544";
+      sha512 = "c2673d9f6b347493e3fc807cec86f55300a6e894c9c1edd7f7bec63cb073fdda2e9cf7794269f02f744280788bbcb8e42ee6249c317aabc57f91cbaa3635492f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/et/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/et/thunderbird-52.4.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "46744b2d6cd187ae58967e1be2962ae7cc4e3d4a32d195767777634d4c8b9843979896524ec90a00fe8bb1d367c7ae9d540da5705a9529d0126a165b4b7148d4";
+      sha512 = "dd634f76848fb990b4fb1bd28e2cceafca651280ece9ead3aad6b9746d0eaeef76b5ad925163a68367d84f66949e799e2649cf358ad0949ee4f2538c71b8914b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/eu/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/eu/thunderbird-52.4.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "c00558d88e6f8d9e89dc5717d677caa2a1bcb319a06b03f20e951b94d8dd79bb6d2d8875dde07f59be344330a8b36db00d0c57c7542877207f344e25dda91488";
+      sha512 = "1c9f04cc1b32ffb21bfacb186f327aa945f36f12ae316a9cff8b2a4f8584ff8847ac5be1c8bd898ea1a71fbf3294a2f54b270eb6f0b63abb3da3178c6a125600";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fi/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fi/thunderbird-52.4.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "668d7f4793fa0c700b1abb75f185a26b9734da8f9d9faf327ad08503802017e93726de3124818650099570de58650709f3886dc6d8af24731d83c16486a54acd";
+      sha512 = "03880d8334ede087a419443e9fb56bcf6727c652f435a366b4b49fb6116a62225686297ba82f298378e03267dc1aa50e90d75b81ea277a7afeb93331c45c3459";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fr/thunderbird-52.4.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "aabeea2843ac8c126c53d862054b27263b03f65f3ba848445a55615ef7e6f972792b2e634133877cbeeabd74e455a2b47d36ff76e5a4162fb7caeac3856f10d1";
+      sha512 = "6f9909df3329a32d6d0c2203b484fdaa8b54a17849283bffcb04298601a284a6fe30eac20ec6b3a97ad2e8e3d4e0360c6145e87baa2af11049ae0d94fe9dcd44";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/fy-NL/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/fy-NL/thunderbird-52.4.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a0e1132009e63654dc5fdde6989f758c88ce02327dc4b2e870c925886fd350867ee78958095743b582bfa77af4f2f80a497980cb3e5308dac47bcdeef88c493e";
+      sha512 = "b20f130ad4a9b0f8448707945773cc76198e04854a0114a06379fd33c3d5abd9abb1f14e4f145df9c1c46e5d1e09522af640ded99f4f20543fd444e365d81fb9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ga-IE/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ga-IE/thunderbird-52.4.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ff43e823765ec9354edc3c0009ec5a2e004e31c01602b875f538b01957bb4953e15f8a60c4ea5695af6e541566d21e4d4ea7ef4d8d3464f4dd59072269cc2eec";
+      sha512 = "3fd6839351470d65f14165e3633c80950270ede2c4c9e658c001424126ffbf29c7bde86a720ca33e50cbe9a5306f0339c5cd491371e3ad03a6ee575c75889d63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gd/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gd/thunderbird-52.4.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "d2f1c25cef09c4e3946050af1bfadb3f8ee70bea6c9ac2d8c25e2f422a160c3cabd76373679b4fefdfe838722f69e4ce138c50c03de221c31e71878d66377d22";
+      sha512 = "a7aae188c866586606f9adb82d5110bc2b89a6bd757191e798b9b2dc799916ae56cbc82932f4b8da76e88a3c1f5ffc828c58aee0cd8f83ede19bde2be2164b79";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/gl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/gl/thunderbird-52.4.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "3ef058fa97459f41f204ea80393f27a0b572039bec4a49eef80db0402579620e28acda8613adbfe6c2cc267386a5cdb8d95fac4dfff2358a9bf4ba22a1bc24c5";
+      sha512 = "3cdab0c553f1d09cdb4dfd1160371eec3d1f878329dcf2f81a177f17647f8dd9b73566a56427d2a593f70f6aecfec951e3dfc2a389c838a4069e5f4db68c10eb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/he/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/he/thunderbird-52.4.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "b54188bf2ba0e2e6470db0a938c77710c66e1b1d359be2ae3f306a7a2ecf34501f797baf9348609c63fdc68d1374382855509ccfe619c444150a4214ee819bf2";
+      sha512 = "b71593a5c7cf8fe3960c701f5bce270366f5717b7ccd2a5f20dcdf402d1435b79db06662629deb4bd28e24b251fd2fa1a71a9e932f132e2df7a25ab5a8849de3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hr/thunderbird-52.4.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "bc5ca4099fa6d5f7884f7fefb1942aecac4aa6cdc338d8608433f3aca9ce14c8838e68aa79e48e88b453498d5d0b992a583daf6abf6f97bb4cda5d7ffdcf8194";
+      sha512 = "d55deeebb9605565ae3c062c8617d7e351f2f514c13f00507d75a5da4ef8e8d845247147d2aa111d4e78c57ceb01404ed3ac2bb69883bddab7b59ce0ff5eff35";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hsb/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hsb/thunderbird-52.4.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "5b8c7468fd777d9a4f046224ad516a740fd4acabc5dd30578dfc843f772dc1d0f08b4fb257db7d4d39d58eeb6468126ddd9267c1562e8ee7d23f07e02e4babbe";
+      sha512 = "c177a0e3c6074eef1abf086fa34e95b09f39a1529ce640927b7be6ee8b7ee8c740ba4e2afbadefe3fa83314cb7c3223499b1a5f08e3b4e381b60bee1ffbdac7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hu/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hu/thunderbird-52.4.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "3dfb629b804513e40852d810ce5ed3e0af0cd8c7bb92a44dc6c08f2e3a45de45d2c3ccb75616a9f9d7019a8ce9b4856e27baa283647eb63e953071fd410dd418";
+      sha512 = "1442a03fa4367d1f33337d0e88a193de8a6992ab8aa91e28e4a46b8f1860a3cc346d15c00d745b5074b8dec1beca5dba182b5fe2e87827e7ea83b82aba28b721";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/hy-AM/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/hy-AM/thunderbird-52.4.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "4dfc61099b3f8502add36f3b215283140b8084504048d95ac31b948cb8e53fca658076fc7164cd2c20742edafb8f7ad5e08f2cdcb8c9cc764573e2e065364b20";
+      sha512 = "c01325976516765a14a196ff04eb3296a2dfd81670cbf4d693682e78795b14b54f4d2801566f0ccd52c52f0b7100b6040f4e3540c4f3cb8c8b92038e059df45d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/id/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/id/thunderbird-52.4.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "5525d0507fbf7c7503b9a58c50ec248932e70d899ff88c1b8cdb18484d3cf4ce76fa1121a7cb5adfa3c19e1c83ecc5e888d652275400a2f92dce3e0fdbe51353";
+      sha512 = "db56686b1d8713da9584e03633bcb2b14706c0b44d24484d6625de638eddcbdad1b1afacecf7dba52db6d18b2bbaaa15ea5f4d492366c24c5e2e212050f16c12";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/is/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/is/thunderbird-52.4.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "1fe92018d666ccfe1bf063dd191d88f3c9fbd452e7820065e45b79de534baad9d8750d4cefbc39902d49d532fd5500f4b3a167ddd7dcec61677f490daad01d9e";
+      sha512 = "5423202ebccaddd114393e5a2038b2efbe93fd528dc3d7b659987ab5aa2a4ad82921b3b835249285135be67216eed03de6d58b72800d9c7bf87ec812a37f21ab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/it/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/it/thunderbird-52.4.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "80d6036462d74bb180b0f3d4d384be3b644dda9b3fc008a8d63478ec877462defc88b6f3dc2eb2358489956ef20e057975fbff9f7cf5afd0d894926e617d3225";
+      sha512 = "b64e31155c73f13cd84bb4488e63df5c95473957c792f63f8cf25308d2b860b084aa6beb519a7666fde83d3db25e28ffb1064ddd0abca73ff631924cfa83d7f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ja/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ja/thunderbird-52.4.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d1185fda652104759bc84a095b289ccf6a3721425d60c8f0781578eaf113349de9fca18dd1138f73dd13081ea5388d0f04fd0cfb47142236c1354a167d0362d9";
+      sha512 = "8852c526663f69b038ded6bb1382e02de700eab741cb04ccb8d3e329ee4534477a6ea402134a76fe82a020bad279c66e70bc06b0ed8d0fbaea9aaeaafa051b44";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/kab/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/kab/thunderbird-52.4.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "4bb2184a4a968f6b33c29fab44b11f06743f88b8ecb8d83e5a892c608a03dbe3f643c2e8b5a5fc9ef844801b8bfc2891c9bbbbb306b94698bac5441051c22783";
+      sha512 = "b08dc52afb713142e11805c5b99f73a11bd3c16756dc5bbb6a0c3de13cc801f27438887d8733cf4b97d70d4741abcb0d8782b9e6f6ffc359f38318f1702fcb7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ko/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ko/thunderbird-52.4.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "49dc08f3a98205e433e81c9bdbeab3f6ed7dca5f3df9af1b6a01470dcfb1a3fb72ce3447ead492fd8f0d49dfcf9028194c94a4cc6e20b1b4c28c64a706975615";
+      sha512 = "0de39397e4401ad939dbce0c02e35505c593398bc2078ad19d680a797a8cfa3f0950a810c8650634e3d40ea3b5265f9e193b77408f1588b51575d87446a336c9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/lt/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/lt/thunderbird-52.4.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "e8b35d834e122dce0b9996060b7582a5b2c0bcd06e1ee7a4b12298bc4aa501ab18bc140fe0f0e2fd63ffad97ec9d287d1614ed76718525c86296ad1167658f9a";
+      sha512 = "13842d9f210dd192e2072c138d8d0778e85d028dde92b08e616dff6ba62f84b6aa36363a259dca69bb006850de2fb8c42fd93874a4befa970d817aad34d47b57";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nb-NO/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nb-NO/thunderbird-52.4.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "5efba8423c744c61be72d679e4943e901488984415cbdae9533ef5a26010d0ba072f107cf8a53389f831559e8093b35c01f6eddc76b8a361f60af8166c781207";
+      sha512 = "ec9c96abe94ac17139e9fa83ac2d7ca8ddc6889e7286a4d31e61625db6daea3969fcbaa0796ae0bea41e3a433ed3e170a73c4be1a177bedcbfcf705e306e28e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nl/thunderbird-52.4.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "b4c6c95cf6df97ffc65d03f04af7221d819ec28b464fcb8173beebb9d810af9b78f64b39e0750d11446ff88a209677512f3735d8f38ebe91ab9842abbf183e65";
+      sha512 = "52e117078f1871bfc7b549a47617d277c763267f7033136c9715223d8f876184c0b5012b193a5f497e1fdba78b902a3c38651e0115829b0f5ca7f0cbb1c439d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/nn-NO/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/nn-NO/thunderbird-52.4.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "3bc0ea3e17a1161345d4c1313c774a312e591248f07be7c11d9b6c738aea2d91aeee202f2a67ad38df9fda43f5f853aa162990475dcf9248667fc546370b4083";
+      sha512 = "24258bbf5e3643544ba5db26fab9678f7e2a44b390ee993be4a304d148b5a57674158afd308d6ef93a86c8e525b37e1aee55ed07be6953301f164a2da00688d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pa-IN/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pa-IN/thunderbird-52.4.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "2fef099c73db55dd082f4a9e207ff47096870caef6ef4e9346c7faf3e40dab4d3b0e1e68d1a9dd7a427d97ae65aa347976641aef1872a4c7a6764e8a8c2cfe5b";
+      sha512 = "e9d8b4e6019d4cf1ce562e6cc9b9aeac0e93d8b9ac9283c7e8f260b4d611fe2bd0bf6d71c9f82c9d2cbfba5770659d21cfb03fc2deb36b80be0a424178a65936";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pl/thunderbird-52.4.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f523fd0d1b1656e80b52dcd8d2f52f7403c22f46eeea850c75c78fb3c1903ba4edc44ae69db755c0a105379855c0c9c33f149fb83d8016a182a32cd5bbea113f";
+      sha512 = "81ced2424282fe6dc7ca6f5e043f6c42ae87cddef900b73fddfe6cd8c488a90e3099824b57d0971816a60c3f43ce66e1799195ae21369958b2e8085018017267";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-BR/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-BR/thunderbird-52.4.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "6428f601375bc877def880aef3ff6b8ff4856696a2040381ca22c60df8e1364cef12e1c878db6b7863d10f8cb02143c06cc58d5df6cc83d1c25e90c846be3fc4";
+      sha512 = "4120b94c13a9fcf1aa31a2abc3fdde27ef8c0354550ae8511b61641745cdd5eaec16e1ddd1d22193ca6680f070b71c188d94cdc75a40fa1596fa88ed59545b28";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/pt-PT/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/pt-PT/thunderbird-52.4.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "6dc2fed4b003f4f120c79a0673d9d7455c0b6362dadc06e15ff612a29758c521d87cea073ca0b81018e57872e6262a09c5efc6e9fdf7b494c152ae4e992260de";
+      sha512 = "a89dd739da5262713c99aa9aa28544e48710e80b83770810b240681ff0546c3b3faa37b48ae56c018a6d1d625f0411df557ced12eddfb3a1198eea474418eb68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/rm/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/rm/thunderbird-52.4.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b22bcdbe338fec3267f352ec5554b8e5bd732961917496c6d06a6eef188cabe337bf3fcaac1afce49cd16c891fe7604fa77c13b3eedc7706b262957d5d01171f";
+      sha512 = "3665bad7a0d1f2d725d0a44ad55918228c2d9cef49112fb19d2c3d885d1ec62af89c15aa0ce96ddebdabf97c8a5e10fdd58d892c085e5b9d17bab6658e7bf444";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ro/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ro/thunderbird-52.4.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "cd2f67456fcd20ed48effa2363f4088e48d91f93df66e803527e83a3f8f2f3a74ba22fc0d5c4ef736bc38ad6a6416830833948210ee900600bc36ebde81a9976";
+      sha512 = "07afa28b22705e0e84e17026d04111cb9a5283838fcb94225e2c05da1fa0692770b17052c52d8cfcdb7bd3372fdbba9cd9ed9bc16f6f59f2e3ab6f4308543d91";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ru/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ru/thunderbird-52.4.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "1b6b0adb47f3c52230297b86ead0d259acd12fc56353ed5de9afb84042d82d74193785b4cbb4be2caad302283ff54f8630b69fcc9b846009fa7dc6fdcd7e2525";
+      sha512 = "189c40a8d950496d62f980180502ad342621caf3a2ddffb0fe4f813c9c2d4a25aa375d8ad70c8b7e8ff85f09607bc2ced3366524346a70eed731bd8d9409e5d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/si/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/si/thunderbird-52.4.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "95c4864692410aa7f9a071f9d4629614b52a05a4a2d8f3d898feb7bbb75e766a8efb8daec9e3badb32c3dc8b4bb1a2b3be80452dbc9bbeb625c9275862396d95";
+      sha512 = "0b6ee1e5ca86472a5cc67cdc242a6b62aeea50609661e369c8dd3dfac5a774f50eaf0a68973b1fe5d6d9bdf6a385c52a90b8711c80facbf9fb301981a7aae395";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sk/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sk/thunderbird-52.4.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "04d594a095a4862ac32e8385ad7740afb2033d0601f520206ea504c9b367d685a2c84c43a0279f39105ef56628b66f13f2875c5b6f19f5252a3b63f6d549d876";
+      sha512 = "9c1f164a2da43aeb51e8b64115618590ba0e9284f3eca8b16d3792b33e269a0acc253314ab7943cbaee94ffc2ae321247b4982798d9d48608e85a935afcb6faf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sl/thunderbird-52.4.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "fe46ca8960024da81fcef7b2aad12bb58431f0cbb4d4c107fdfa8096764221f07feba468bdd2ef5d99665afd0404ae286b37bf2afe8cb6e6fc2a8ae98f9a0ef6";
+      sha512 = "5d4698be05af9f9181af63eb3ca6718feb1c74c81f0a6fbc82217791c911dc5f14ab433d32f6484ced2cd75d5db4b76aff3bbe420d619afcddfcbcaef25873e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sq/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sq/thunderbird-52.4.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "f44325e596690d0f383699debeb8450f02b7969232f1291ba0b02f657a80552ea09caa899948506674818159a98b646217d53c386908cfbb926791dc61a36e82";
+      sha512 = "32d62e6dfe28c67cc7b0e2cd27c96fd7c7e1079790eb73a8731af44e8a62f8fd1ea2e7298dc772e3014fc8255f022f38bbd5478430629140d0dca9ba0daa401e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sr/thunderbird-52.4.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "67ceca6c23768094799eb266cfc09a7340941fc49ae82c608ae6593a7bb1c9d22cf5525577e7815a1c5c8ee64744d7f6c5b790b3e5b46ceef1fde0001a9209ad";
+      sha512 = "6aca04c1b4378489239cef6b5032ef6dfd6d39d84308c335d03e97ea7c48acf021f6cffe35d652e117f71e6ae3f31f54e5ca73a44b4dc51dedcb3f5faf7d016f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/sv-SE/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/sv-SE/thunderbird-52.4.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "7f4ca5dca587ccc3a20c9e962d266ed1f7127d9e0707f585407efc58596e590d6650e8322bd13889afff73eeb7025942d636f3a17c327f9c2dece946ca67e50b";
+      sha512 = "099e22013b8d6791857c378c0f94373ca42d35bbc442cf273c9de2360ab8e64d712eccaedd5a13915ee19a195b6c9f04748ba738e7bbf9b8153edc4c66070d31";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/ta-LK/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/ta-LK/thunderbird-52.4.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "6a0024f3da37a0ecd2015c9fc574ef3ca3d3f62d75324b006bc32c3be901054549525cef79597489edf22c5de1cd65c1826167132d1e5f7e62a23f12bc966ea3";
+      sha512 = "d3c95f37ffbbc5ef78b7c050a4e091bd9f36fa9529ed7c38e25f5495694c1b792d0bfcf53d15b74b52239acb21bd0d235ceb07c7f68f99e1b31e59e6f6282aaf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/tr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/tr/thunderbird-52.4.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "fc897cc02261f65d45ce243367f6cec3f08f08d6e6f64083e81a848c3efbc9098228e3b1bb0d4f9914fe5315748cc8b07d662a204ac4ee2e0e1bd075070614d5";
+      sha512 = "2f79b9d45d747424a65271033a75a86ff503694d88a30238452fbf817ba153c4638395d3e59f5f6cc662ab3361d2304d5a4c925957d9d6e6d7bddf34947acdf7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/uk/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/uk/thunderbird-52.4.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "9c1aa0abdc9d008a40c5681ceac5add498f91fa9454b1b46ac199609e714d01a941705f729f99bc478a37db53cbf0e3c2f2c49e5d4b04a25b629f3fcfa29ad7b";
+      sha512 = "e0d891b4cc082e32d3f6af318f9224e996a8ed3c7e1385bb86a5e2f963239999712c444fed00d779320f6b06efb38f3eb97023e353f91eeb7831b44a870c6394";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/vi/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/vi/thunderbird-52.4.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "84441bc6c6a9882e0b90f9942148e70a5fe3a5d353819fed7aaaf38a7ec985d061e89a99c46e6d42c3c057dd07b44c8123f85a3db0f62b630575e51703d138d6";
+      sha512 = "5a9e13e126c7bc8ef435b8edde1896b9773ce1dfc39fe3fe1bb31e54fe4f592acdb3db360fe0890eb35b1896aeed0954bbd051fde6116b07cb513b1390ee56e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-CN/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-CN/thunderbird-52.4.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "c1cd1d26ffc425986abdd08b1c3695bb9904087de1f6f192e2bb7ec187f0f433faacd6bc98700b31a11d75e28cb4c9e6f7dd2239d79ef2d0a5b866a58badb9b2";
+      sha512 = "b0374f022c2a259076d52bc0dc142098975f9f1d3a886192332fd1c1b2a5c9dabc0d3fc1a7fc0f28f6f17979931b9c78a9682be1226ff751446c5427a5219a51";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-x86_64/zh-TW/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-x86_64/zh-TW/thunderbird-52.4.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "dae4fff5b67b90db1e1e48ca24d63c294b8628cfc64f90227e2100d5f02459757131c7cf51efeba166273fa25a38d5addc035ebb5e945b31826d152f140eb3cd";
+      sha512 = "7e289afc737339be5a3db5869125d891da65fb75a62b7670c3880943ae11bda33122f81cab46bfa95223c45662684b8fb66ec11cfc5f375e024f4d57be098684";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ar/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ar/thunderbird-52.4.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "1bc9384d57827d3d42ba4b2ccaf1ee83077301c855cb98c9ebb58453f96c37429387df7cebbf381fd6a711263584c857e5f6f1c52c915584c97f56051cb03df4";
+      sha512 = "872ceb5933a562d352cb3bfc6e9cc95a7485625e5256380cae367d38a560f75bd7964fed1becfa5359db3befbe4aa249f114df307cf14e2db75dd047d87e5c53";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ast/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ast/thunderbird-52.4.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "11f718f280c3cb0e1b759b721d4133dd76cae85e6e1217f66403956cb08c637de99cecc4954e58f6f1d9e8275dc8607e501e6fbbe3bf71051831336d583042ca";
+      sha512 = "9955dde6ae54c096dbc5e5a28729963a72997fda97505657ccec6e0b5f95f35508815fe663f266932c79ef91463ef6c5da79ace4c19149b17dde9655dbe8017f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/be/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/be/thunderbird-52.4.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "fc376bcd502ae98da16e48e72234e1b8c860aa9e42153c7e89d6ad829d9f4b2696aa7dee75bd240fc25cc7aa291a808184236ace14978a6f203997433db24148";
+      sha512 = "94106fb12bf932f3a8217f3252b4f76394f13cb19c602d1b4a67e4477c3a0c781c3481ac973e40af7b306fdb32c88d4c70f8302b14e693c7270e2afab0dc2539";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bg/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bg/thunderbird-52.4.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "076184b227fdb364fa8f09f121735a6b6752b11c4f8537b45374db550c2fa9f6e81bb0c2cd145508973df8cbc2901de793d1f4c47696ab2165f5c819db659640";
+      sha512 = "194a420d07f952f7d088cb15fd14dce30e352dac13e543321e94fc60b7780678ea1ba51d450aac2d7566a8f23a583cba70e3aed373602ac896e0be13d234f8f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/bn-BD/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/bn-BD/thunderbird-52.4.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "604fb9985b6a69cf563b86bbaabd890f487ca3e510a93b612949af5759b339e10b67c70c17aab9b35d1fe8ac126e69ea1a6123aae75a0eca6a9b4f133fbe1fd9";
+      sha512 = "08a439a7fe40121f318131b035e7a5a1b44a56a6f3434b2854136103b0e11fd720540352ed04bde23f33c7ef75cb57eabbe86425c8f2e440f92c9260ddf1a902";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/br/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/br/thunderbird-52.4.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "f5706905bb9da0c3ec9e841b7694619db321ecedc85ab20e52fe9bd2e2ea2e1ad0cd9e0dbaee4159237881000fd2d3d4eeb1c86911c0c5ca13fb718c7cbf75e3";
+      sha512 = "68984b8fb564e24f3e331504a0c8a2e88cc1021319b2a47beeffd145eb42a19bd555aca495ac60612efb191830c273c473e0c3cd5844f109e78a4908834926b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ca/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ca/thunderbird-52.4.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "a240c6653153c35f4cf40c7266eda3ebf499cd95cae7a62e0f2025bfb8b0c46538710a9b3b5486e1fea88354d7bd654f50faa06a6d246d2c97c0913e51e62257";
+      sha512 = "2202c43a63bb283d9eef16c27e0d6125d43284b9c1acdb8cbbdc71f3a9d6f6d527c4a03363dced911321f28399a86ef25defd294befddb8fae41912e17c2fdef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cs/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cs/thunderbird-52.4.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "3f639e7244a32891c2cbe0059456edb241895d7f5f5aeb2636699dccb5b71d4bae855f31352575957c7edbcf4925506e76ddfa0f0b83a81a61d9a8d9b543c564";
+      sha512 = "d01c6ba52794d3850656c1538e46b64eb69a7c1e3a17347ab5cfda9fb1e91976a4bfc7096f7d12bdf2f15625387aec7066b0a25879d979687c955058b92ce6c7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/cy/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/cy/thunderbird-52.4.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "26c6ae97d0982d9e91bffe04918b27da55489ec00fbfa1783acfe69cd2136bd139fa9cb434a473b5f63097adb2768e73a929f8f06bec97a13ad6750837f1cf5b";
+      sha512 = "3d056c91e1599e91249774cb21d8fbc887b7bab38546aca1815ca9c49fbf4d641bab2427f03ea993a72dc29793feb1cb0cb26217a4f6827e9e0d9d3cb5e3ca0c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/da/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/da/thunderbird-52.4.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f516ecbf3124df27cb5c4dcc00505f2a1ab8806c3965755ae28ea3db7e06be173a82e5b171493af977686e31bd623984a0428d5781268cd7ab4094510ee88ec9";
+      sha512 = "c940d26284c8ab0a45bc6a55b67b467df7ac160c8774f0e2e2deb9082ea9500142a1d3c8851031a7e7a1763fdf5348c14de57d7168c3f1bb23fed3cf31a1b09e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/de/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/de/thunderbird-52.4.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "053ddf755cdb5b76174b18f674169c1b478b636ac90af21d5c5108a7fb9463e4e247567421abe1fdb6cf1cab1f83b2426e2fad5d0d0a2b259b3526f5dc477bd9";
+      sha512 = "b1b63590885f30797ae9825f2286deca69a82a73e7c407be87fa92280b904c0605e7047a402bf6ce1e13936933a27efaa2b35d534b23f745a2ab4a9538d31b47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/dsb/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/dsb/thunderbird-52.4.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "0217fa4e1ceb68a9bdd8d99d93bd2d523c2ecc649154eb7c22b970389a285efaaa8b2dd20f590214483cfbabdec5cac8b6120315d9b500d80038e85bf8dda80f";
+      sha512 = "fc81fbfcc6533d34fde2e08351dea6d7e2a561a3620a6d0d225dc1081f59d9927ceb0abfca7c2d21b1cc727c0319646a2f386c022524178e90aa6bba344371c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/el/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/el/thunderbird-52.4.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8fea2697ca07a8f0007a5987e59ee2ab56d9f7a4753f3e4656e872e7201f001eb80831eba64167444d0391cf05c8af5f3d44f3aaedcd8b2d8fe48838e5097240";
+      sha512 = "baf8d0a52fbb12afdccd003209614ce8d5b4062336744ee783a6c3e7eb5a542c4da233fb680f320226f3681b440ab1d0717616a3664051d231b6638729903b00";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-GB/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-GB/thunderbird-52.4.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "269217e4eddac4a29a4c3b045240b63cf623e276d6dfbf7d874ed732fb63748ab82072ca1a482012c8d25d5852ddd0b9bef8fa756723372d4be35ef4b067fca8";
+      sha512 = "0f5fac2fd3da05cbdece404fe3d170ef49574b5abff07a17120d189338140fadbc0971c7be05656544819df2b1987fd86c0f9fdfcd312e540035e70877212342";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/en-US/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/en-US/thunderbird-52.4.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "c436d084accd3b195f9dd0b9c96d9e45ecaec730bf5a35e35db65c7ef6328383fa82ebeb3b143f2c92bfbcb3f7983f451e35e68443f6fe24fc43baf686610207";
+      sha512 = "1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-AR/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-AR/thunderbird-52.4.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "8d6491206cc1bb41132da43eb812d1f548e7ff8414b7644809d2f42819b94c583793baafc94815b70345b43c2ad3922c5d116379a6fe0c85e1c09c7cf7431067";
+      sha512 = "42525a75e154fdf263f276330a998f127de697519a79b447d4860403c40ca2a6caec0a225a978461ae776e56218313a3fa31441817cbb13db34cd47afb9a5eb8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/es-ES/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/es-ES/thunderbird-52.4.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "21ffc568d5aaf6ff9188846c9b6ab0483831d5c6db84c0504cbe95a5ccc2dee3ae4a8df2ddbf81a9a02c328fbf452d569cfae5f0b85f029bd62836795db41e0c";
+      sha512 = "86b47481b760206b49f87d15a917754d875203d83613c0c8b83e181f95986e6252ff26cd6dd6f7c6545f9d4da4801f6f236fa82dcce0d0172f19228b4eb5fe33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/et/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/et/thunderbird-52.4.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "aa73dd4e5cc8ba643584b88fef3accd56b71b030a91035aca342ce4281b79372af8ee9a67a9fdb9eec2b869d0d9815f00a40e1ca6988b71f174b6e0412a31d40";
+      sha512 = "4bbfa1fde3a6270b49989747b4b27c284abb89819c46119cc3f2f90f0cad1648e49a2e1e01a35ef193eed4cf504a3e027138ea30a225c3d75347aa062d56afeb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/eu/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/eu/thunderbird-52.4.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "53f6223554a11340ff5f435438e31406682bb5364bd4cc69a9909b42293095fb4a040882cc038d95ca8ea3b85dbaef31d6e6a3ce5de58e99fb5a5b7427501052";
+      sha512 = "292fd0f2db956e5bc86a84d5edf51e3e36141610c99f75b1dd8af0f086fa8bc4a4e5a4e1c3d085587b6bf2d6e3435bc70ee66d379809886a391d67e2c243d762";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fi/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fi/thunderbird-52.4.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "eb143cc250bca4043476764e08ad1d7d8020318db832a4be7577036be2ec933518c5c2c9ceb2cb3c11d5e402aaf9ba41e251b95f505c6eca63cd28d52bec7ebf";
+      sha512 = "b8df95d4ca36efdc4370821068590b1d7e3fb9f348afeb18a0a02c977027312457aaa59c38ee02908e944f166d485576522ea0cb087b28fa857963107e43ced7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fr/thunderbird-52.4.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "16bed03812d5a4163a5d52e35ab1b9b8d91be8d772929730cd5dc92bfc62139d0778526e6e9d88d40ddb981020f6b02a19915f5dfd8993f0f477589a873c2435";
+      sha512 = "7880654b4133e50ee248b6e287d52ba867361b900fbbdd149c6f06c9d5df1d0b57ce6d9d9bed3e1ab68e90b0ddf874d0b2427553b24ea39f267f576c63357bca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/fy-NL/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/fy-NL/thunderbird-52.4.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "3c1093eab90febc62ddbd69cdeb559fc95fa6b2e67893b2d9e8ee38e67387825cfd0b50475268b7b489ad69c80f2667abbbc4cc5be3a2b81747b5858d5cf0126";
+      sha512 = "4784b06aeb705141d84103bf46635e6ba6a7f7795b40e654f63c783a63ee19d54843c211eac90c4246c5131ecc8808940e560f2fd2a2543522cef13bf3828938";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ga-IE/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ga-IE/thunderbird-52.4.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "153dc5005e913f36dbe1840d46a91d235207fc393a7f8f294518f1095ff590f706ff7015c823dda5da6e200a43b2f278c93f910d97517452eaab972ccedc6bef";
+      sha512 = "91b4145d82a4748ef2cfe6d4d46c9e92c3a54a55f72ab1c28135363471d68ee028064ec0c0bb334fb731c6577305177a06d85b2a9d820d9e2a44fb01ac961beb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gd/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gd/thunderbird-52.4.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "253a9cecce89ffdd771c70b06d23216046689a0a8e70dd922328590a4a39137d93919b4052c7e928b180f2c8fe088199583c67f96602e9de150927ea08be65b4";
+      sha512 = "4e979ce305a014de612c0f3797b9f8c8d89445f05972a24d8c13cd01160aa2c15007b0e505f9a0cb354f8cf65e286ba52eae8a6bbdcf4c7cf4e89809e0ce530a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/gl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/gl/thunderbird-52.4.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "b77978888a918d297419897f008f0fe05a09903d7a0364c43b20adcad883f926a9c51af3e7132825bf19dd487d7058c83209112d5ebb09f202c49a5c8e126f58";
+      sha512 = "b3081eee4473c097b37b9070cdcdd8eb48e1cf69ee63fd76f1eee0d5ed84009b69d0b31fb38c36f7d5137b78d0ab32087a8e668f1ad01e6ef96984ecd973af11";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/he/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/he/thunderbird-52.4.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "56f1b9204c0ad5251011abf388cd3ed95b2e6cbddbb7993f967c68c8f8258c3695550025f437ddc3db455c3cbf0efbe146d0612bc40d8ad3a3482648c4bace46";
+      sha512 = "2781cc8fcac549ea394629ba1d7c43c683ea25b4d3c5807f7a4da50541e47ba18ed4d4080e7f3c785be8e71e0a8e2ae0cb9a24e348f830b71b7398efd06863e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hr/thunderbird-52.4.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "c225c39f93bd12f822fdb523bdce20ca64266d81f007acba861466d61d155bded183e305bbb829aafdd0b64cc10d6d7054752bc3e99286b90a29864425cdf6b7";
+      sha512 = "d42587bb96454e3ee24b964dee1de0f51283b2c3316dd25e798a8809d2289306bf6eba6078f664f87720e7038b14f009640fdb4d3acf211195dc881e6e207c6c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hsb/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hsb/thunderbird-52.4.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "b7c85448a5dbc2f820d866d8e307e8221ae58d66187ae259df3d93e761fa484e0c7909c61030682efa5817613104d88813c1fb7e7286d0d7c45f6ee9dc4c5ccc";
+      sha512 = "49e3ee2559c124db79e2dbb2fe74291a377ccf1fbd75b450c8d4913000a055cea855fad03369e7420391faf114e160e35b02d432de847e673e352b731986bb84";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hu/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hu/thunderbird-52.4.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "6291b35868569e924a3efa54abded62742d7212d4a7dc039e09baa00d77ab3595a22adb042be753b75c1ce50342c20781931e366fe2b73d4b598065fb02a1d0f";
+      sha512 = "fad46a1ea3e8a1df49e4ba836c68b1744577fdfec319d9dc0b2bd8756d4dc859cb5af7484791b83f2260bd40d1ae64f19539f8f4b3977252a1f559b7df9fef35";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/hy-AM/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/hy-AM/thunderbird-52.4.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "ee0193ec3e1df85c3cfbc9118d479078ae3d61a70b36c582ea222338b49db4c5c2c8b0d10a0663154fdc465b23184e204b509734d2b55862c6075d1b48fd29d2";
+      sha512 = "6a34e03e5e272c847f674bd8c48cee66fb659cbf88251debe505c54011b029cea7b7e8a9722c61b3e603d66aaa4313a5971fdbf2035fd06d305cf229cd8b2afa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/id/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/id/thunderbird-52.4.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "a882202254e23635dc51c10b332ae8953e61c6ffcdf42f9d5794cf3c2a7c665bb350171bda84da8388d2323b0359b1e0c3fd44a838c0979c35fa80387b312a21";
+      sha512 = "1cce3d3653b474219f00f4555990406b661a14c4198f3d246624def4e5a3ad3ea393a74f6c80e0f17b5799784e212778ccb8b56bda31c5e48a55193bef09c417";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/is/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/is/thunderbird-52.4.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "69ad01aa6a7a84630bfaf10f4eda5b8d04af7bf5cba742943fb474ea32e926908db0f94877c1d6f9904063802dd9e219b20fbcf597aa291490726f15f6ca1379";
+      sha512 = "f3604e918502d16ba92e65e9def425efbb829a261d2c433ce83ec89d6ebfebbfcddd1b01508f953ec3c26166c6d01112486cdab6d1a0fe1e6a582f0566900b89";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/it/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/it/thunderbird-52.4.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "d9a1897dc1665d69868dcf0b5d4998316a76a721ca67c5729d0b5cf2a8de516d7ec1ff92a6db1cf29dabe6544ea10482dc8ec58740fab8ee704a98596c69573b";
+      sha512 = "458bc19bd6b08f6834e310f7ec4591ad4e84067ae2373864ca9019c20551abbcbc067467fffada229000dda01369da3c28967df522182d8eda1a147d136b6315";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ja/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ja/thunderbird-52.4.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "c9b7e197cf9fb00292b39a7769dd06be243d3ac46ed90f5db19b612823872bebc06b330eab087295a6d91edc48ed8c40af04ac69a0b5ead05a11ad960dc36aba";
+      sha512 = "05faf43b8b0f616bf552988a577891e816fe36b208b7d6292c9896a6946386815e117278feef33063b4f2eb7b5ec89aebc59e1d4432021969bf3b95e750defa3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/kab/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/kab/thunderbird-52.4.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "065d73e3cb20593a18a556535aba02ee5b01e5aa07c146a02a76130ab9474962fcbf56ed5f5733638e2c73af1cfcccf9684b6799a30112e8e6da32069bea87ea";
+      sha512 = "594669d5518b0be87095527b3013799812c9f45254434523903ad19edb2ebd4bc32409df6f646b1d1e953098e126673427400238a056e0a8c44b672009a12a2c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ko/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ko/thunderbird-52.4.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "1260ecda4f82475857ac17c8e4825bb9e8aae458797a8fb92ce6fd90220dc2eafdc03447116f2063e5a66661a8869b10a4280bb481f3278b08e135466a0ab74b";
+      sha512 = "db3e6c9efbeeed833384256814a713a5bf3d2a220a74c88fd28f91ec0dd6c7600d77e18ce66c9dc9f1929f5da7452c5904f012fa8f5e4fa04084892e17b2647f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/lt/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/lt/thunderbird-52.4.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "3437bdfcd7ff3ed1f628558dfe34b82319fefb4f133062ffe8a04ddf1bb554b1d5ab881cc2a288cfe494c7e4520147bbf4c23fe38b7c0b0ddaae8a061d7ba839";
+      sha512 = "2b8e8b74bbba2a72dc88a8dba457189cad1c902c0bf2cbc54bf989c6444c8b164238f1d9e21c2c8e470df5198d8586cd613b40292b737c04f4c2d834d298dc13";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nb-NO/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nb-NO/thunderbird-52.4.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e321b1ce86913287ad239f235f97e481c1f1a26931da1f17ac4827767735208a31ac0c418301476551ad1c73781dbae890da15ebd8113a59d11e45359d592537";
+      sha512 = "bf99756bb7bc5fa699cae5ef3da5a3614e57483b2892e2f6f769699ef3478e22847ddeaf63fc0c521cd1fbcccbdf9bc5054430a5cdbb50e26e371818cae404fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nl/thunderbird-52.4.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "656e6bec81d40f1dee9bd51d5313f6625485458f47c45a4f77b8f114df9463257765870982bf704f108f84df064d51a7c5c5500440e3b66a690b15d248977070";
+      sha512 = "80170d51276bb77de4af8d45d5869069c7d9c6db7ad6d5786fd4c2c5cfb0a20ceb1cdce7b5dbf99a79dca329efa5d9a53d4ed738cbe7f77bdcb65a8b6e2e7511";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/nn-NO/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/nn-NO/thunderbird-52.4.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "d7a460705e2debb51423612059425094e88a0ee552ce8b75097845763d4c65039fffabcba2f0d95bc655a84f3d1d1c7e1290905f56c5c8c461e14a9eaf87efc7";
+      sha512 = "f223dd33108a750563a498e92b53cd3e68e3d50fdb1a08e295a9c3e893c20908ea56c9c5312874469b2f96d1046f754df55bc38d1595d5b811b7ed659e267d98";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pa-IN/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pa-IN/thunderbird-52.4.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ab12d8a23b649b5fd7cc71caa71dc0cf15f4a5baab69be44ec71daa4f643a2f5dd83974d88e6d5deb06c9e89bb7f39af3940edd551588c28d42d1304bc092f53";
+      sha512 = "a418fea2521ff6971d68d975823bd0917580450a7ff38975455b891c8e3cbcfdf51c40502fa072ebc1f43ce93a3b07ce93db369edfbd511beee5dfc5041a0a84";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pl/thunderbird-52.4.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "f85deb706d0ae38c53965951c09991bac85a05486b23e6c364871d9d68dab057b4ad963d4287bab4f1d6c3ba60841827ad6b1861c3dda15dbd29f42c9442dbf1";
+      sha512 = "05adc7298c91853b373756944d360589caeef6a999f6c5ea9babe3b12ff9409909040b69b641b69b78bd17bddda59f9828e294f5cd5f7d7061cc3f51eb3c48b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-BR/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-BR/thunderbird-52.4.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "a3e955d25fc48b8e2051a131c437b1075a773b69fbc17f4cbb8ff60548d47449be70e3aab97d569802c925ffb57462bd144f3eeb0cdde7b2508ecff536a9193f";
+      sha512 = "4a2503e3a1daf5b9cb26acf25720c4d0fdc7a170bd454a185e4cf2cd9c9429dcbdee4c13e59e11a2a275d88513b1ae31dffae8bdf70c3196249e432360fbe705";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/pt-PT/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/pt-PT/thunderbird-52.4.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "051f55a3530c7d90a0f7791d6bf2ed1af015eb6813ffe3f1b43d7fd4da992c079bc6836e38eb027f7246aef7245f480e9300dfca9c512f55e62c3d851c7d9b16";
+      sha512 = "cb02054a64a74c2e1f936594f001dd721e3016cc68cf705c0413a732153bbe45aaa14736d38b22358bda5f3d059f7306087c27faf040d91bd7f92066403e65c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/rm/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/rm/thunderbird-52.4.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "f42c1f0cbd76b7425d986b26a1e2d0342c4c99c7d283bd2d6719179c5b14912853b7af20de214dcf06ef1f89bfa9d5a9eb0052effecab505738c80abf168b67b";
+      sha512 = "8e745e5d1e5a4d3f432bf8c5f90906a22c8d2fe4c6d77ec032cb7eccae1f2f9e7cf0620dd3ef378414d6f34cc25346ff44b7fbee05016f34c49a0c8c5959184c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ro/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ro/thunderbird-52.4.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "30cd95effe6597aeb0e686511a3b59f064269562337c924af06198600a9c19dee54931255cb9e5400e034de8d9c08f2e99943084ad9360eeedbd0615339df3fd";
+      sha512 = "20d9b9666704c87f73f4c8cbe8d09cf79349e811f4c4da93f2754886cc89fabf7c2388430f9f072a3918b38984742adab48ada320dd75761a7443f3be1198a8e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ru/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ru/thunderbird-52.4.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "3e8a7501295ad1a41f3b79efaff4c76c25e5201f2ddfb02749ce950b66d81b8cfd870da2570eddf4381e8928a6a355dae06906043bc6912da23feda3706ac12d";
+      sha512 = "ff7c64ed9a4403e24b7f0f9fb06bc4b96153fbe7d30b94ea7e145d33dc24bb1b2807db8d6e3398dc84e13f68d9c5c4fbaacc3027cd46ee58fecaa8b7b17b27a7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/si/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/si/thunderbird-52.4.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "ddaf492f1d6c219ff503fa50ae1f415c7d24dd6431cd55d02a222e5eec7265b80e96fcfb0ca38092e06aeea78f698ed5b229d8527785e90b49fed6ca69acb9a2";
+      sha512 = "b2358e6df5f5cda477c530dddd9d27e35a8919aa346b66521336fb0cddd2821bb7dd867f4ad005c135ce040a1eb64ad9f1feef81a268a299ca2170312f7c89ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sk/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sk/thunderbird-52.4.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "dec6bfebf69c1db120ebee8b61cec49eb3c27209f9bbc0fd914c4f22956829cd9759f0671cd7b6ca24dda6598dd45791d566a55db5395cc089ea15696d791a3a";
+      sha512 = "fc3eae35914d2a2ec6d44bf6348f71872f7ccb09d25ed974843b8010526f219437e6530c4d86825d027f1593da0943e0b9a5557bf41d4095e4e9d37108a94c3a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sl/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sl/thunderbird-52.4.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3fd4b5dcc631b65f0509272156be238d4c9f99835fb7d23730d99267351f9ac58d370cc95f3a4839bf0b1a45fc0fd34b1b6cdb9efa88b75f991aa5fedf74521f";
+      sha512 = "532b87d22bd05194470801cccf242ffbae57685e69a836c8179e2fc562bdf2aba196f214b7a66006ef90d7fb1781d66e1ea62c2cf95820402deb9a73122ad143";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sq/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sq/thunderbird-52.4.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "a72d7db408855d53eda896280a114dbe667a914a5c5d17da7a242697a44b974f54f0b02d0884150c1f27602296df17cadc96f4b27057ae094df9680d3b48f6bb";
+      sha512 = "b621973b1f76f2d789afa854917e20b7b48e3381344da29e07b8c5bfd469162c47d51e9552ab2428895c45dab9662d8fdc2704e65c96faa4afbddc4649a77dec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sr/thunderbird-52.4.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "dbd9862ca22f038defb83b8df9cde748eaab1a4d68afbbbe6dfe45c73334616bf7f64536d6ab2d42166d1196e548acf697fa29a5d37184e9ccb198bc713ecae8";
+      sha512 = "d26812c232168c30c6a76dad5f3f7e20fe88cd75fc63f863bca255fa353928b8d3988c56abbb649266e52b8d31d70182c59ded496607aae17d7d2d0409ecc53a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/sv-SE/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/sv-SE/thunderbird-52.4.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "7c3804d7681cffc6e979975a898b1cc2b1bac0d2e6a17058025629b8ad308cade808401f99e43cf0c1662a9597f2f6848d12839c3e1fe7606fca5926e6b484cf";
+      sha512 = "294e141cabec4edab0695e7c8e29149543e4cf4d451cfe9ba038a6997a822e02f223045ac3a8ac25b99a1e847740fac4d9d5c0b5ce0c5d69d331d823bf8e4899";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/ta-LK/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/ta-LK/thunderbird-52.4.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "38e8a0370c8ea7c7b7936da47dea583dbd282eb0cbe504337ac9e35efaf67cb1e6e9d7220efec243581d7a04a19e4f6f78892fd1a84461b30035d01ab225920a";
+      sha512 = "9c9b79cf21e64461b8a78dd0f7816346ada2cce0ef4bce4da291497c9fd1aa414c199d57265390e5b885828b1efa38f9883882870b84a5b3a64ffffb47da79e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/tr/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/tr/thunderbird-52.4.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "053e0e6e88c92c6c8d398cb8c38d8ce9b1340c4ff4455a7c4b1225090d5d10387b8b14e6f71dfee2a159329478cada995f05b75986c6a57d01ae7c1e1a65772b";
+      sha512 = "61a671ae2804b06143e636c9e8ae0badb460bf9cbb3555213bf43aa2d56b2a9f13ca3a13362f2a9b7ecafb4b03451093ea2f817a104cc7d4555e11b1ffb18103";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/uk/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/uk/thunderbird-52.4.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "98cabbbd8314ba80d74a0f3a9b17ee49aced8b5832f13e5b6060896dd9dee4abff8a15e1b509387254416f6e49652fcf797a1cb6934b7ae6f65909ba85a8e01d";
+      sha512 = "629ede67d8bbfd6b1233d2030234fed7f99915045131caa11edce99b6e9c314b7cfd6ef457d26a0e628b525bb78c05426e8c078364ade5e606dfaba90200feee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/vi/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/vi/thunderbird-52.4.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "2937330459ec576ba9678c465bd5aea7cb536002574a23e3043363d562bee2d1c58de1a6a73870ee27e363b9a64b82ae2a483dd21e3b6fc3b28bdda5d8c349f5";
+      sha512 = "728644651b7eff73be44bceccf8038bca79e020fbaad87d74fb1ff4856554766e6494e1e16a0d93187615f5f8cb663fc3233855d66e8cf0996fe597c9645273c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-CN/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-CN/thunderbird-52.4.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "80e640c07514c215f170606353a97b058fe2b6b8f03adeb1526d3f5e237cfe71123b945b82b00726b00101a11a3207930af622775e4a0b5c5f9c464aca34aad0";
+      sha512 = "ef5a81e04ed973fd2ed576d1654f1ada7d9cefb6943bf604bee53053fedc4b2127c780ac2ff3c9b568813699f29f744950e899bc71733cd8d385368e1d0c07c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/zh-TW/thunderbird-52.3.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.4.0/linux-i686/zh-TW/thunderbird-52.4.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9ea9bb1121f3f1731d3e1748af70ebce153a7cdf8bc44034928f618e21f2c1c1ac50f13f2e42d42e3105fbabe7cbb919bf785de032b615b2a1e732700c436ad9";
+      sha512 = "ddf5a00621d6916c6033f81589c9376a8aaba3bf12810a2fd41358af323d9f6354384a5b938f299855d27a1272d36e99ca3f45a8ab8299aa7afc118d942ae624";
     }
     ];
 }

From 74406eb48f6c754f511905ce6772e2f50e4bc94c Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 7 Oct 2017 03:12:17 +0900
Subject: [PATCH 62/77] thunderbird: 52.3.0 -> 52.4.0

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 51d90d11707..2e1f8ed5070 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.3.0";
+  version = "52.4.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66";
+    sha512 = "6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78";
   };
 
   # New sed no longer tolerates this mistake.

From f77fb64c1eca88ba77ddedec73a7bf5a24a577eb Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 6 Oct 2017 14:32:31 -0400
Subject: [PATCH 63/77] lnav: add platforms metadata so hydra builds on darwin

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

diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index 136951cb7bc..5ab05c92135 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     license = licenses.bsd2;
     version = "0.8.2";
     maintainers = [ maintainers.dochang ];
+    platforms = platforms.unix;
   };
 
 }

From ee6d469ee96ff1e5dc930f4cabd8c49e602d39f0 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@svends.net>
Date: Fri, 6 Oct 2017 12:05:30 -0700
Subject: [PATCH 64/77] plantuml: 8047 -> 1.2017.16

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index f15c452c955..1b690c04172 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "8047";
+  version = "1.2017.16";
   name = "plantuml-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar";
-    sha256 = "11a1qchalymvc7qn9kqxamp8qm8fljpnxmfi4zs8sg75nzddjnlm";
+    url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
+    sha256 = "a3d319ed54ed78ce3cf7bfcfe76ffc5aa6ed28a72b5aa575fe9125e0c6bd985c";
   };
 
   # It's only a .jar file and a shell wrapper

From 6118ace4d570e08d16a2c9c4a34d957ae53ce963 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 6 Oct 2017 21:25:22 +0200
Subject: [PATCH 65/77] postgresql: enable all platforms on hydra

---
 pkgs/servers/sql/postgresql/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 8a3097ae9de..9d62228dd37 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -85,7 +85,6 @@ let
       license = licenses.postgresql;
       maintainers = [ maintainers.ocharles ];
       platforms = platforms.unix;
-      hydraPlatforms = platforms.linux;
     };
   });
 

From 7637cb884c3f38ca61c38741a52d002321ba91f8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Jul 2017 06:45:28 -0500
Subject: [PATCH 66/77] bloaty: 2016-12-28 -> 2017-10-05

* use fetchFromGitHub now that it supports submodules
* change version style to dashes per guidelines
  (https://nixos.org/nixpkgs/manual/#sec-package-naming)
* cmake
* prefer substituteInPlace
* run tests
---
 pkgs/development/tools/bloaty/default.nix | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 8970f7a86d1..e61b7f78302 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, binutils, fetchgit }:
+{ stdenv, binutils, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2016.12.28";
+  version = "2017-10-05";
   name = "bloaty-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/google/bloaty.git";
-    rev = "2234386bcee7297dfa1b6d8a5d20f95ea4ed9bb0";
-    sha256 = "0cfsjgbp9r16d6qi8v4k609bbhjff4vhdiapfkhr34z1cik1md4l";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "bloaty";
+    rev = "e47b21b01ceecf001e1965e9da249d48d86a1749";
+    sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm";
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ cmake ];
+
   enableParallelBuilding = true;
 
-  configurePhase = ''
-    sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc
+  preConfigure = ''
+    substituteInPlace src/bloaty.cc \
+      --replace "c++filt" \
+                "${stdenv.lib.getBin binutils}/bin/c++filt"
   '';
 
+  doCheck = true;
+
+  checkPhase = "ctest";
+
   installPhase = ''
     install -Dm755 {.,$out/bin}/bloaty
   '';

From 96874c6e719dbe8c53cc1dea832f7e1866297a24 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Oct 2017 13:55:44 -0700
Subject: [PATCH 67/77] Resurrect pandas 0.17.1

---
 .../python-modules/scipy/0.17.1.nix           | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 55 ++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 pkgs/development/python-modules/scipy/0.17.1.nix

diff --git a/pkgs/development/python-modules/scipy/0.17.1.nix b/pkgs/development/python-modules/scipy/0.17.1.nix
new file mode 100644
index 00000000000..fea8a05bca1
--- /dev/null
+++ b/pkgs/development/python-modules/scipy/0.17.1.nix
@@ -0,0 +1,56 @@
+{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}:
+
+buildPythonPackage rec {
+  pname = "scipy";
+  version = "0.17.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
+    sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w";
+  };
+
+  buildInputs = [ gfortran nose numpy.blas ];
+  propagatedBuildInputs = [ numpy ];
+
+  # Remove tests because of broken wrapper
+  prePatch = ''
+    rm scipy/linalg/tests/test_lapack.py
+  '';
+
+  preConfigure = ''
+    sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
+    export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+  '';
+
+  preBuild = ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [openblas]
+    include_dirs = ${numpy.blas}/include
+    library_dirs = ${numpy.blas}/lib
+    EOF
+  '';
+
+  enableParallelBuilding = true;
+
+  checkPhase = ''
+    runHook preCheck
+    pushd dist
+    ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)'
+    popd
+    runHook postCheck
+  '';
+
+  passthru = {
+    blas = numpy.blas;
+  };
+
+  setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
+
+  meta = {
+    description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
+    homepage = http://www.scipy.org/;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a10f4e9830a..4a34b22482e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14990,6 +14990,59 @@ in {
 
   pandas = callPackage ../development/python-modules/pandas { };
 
+  pandas_17 = let
+    inherit (pkgs.stdenv.lib) optional optionalString;
+    inherit (pkgs.stdenv) isDarwin;
+  in buildPythonPackage rec {
+    name = "pandas-${version}";
+    version = "0.17.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz";
+      sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837";
+    };
+
+    buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx;
+    propagatedBuildInputs = with self; [
+      dateutil
+      scipy_0_17
+      numexpr
+      pytz
+      xlrd
+      bottleneck
+      sqlalchemy
+      lxml
+      html5lib
+#      modules.sqlite3
+      beautifulsoup4
+    ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command
+
+    # For OSX, we need to add a dependency on libcxx, which provides
+    # `complex.h` and other libraries that pandas depends on to build.
+    patchPhase = optionalString isDarwin ''
+      cpp_sdk="${pkgs.libcxx}/include/c++/v1";
+      echo "Adding $cpp_sdk to the setup.py common_include variable"
+      substituteInPlace setup.py \
+        --replace "['pandas/src/klib', 'pandas/src']" \
+                  "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
+
+      # disable clipboard tests since pbcopy/pbpaste are not open source
+      substituteInPlace pandas/io/tests/test_clipboard.py \
+        --replace pandas.util.clipboard no_such_module \
+        --replace OSError ImportError
+    '';
+
+    doCheck = false;
+
+    meta = {
+      homepage = "http://pandas.pydata.org/";
+      description = "Python Data Analysis Library";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ raskin fridh ];
+      platforms = platforms.unix;
+    };
+  };
+
   xlrd = buildPythonPackage rec {
     name = "xlrd-${version}";
 
@@ -19348,6 +19401,8 @@ in {
 
   scipy = callPackage ../development/python-modules/scipy { };
 
+  scipy_0_17 = callPackage ../development/python-modules/scipy/0.17.1.nix { };
+
   scikitimage = buildPythonPackage rec {
     name = "scikit-image-${version}";
     version = "0.12.3";

From cbf5307020b4a0a473e3ca4232ebb66ce0d60bec Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Oct 2017 20:23:12 +0000
Subject: [PATCH 68/77] ocamlPackages.biniou: 1.0.9 -> 1.2.0

---
 pkgs/development/ocaml-modules/biniou/1.0.nix | 36 ++++++++++++++
 .../ocaml-modules/biniou/default.nix          | 48 ++++++++-----------
 pkgs/top-level/ocaml-packages.nix             |  5 +-
 3 files changed, 59 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/biniou/1.0.nix

diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix
new file mode 100644
index 00000000000..d2d3159cde1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/biniou/1.0.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, ocaml, findlib, easy-format}:
+let
+  pname = "biniou";
+  version = "1.0.9";
+  webpage = "http://mjambon.com/${pname}.html";
+in
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+
+stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+    sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb";
+  };
+
+  buildInputs = [ ocaml findlib easy-format ];
+
+  createFindlibDestdir = true;
+
+  makeFlags = "PREFIX=$(out)";
+
+  preBuild = ''
+    mkdir $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
+    homepage = "${webpage}";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+    platforms = ocaml.meta.platforms or [];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index d2d3159cde1..7047edf24b3 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -1,36 +1,26 @@
-{stdenv, fetchurl, ocaml, findlib, easy-format}:
-let
-  pname = "biniou";
-  version = "1.0.9";
-  webpage = "http://mjambon.com/${pname}.html";
-in
-
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }:
 
 stdenv.mkDerivation rec {
+	version = "1.2.0";
+	name = "ocaml${ocaml.version}-biniou-${version}";
+	src = fetchFromGitHub {
+		owner = "mjambon";
+		repo = "biniou";
+		rev = "v${version}";
+		sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb";
+	};
 
-  name = "${pname}-${version}";
+	buildInputs = [ ocaml findlib jbuilder ];
 
-  src = fetchurl {
-    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
-    sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb";
-  };
+	propagatedBuildInputs = [ easy-format ];
 
-  buildInputs = [ ocaml findlib easy-format ];
+	inherit (jbuilder) installPhase;
 
-  createFindlibDestdir = true;
-
-  makeFlags = "PREFIX=$(out)";
-
-  preBuild = ''
-    mkdir $out/bin
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
-    homepage = "${webpage}";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.vbgl ];
-    platforms = ocaml.meta.platforms or [];
-  };
+	meta = {
+		inherit (src.meta) homepage;
+		inherit (ocaml.meta) platforms;
+		description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		license = stdenv.lib.licenses.bsd3;
+	};
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e45256bd3dc..275c0739ce6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -114,7 +114,10 @@ let
 
     benchmark = callPackage ../development/ocaml-modules/benchmark { };
 
-    biniou = callPackage ../development/ocaml-modules/biniou { };
+    biniou =
+      if lib.versionOlder "4.02" ocaml.version
+      then callPackage ../development/ocaml-modules/biniou { }
+      else callPackage ../development/ocaml-modules/biniou/1.0.nix { };
 
     bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { };
 

From 5728b8d4e6f9d0ec2c2f5f843781b4626fe948c8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Oct 2017 20:24:49 +0000
Subject: [PATCH 69/77] coqPackages.coquelicot: 2.1.2 -> 3.0.1
 coqPackages.interval: 3.1.1 -> 3.3.0

---
 .../coq-modules/coquelicot/default.nix         | 12 ++++++------
 .../coq-modules/interval/default.nix           | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index a81b76849bc..6f58c387586 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -7,15 +7,15 @@ let param =
     url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz;
     sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km";
   };
-  v2_1_2 = {
-    version = "2.1.2";
-    url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz;
-    sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an";
+  v3_0_1 = {
+    version = "3.0.1";
+    url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz";
+    sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r";
   };
   in {
   "8.4" = v2_1_1;
-  "8.5" = v2_1_2;
-  "8.6" = v2_1_2;
+  "8.5" = v3_0_1;
+  "8.6" = v3_0_1;
 }."${coq.coq-version}"; in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index c3169970ad2..a8d3f9ad144 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -1,11 +1,23 @@
 { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }:
 
+let param =
+  if stdenv.lib.versionAtLeast coq.coq-version "8.5"
+  then {
+    version = "3.3.0";
+    url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz";
+    sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903";
+  } else {
+    version = "3.1.1";
+    url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz";
+    sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3";
+  };
+in
+
 stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-interval-3.1.1";
+  name = "coq${coq.coq-version}-interval-${param.version}";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz;
-    sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3";
+    inherit (param) url sha256;
   };
 
   nativeBuildInputs = [ which ];

From 662f82aee834e7ee97148ec159fc9ab9c1033372 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 00:48:51 +0200
Subject: [PATCH 70/77] zfs, spl: 0.7.1 -> 0.7.2

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index cd0c283edbb..75fbacfb90e 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -63,8 +63,8 @@ in
   assert buildKernel -> kernel != null;
 {
     splStable = common {
-      version = "0.7.1";
-      sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n";
+      version = "0.7.2";
+      sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445";
     };
 
     splUnstable = common {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 6ab9063d719..1fcb1720230 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -138,9 +138,9 @@ in {
     incompatibleKernelVersion = null;
 
     # this package should point to the latest release.
-    version = "0.7.1";
+    version = "0.7.2";
 
-    sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n";
+    sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v";
 
     extraPatches = [
       (fetchpatch {

From b02b224027320d6e33483647538af9f4bd96dea5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 00:50:44 +0200
Subject: [PATCH 71/77] postgresql100: init at 10.0

---
 pkgs/servers/sql/postgresql/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix         | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 9d62228dd37..cf3349dc166 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -114,4 +114,10 @@ in {
     sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6";
   };
 
+  postgresql100 = common {
+    version = "10.0";
+    psqlSchema = "10.0";
+    sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a6037f67a9..a9efda62713 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11778,7 +11778,8 @@ with pkgs;
     postgresql93
     postgresql94
     postgresql95
-    postgresql96;
+    postgresql96
+    postgresql100;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 

From 241cb4ed03cb4daee940bc7d26bd7bf73f18b8c6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 01:03:03 +0200
Subject: [PATCH 72/77] aespipe: 2.4d -> 2.5e

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

diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index aefd6b7500c..c67c758b933 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "aespipe-${version}";
-  version = "2.4d";
+  version = "2.4e";
 
   src = fetchurl {
     url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2";
-    sha256 = "03z5i41xv6p3m79lm04d7msda8878lsppv3324zbjjfy19p6bkn5";
+    sha256 = "0fmr0vk408bf13jydhdmcdhqw31yc9qk329bs9i60alccywapmds";
   };
 
   meta = {

From 0a9825a7f51c59bee3d6d943d47cdeb25c4b1a2e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 01:06:34 +0200
Subject: [PATCH 73/77] apacheHttpd: 2.4.27 -> 2.4.28

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

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index ecf9ee9d84a..93fe205a8f9 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -5,7 +5,6 @@
 , ldapSupport ? true, openldap
 , libxml2Support ? true, libxml2
 , luaSupport ? false, lua5
-, fetchpatch
 }:
 
 let optional       = stdenv.lib.optional;
@@ -17,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.27";
+  version = "2.4.28";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc";
+    sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666";
   };
 
   # FIXME: -dev depends on -doc
@@ -40,15 +39,6 @@ stdenv.mkDerivation rec {
     sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2017-9798.patch";
-      url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch";
-      sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k";
-      stripLen = 3;
-     })
-  ];
-
   # Required for ‘pthread_cancel’.
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 

From c559e96445412e25db8d9b26e4c7237da15fb9e6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 03:31:25 +0200
Subject: [PATCH 74/77] btrfs-progs_4_4_1: remove, snapper works with latest

---
 pkgs/tools/filesystems/btrfs-progs/4.4.1.nix | 31 --------------------
 pkgs/top-level/all-packages.nix              |  6 +---
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/btrfs-progs/4.4.1.nix

diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix
deleted file mode 100644
index afafa4ec174..00000000000
--- a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
-}:
-
-let version = "4.4.1"; in
-
-stdenv.mkDerivation rec {
-  name = "btrfs-progs-${version}";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r";
-  };
-
-  buildInputs = [
-    pkgconfig attr acl zlib libuuid e2fsprogs lzo
-    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
-  ];
-
-  # gcc bug with -O1 on ARM with gcc 4.8
-  # This should be fine on all platforms so apply universally
-  patchPhase = "sed -i s/-O1/-O2/ configure";
-
-  meta = with stdenv.lib; {
-    description = "Utilities for the btrfs filesystem";
-    homepage = https://btrfs.wiki.kernel.org/;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ nckx raskin wkennington ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9efda62713..c34d03f3269 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -781,7 +781,6 @@ with pkgs;
   bsod = callPackage ../misc/emulators/bsod { };
 
   btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
-  btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { };
 
   btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {};
 
@@ -16472,10 +16471,7 @@ with pkgs;
 
   smartdeblur = callPackage ../applications/graphics/smartdeblur { };
 
-  snapper = callPackage ../tools/misc/snapper {
-    btrfs-progs = btrfs-progs_4_4_1;
-    stdenv = overrideCC stdenv gcc5;
-  };
+  snapper = callPackage ../tools/misc/snapper { };
 
   snd = callPackage ../applications/audio/snd { };
 

From 801c920e95642ec663d4aa486c81e5443e25b182 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 03:31:59 +0200
Subject: [PATCH 75/77] btrfs-progs: 4.8.2 -> 4.13.1

---
 .../modules/installer/tools/nixos-generate-config.pl | 12 ++++--------
 pkgs/tools/filesystems/btrfs-progs/default.nix       |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 4ec48b77335..97a30634dc7 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -398,19 +398,15 @@ EOF
 
     # Is this a btrfs filesystem?
     if ($fsType eq "btrfs") {
-        my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint");
-        if ($status != 0 || join("", @id_info) =~ /ERROR:/) {
+        my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
+        if ($status != 0 || join("", @info) =~ /ERROR:/) {
             die "Failed to retrieve subvolume info for $mountPoint\n";
         }
-        my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
+        my @ids = join("", @info) =~ m/Subvolume ID:[ \t\n]*([0-9]*)/;
         if ($#ids > 0) {
             die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
         } elsif ($#ids == 0) {
-            my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint");
-            if ($status != 0) {
-                die "Failed to find $mountPoint subvolume id from btrfs\n";
-            }
-            my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
+            my @paths = join("", @info) =~ m/^([^\n]*)/;
             if ($#paths > 0) {
                 die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n";
             } elsif ($#paths != 0) {
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index d9b01eb5239..7e575812609 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.8.2"; in
+let version = "4.13.1"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41";
+    sha256 = "1clavvrlkswgicqsm2yfsxqw04lsn8dra0db84jqm6j2apz80kz0";
   };
 
   buildInputs = [

From 7d9ee29f2445ef9e1e89f3bf33c739c4d3537674 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 03:32:23 +0200
Subject: [PATCH 76/77] btrbk: 0.24.0 -> 0.25.1

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

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index ff542e781a6..f9feaf40ec2 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
-  version = "0.24.0";
+  version = "0.25.1";
 
   src = fetchurl {
     url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz";
-    sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3";
+    sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5";
   };
 
   patches = [

From 4fdd225002789d870a4f43e532eccb4592eaaa08 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 7 Oct 2017 04:48:29 +0200
Subject: [PATCH 77/77] twolame: fix evaluation, platforms list must be
 flattened

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

diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix
index 54ba8470fc5..a65254fea24 100644
--- a/pkgs/development/libraries/twolame/default.nix
+++ b/pkgs/development/libraries/twolame/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.twolame.org/;
     license = with licenses; [ lgpl2Plus ];
-    platforms = with platforms; [ unix ];
+    platforms = with platforms; unix;
     maintainers = with maintainers; [ AndersonTorres ];
   };
 }