From 2aa8bc45d38e3253958d9d3452acbece10b8cabc Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sun, 3 Sep 2017 17:06:57 -0400
Subject: [PATCH 01/88] gnome2.gtkhtml4: init at 4.10.0

---
 pkgs/desktops/gnome-2/default.nix              |  2 ++
 pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index c6df2a9ebc2..4fec962f16d 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -66,6 +66,8 @@ let overridden = set // overrides; set = with overridden; {
 
   gtkhtml = callPackage ./platform/gtkhtml { };
 
+  gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
+
   # Required for nautilus
   inherit (libunique);
 
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
new file mode 100644
index 00000000000..4525246c20e
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, intltool,
+GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation rec {
+  version = "4.10.0";
+  name = "gtkhtml-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz";
+    sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
+  };
+
+  propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ];
+  buildInputs = [pkgconfig intltool enchant isocodes ];
+}

From e11c7399a00636e0abc02be7ad1026f0226ef3e5 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 4 Sep 2017 08:25:08 -0400
Subject: [PATCH 02/88] webkitgtk-2.17: init at 2.17.91

---
 pkgs/development/libraries/webkitgtk/2.17.nix | 106 ++++++++++++++++++
 .../webkitgtk/gstreamergl-2.17.patch          |  13 +++
 pkgs/top-level/all-packages.nix               |   5 +
 3 files changed, 124 insertions(+)
 create mode 100644 pkgs/development/libraries/webkitgtk/2.17.nix
 create mode 100644 pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch

diff --git a/pkgs/development/libraries/webkitgtk/2.17.nix b/pkgs/development/libraries/webkitgtk/2.17.nix
new file mode 100644
index 00000000000..53718f696cb
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/2.17.nix
@@ -0,0 +1,106 @@
+{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
+, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
+, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
+, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
+, libidn, libedit, readline, mesa, libintlOrEmpty
+, enableGeoLocation ? true, geoclue2, sqlite
+, gst-plugins-base, gst-plugins-bad
+}:
+
+assert enableGeoLocation -> geoclue2 != null;
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "webkitgtk-${version}";
+  version = "2.17.91";
+
+  meta = {
+    description = "Web content rendering engine, GTK+ port";
+    homepage = http://webkitgtk.org/;
+    license = licenses.bsd2;
+    platforms = with platforms; linux ++ darwin;
+    hydraPlatforms = [];
+    maintainers = with maintainers; [ ];
+  };
+
+  postConfigure = optionalString stdenv.isDarwin ''
+    substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
+        --replace "../../lib/libWTFGTK.a" ""
+    substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
+        --replace "../../lib/libbmalloc.a" ""
+    sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
+        Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
+        Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
+        Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
+        Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
+        Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
+        Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
+        Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
+    substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
+        --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
+  '';
+
+  src = fetchurl {
+    url = "http://webkitgtk.org/releases/${name}.tar.xz";
+    sha256 = "0f158gqb2lvv3v5z6s7gjgwms69fgsjkd8whfks8cq6cybiy9y37";
+  };
+
+  # see if we can clean this up....
+
+  patches = [  
+    ./finding-harfbuzz-icu.patch
+    ./gstreamergl-2.17.patch
+  ] ++ optionals stdenv.isDarwin [
+    ./PR-152650-2.patch
+    ./PR-153138.patch
+    ./PR-157554.patch
+    ./PR-157574.patch
+  ];
+
+  cmakeFlags = [
+  "-DPORT=GTK"
+  "-DUSE_LIBHYPHEN=0"
+  ]
+  ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
+  ++ optionals stdenv.isDarwin [
+  "-DUSE_SYSTEM_MALLOC=ON"
+  "-DUSE_ACCELERATE=0"
+  "-DENABLE_INTROSPECTION=ON"
+  "-DENABLE_MINIBROWSER=OFF"
+  "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
+  "-DENABLE_MINIBROWSER=OFF"
+  "-DENABLE_VIDEO=ON"
+  "-DENABLE_QUARTZ_TARGET=ON"
+  "-DENABLE_X11_TARGET=OFF"
+  "-DENABLE_OPENGL=OFF"
+  "-DENABLE_WEB_AUDIO=OFF"
+  "-DENABLE_WEBGL=OFF"
+  "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
+  "-DENABLE_GTKDOC=OFF"
+  ];
+
+  # XXX: WebKit2 missing include path for gst-plugins-base.
+  # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
+  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0"
+                     + (optionalString stdenv.isDarwin " -lintl");
+
+  nativeBuildInputs = [
+    cmake perl python2 ruby bison gperf sqlite
+    pkgconfig gettext gobjectIntrospection
+  ];
+
+  buildInputs = libintlOrEmpty ++ [
+    gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
+    libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
+    gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core
+  ] ++ optional enableGeoLocation geoclue2
+    ++ (with xlibs; [ libXdmcp libXt libXtst ])
+    ++ optionals stdenv.isDarwin [ libedit readline mesa ]
+    ++ optional stdenv.isLinux wayland;
+
+  propagatedBuildInputs = [
+    libsoup gtk3
+  ];
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
new file mode 100644
index 00000000000..7c47db52aba
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
@@ -0,0 +1,13 @@
+diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake
+index d3577a8..9620dc0 100644
+--- i/Source/cmake/OptionsGTK.cmake
++++ w/Source/cmake/OptionsGTK.cmake
+@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential
+ 
+ # Private options specific to the GTK+ port. Changing these options is
+ # completely unsupported. They are intended for use only by WebKit developers.
+-WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON)
++WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON)
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2f34229492..b3b2209e74d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10703,6 +10703,11 @@ with pkgs;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
+  webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix {
+    harfbuzz = harfbuzz-icu;
+    gst-plugins-base = gst_all_1.gst-plugins-base;
+  };
+
   webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
     withGtk2 = true;
     enableIntrospection = false;

From 4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 4 Sep 2017 08:25:55 -0400
Subject: [PATCH 03/88] xiphos: 4.0.3 -> 4.0.6

---
 pkgs/applications/misc/xiphos/default.nix | 22 ++++++++++++----------
 pkgs/top-level/all-packages.nix           |  5 +++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index a9f786a2a08..ecd6ab8c2ad 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -1,27 +1,29 @@
-{stdenv, fetchurl, pkgconfig
+{stdenv, fetchFromGitHub, pkgconfig
 , python
 , intltool
 , docbook2x, docbook_xml_dtd_412, libxslt
 , sword, clucene_core, biblesync
 , gnome_doc_utils
 , libgsf, gconf
-, gtkhtml, libgtkhtml, libglade, scrollkeeper
+, gtkhtml, libglade, scrollkeeper
 , webkitgtk
-, dbus_glib, enchant, isocodes, libuuid
+, dbus_glib, enchant, isocodes, libuuid, icu
 }:
 
 stdenv.mkDerivation rec {
   name = "xiphos-${version}";  
-  version = "4.0.3-20150806";
+  version = "4.0.6";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
-    sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
+  src = fetchFromGitHub {
+    owner = "crosswire";
+    repo = "xiphos";
+    rev = "${version}";
+    sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
   };
 
   buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
-                  sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
-                  libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
+                  sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
+                  libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
 
   prePatch = ''
     patchShebangs .;
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
   '';
   
   configurePhase = ''
-    python waf configure --prefix=$out    
+    python waf configure --prefix=$out --enable-webkit2
   '';
   
   buildPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3b2209e74d..9b50ce88cdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17016,9 +17016,10 @@ with pkgs;
 
   xiphos = callPackage ../applications/misc/xiphos {
     gconf = gnome2.GConf;
-    inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper;
+    inherit (gnome2) libglade scrollkeeper;
+    gtkhtml = gnome2.gtkhtml4;
+    webkitgtk = webkitgtk217x;
     python = python27;
-    webkitgtk = webkitgtk24x-gtk2;
   };
 
   xournal = callPackage ../applications/graphics/xournal {

From af57251cb9904bc61bdb3a35a7cfe19f248958c2 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Tue, 5 Sep 2017 20:49:39 -0400
Subject: [PATCH 04/88] amarok: fixup by building with gcc-5

due to continued lack of progress on
https://github.com/NixOS/nixpkgs/issues/16588, probably not worth the
time for anything better.

Progress on: #28643
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2993b0647e..1f4718a3e4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13389,6 +13389,7 @@ with pkgs;
 
   amarok = kde4.callPackage ../applications/audio/amarok {
     ffmpeg = ffmpeg_2;
+    stdenv = overrideCC stdenv gcc5;
   };
 
   AMB-plugins = callPackage ../applications/audio/AMB-plugins { };

From 8b0de80e5560b3b28e088e29b1dd8c2fb047a069 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 4 Sep 2017 09:25:15 -0700
Subject: [PATCH 05/88] truecrypt: fix build with gcc6 patch

The build was failing with gcc 6.4.0; using the samee gcc6 patch Arch
Linux uses fixed the build.

This commit also refactors out the builder.sh possibly fixing the
NOGUI make flag option.
---
 pkgs/applications/misc/truecrypt/builder.sh  | 15 -----
 pkgs/applications/misc/truecrypt/default.nix | 24 ++++++--
 pkgs/applications/misc/truecrypt/gcc6.patch  | 61 ++++++++++++++++++++
 3 files changed, 81 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/misc/truecrypt/builder.sh
 create mode 100644 pkgs/applications/misc/truecrypt/gcc6.patch

diff --git a/pkgs/applications/misc/truecrypt/builder.sh b/pkgs/applications/misc/truecrypt/builder.sh
deleted file mode 100644
index 88820d4cad2..00000000000
--- a/pkgs/applications/misc/truecrypt/builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-source $stdenv/setup
-
-tar xvfz $src
-cd truecrypt-*
-
-cp $pkcs11h pkcs11.h
-cp $pkcs11th pkcs11t.h
-cp $pkcs11fh pkcs11f.h
-
-make PKCS11_INC="`pwd`"
-
-mkdir -p $out/bin
-cp Main/truecrypt $out/bin
-mkdir -p $out/share/$name
-cp License.txt $out/share/$name/LICENSE
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
index 2b66dd41a2a..4787516cedd 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -46,7 +46,24 @@ library, use the 'NOGUI' parameter:
 
 stdenv.mkDerivation {
   name = "truecrypt-7.1a";
-  builder = ./builder.sh;
+
+  patchPhase = "patch -p0 < ${./gcc6.patch}";
+
+  preBuild = ''
+    cp $pkcs11h pkcs11.h
+    cp $pkcs11th pkcs11t.h
+    cp $pkcs11fh pkcs11f.h
+  '';
+
+  makeFlags = [
+    ''PKCS11_INC="`pwd`"''
+    (if wxGUI then "" else "NOGUI=1")
+  ];
+
+  installPhase = ''
+    install -D -t $out/bin Main/truecrypt
+    install -D License.txt $out/share/$name/LICENSE
+  '';
 
   src = fetchurl {
     url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz;
@@ -68,14 +85,13 @@ stdenv.mkDerivation {
     sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
   };
 
-  buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; 
-  makeFlags = if wxGUI then "" else "NOGUI=1";
+  buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
     homepage = http://www.truecrypt.org/;
     license = "TrueCrypt License Version 2.6";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric ryantm ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/truecrypt/gcc6.patch b/pkgs/applications/misc/truecrypt/gcc6.patch
new file mode 100644
index 00000000000..6e8c7da69e8
--- /dev/null
+++ b/pkgs/applications/misc/truecrypt/gcc6.patch
@@ -0,0 +1,61 @@
+--- Main/Resources.cpp	2016-05-16 16:47:35.846462041 +0200
++++ Main/Resources.cpp	2016-05-16 17:12:21.838202520 +0200
+@@ -45,13 +45,13 @@
+ 		strBuf.CopyFrom (res);
+ 		return string (reinterpret_cast <char *> (strBuf.Ptr()));
+ #else
+-		static const char LanguageXml[] =
++		static byte LanguageXml[] =
+ 		{
+ #			include "Common/Language.xml.h"
+ 			, 0
+ 		};
+ 
+-		return string (LanguageXml);
++		return string ((const char*) LanguageXml);
+ #endif
+ 	}
+ 
+@@ -64,13 +64,13 @@
+ 		strBuf.CopyFrom (res);
+ 		return string (reinterpret_cast <char *> (strBuf.Ptr()));
+ #else
+-		static const char License[] =
++		static byte License[] =
+ 		{
+ #			include "License.txt.h"
+ 			, 0
+ 		};
+ 
+-		return string (License);
++		return string ((const char*) License);
+ #endif
+ 	}
+ 
+--- Main/Forms/PreferencesDialog.cpp	2016-05-16 17:14:47.704707908 +0200
++++ Main/Forms/PreferencesDialog.cpp	2016-05-16 17:15:56.927964437 +0200
+@@ -414,11 +414,11 @@
+ 		libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
+ 
+ #ifdef TC_MACOSX
+-		extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
++		extensions.push_back (make_pair (L"dylib", static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
+ #endif
+ 		if (!libExtension.empty())
+ 		{
+-			extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
++			extensions.push_back (make_pair (static_cast<const wchar_t*>(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
+ 			extensions.push_back (make_pair (L"*", L""));
+ 		}
+ 
+--- Main/GraphicUserInterface.cpp	2016-05-16 17:16:38.724591342 +0200
++++ Main/GraphicUserInterface.cpp	2016-05-16 17:17:09.854562653 +0200
+@@ -1445,7 +1445,7 @@
+ 	FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
+ 	{
+ 		list < pair <wstring, wstring> > extensions;
+-		extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"]));
++		extensions.push_back (make_pair (L"tc", static_cast<const wchar_t*>(LangString["TC_VOLUMES"].wc_str())));
+ 
+ 		FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory);
+

From b17ccf39c4650705f685eb4d33fd978224d07e8e Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 4 Sep 2017 14:34:44 +0300
Subject: [PATCH 06/88] rssguard: 3.4.0 -> 3.4.2

---
 .../networking/feedreaders/rssguard/default.nix           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index d1c272fc383..b25d4e109eb 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "rssguard-${version}";
-  version = "3.4.0";
+  version = "3.4.2";
 
   src = fetchgit {
     url = https://github.com/martinrotter/rssguard;
     rev = "refs/tags/${version}";
-    sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp";
-    fetchSubmodules = true;
+    sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s";
+    # Submodules are required only for Windows (and one of them is a huge binary
+    # package ~400MB). See project wiki for more details.
+    fetchSubmodules = false;
   };
 
   buildInputs =  [ qtwebengine qttools ];

From a75dd64338b655fca673808359ba563ae8e1986a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 09:48:54 +0200
Subject: [PATCH 07/88] python.pkgs.statsmodels: disable tests

---
 pkgs/development/python-modules/statsmodels/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index 2ef294d8d9f..f4c74cfccf8 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -21,9 +21,12 @@ buildPythonPackage rec {
     sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048";
   };
 
-  buildInputs = with self; [ nose ];
+  checkInputs = with self; [ nose ];
   propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib];
 
+  # Huge test suites with several test failures
+  doCheck = false;
+
   meta = {
     description = "Statistical computations and models for use with SciPy";
     homepage = https://www.github.com/statsmodels/statsmodels;

From b690856b629bb6ba9ac5f0a3b6abb0de9c1566d1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 09:52:47 +0200
Subject: [PATCH 08/88] python.pkgs.logfury: fix build

---
 .../python-modules/logfury/default.nix        | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +------------
 2 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/logfury/default.nix

diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix
new file mode 100644
index 00000000000..d9ce51eed1e
--- /dev/null
+++ b/pkgs/development/python-modules/logfury/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, funcsigs
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "logfury";
+  name = "${pname}-${version}";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
+  };
+
+  propagatedBuildInputs = [
+    funcsigs
+    six
+  ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
+    homepage = "https://github.com/ppolewicz/logfury";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jwiegley ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d029cbf7ad..b9e7dca0528 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7005,27 +7005,7 @@ in {
     };
   };
 
-  logfury = buildPythonPackage rec {
-    name = "logfury-${version}";
-    version = "0.1.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/logfury/${name}.tar.gz";
-      sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
-    };
-
-    buildInputs =
-      [ self.funcsigs
-        self.six
-      ];
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
-      homepage = "https://github.com/ppolewicz/logfury";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ jwiegley ];
-    };
-  };
+  logfury = callPackage ../development/python-modules/logfury { };
 
   ndg-httpsclient = buildPythonPackage rec {
     version = "0.4.2";

From 69435dfba5e5d8094ba4a8826b4b444f67329287 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 10:01:06 +0200
Subject: [PATCH 09/88] python.pkgs.readme_renderer: init at 17.2

---
 .../readme_renderer/default.nix               | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/readme_renderer/default.nix

diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
new file mode 100644
index 00000000000..af0b64fc340
--- /dev/null
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, bleach
+, docutils
+, pygments
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "readme_renderer";
+  version = "17.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da";
+  };
+
+  checkInputs = [ pytest ];
+
+  propagatedBuildInputs = [
+    bleach docutils pygments six
+  ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "readme_renderer is a library for rendering readme descriptions for Warehouse";
+    homepage = https://github.com/pypa/readme_renderer;
+    license = lib.licenses.asl20;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9e7dca0528..30732a7bd64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19189,6 +19189,8 @@ in {
     };
   };
 
+  readme_renderer = callPackage ../development/python-modules/readme_renderer { };
+
   rjsmin = callPackage ../development/python-modules/rjsmin { };
 
   pysolr = buildPythonPackage rec {

From 700c95a7067e5ea069f0ef9b8848aa2d16eb75c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 10:01:51 +0200
Subject: [PATCH 10/88] python.pkgs.restview: 2.5.2 -> 2.7.0

---
 .../python-modules/restview/default.nix       | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +-------------
 2 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/restview/default.nix

diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
new file mode 100644
index 00000000000..0f2ce45c885
--- /dev/null
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, docutils
+, readme_renderer
+, pygments
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "restview";
+  name = "${pname}-${version}";
+  version = "2.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec";
+  };
+
+  propagatedBuildInputs = [ docutils readme_renderer pygments ];
+  checkInputs = [ mock ];
+
+  postPatch = ''
+    # dict order breaking tests
+    sed -i 's@<a href="http://www.example.com" rel="nofollow">@...@' src/restview/tests.py
+  '';
+
+  meta = {
+    description = "ReStructuredText viewer";
+    homepage = http://mg.pov.lt/restview/;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ koral ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30732a7bd64..3b307a42313 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19136,31 +19136,7 @@ in {
   };
 
 
-  restview = buildPythonPackage rec {
-    name = "restview-${version}";
-    version = "2.5.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/restview/${name}.tar.gz";
-      sha256 = "0gmdmnlhiy6lagi17maiz312374hk6g6x90fhjwnbrwxif4r9bd5";
-    };
-
-    propagatedBuildInputs = with self; [ docutils readme pygments ];
-    buildInputs = with self; [ mock ];
-
-    patchPhase = ''
-      # dict order breaking tests
-      sed -i 's@<a href="http://www.example.com" rel="nofollow">@...@' src/restview/tests.py
-    '';
-
-    meta = {
-      description = "ReStructuredText viewer";
-      homepage = http://mg.pov.lt/restview/;
-      license = licenses.gpl2;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ koral ];
-    };
-  };
+  restview = callPackage ../development/python-modules/restview { };
 
   readme = buildPythonPackage rec {
     name = "readme-${version}";

From 85e2083aafc91328e475720e7b0e37b615206e2d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 10:11:45 +0200
Subject: [PATCH 11/88] python.pkgs.django-multiselectfield: 0.1.3 -> 0.1.8

---
 .../django-multiselectfield/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +--------------
 2 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/django-multiselectfield/default.nix

diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix
new file mode 100644
index 00000000000..af7af221b9b
--- /dev/null
+++ b/pkgs/development/python-modules/django-multiselectfield/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, django
+}:
+
+buildPythonPackage rec {
+  pname = "django-multiselectfield";
+  name = "${pname}-${version}";
+  version = "0.1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "52483d23aecbf6b502f9e6806e97da9288d5d7f2a3f99f736390763de68c8fd7";
+  };
+
+  propagatedBuildInputs = [ django ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "django-multiselectfield";
+    homepage = "https://github.com/goinnn/django-multiselectfield";
+    license = lib.licenses.lgpl3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b307a42313..1069d60c688 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19253,27 +19253,7 @@ in {
     };
   };
 
-  django-multiselectfield = buildPythonPackage rec {
-    name = "django-multiselectfield-${version}";
-    version = "0.1.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-multiselectfield/django-multiselectfield-${version}.tar.gz";
-      sha256 = "0v7wf82f8688srdsym9ajv1j54bxfxwvydypc03f8xyl4c1raziv";
-    };
-
-    propagatedBuildInputs = with self; [
-
-    ];
-    buildInputs = with self; [
-
-    ];
-
-    meta = with stdenv.lib; {
-      description = "django-multiselectfield";
-      homepage = "https://github.com/goinnn/django-multiselectfield";
-    };
-  };
+  django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
 
   reviewboard = buildPythonPackage rec {
     name = "ReviewBoard-2.5.1.1";

From a8dca7bf8aeb8e803fe2305ce0f9b493fcfefdde Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 7 Sep 2017 10:16:04 +0200
Subject: [PATCH 12/88] keyring: 8.4.1 -> 10.4.0

---
 pkgs/top-level/python-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d029cbf7ad..803e8fcfe32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11191,16 +11191,19 @@ in {
   };
 
   keyring = buildPythonPackage rec {
-    name = "keyring-8.4.1";
+    name = "keyring-${version}";
+    version = "10.4.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/k/keyring/${name}.tar.gz";
-      sha256 = "1286sh5g53168qxbl4g5bmns9ci0ld0jl3h44b7h8is5nw1421ar";
+      sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";
     };
 
     buildInputs = with self;
       [ fs gdata python_keyczar mock pyasn1 pycrypto pytest_28 six setuptools_scm pytestrunner ];
 
+    propagatedBuildInputs = [ self.secretstorage ];
+
     checkPhase = ''
       py.test $out
     '';

From b7eb4a4f9055d1d0b6891e555b25912d413028a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 10:17:55 +0200
Subject: [PATCH 13/88] python.pkgs.fixtures: fix build

---
 .../python-modules/fixtures/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +---------
 2 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/fixtures/default.nix

diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
new file mode 100644
index 00000000000..c13eec1baf0
--- /dev/null
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pbr
+, testtools
+, mock
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "fixtures";
+  version = "1.4.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y";
+  };
+
+  propagatedBuildInputs = [ pbr testtools mock ];
+
+  checkPhase = ''
+    ${python.interpreter} -m testtools.run fixtures.test_suite
+  '';
+
+  meta = {
+    description = "Reusable state for writing clean tests and more";
+    homepage = "https://pypi.python.org/pypi/fixtures";
+    license = lib.licenses.asl20;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1069d60c688..6312fb25f4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15757,22 +15757,7 @@ in {
 
   pbr = callPackage ../development/python-modules/pbr { };
 
-  fixtures = buildPythonPackage rec {
-    name = "fixtures-1.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/fixtures/${name}.tar.gz";
-      sha256 = "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y";
-    };
-
-    buildInputs = with self; [ pbr testtools mock ];
-
-    meta = {
-      description = "Reusable state for writing clean tests and more";
-      homepage = "https://pypi.python.org/pypi/fixtures";
-      license = licenses.asl20;
-    };
-  };
+  fixtures = callPackage ../development/python-modules/fixtures { };
 
   pelican = callPackage ../development/python-modules/pelican {
     inherit (pkgs) glibcLocales pandoc git;

From 52932fade011f9761266d04c98aa3550c8f96faa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 10:18:44 +0200
Subject: [PATCH 14/88] python.pkgs.fixtures: 1.4.0 -> 3.0.0

---
 pkgs/development/python-modules/fixtures/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
index c13eec1baf0..62741a78709 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "fixtures";
-  version = "1.4.0";
+  version = "3.0.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y";
+    sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef";
   };
 
   propagatedBuildInputs = [ pbr testtools mock ];

From 37d3a4425e21d5734a37ca93ad2a0a7dfdc29c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Sep 2017 09:54:07 +0100
Subject: [PATCH 15/88] python.pkgs.keyring: move out of python-packages.nix

---
 .../python-modules/keyring/default.nix        | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 31 ++--------------
 2 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/keyring/default.nix

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
new file mode 100644
index 00000000000..35bfd603f41
--- /dev/null
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, secretstorage
+, fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm
+, mock, pytest_28, pytestrunner }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "keyring";
+  version = "10.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";
+  };
+
+  buildInputs = [
+    fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm
+  ];
+
+  checkInputs = [ mock pytest_28 pytestrunner ];
+
+  propagatedBuildInputs = [ secretstorage ];
+
+  checkPhase = ''
+    py.test $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Store and access your passwords safely";
+    homepage    = "https://pypi.python.org/pypi/keyring";
+    license     = licenses.psfl;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 803e8fcfe32..5ab25a2cbb1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11190,32 +11190,7 @@ in {
     };
   };
 
-  keyring = buildPythonPackage rec {
-    name = "keyring-${version}";
-    version = "10.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keyring/${name}.tar.gz";
-      sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";
-    };
-
-    buildInputs = with self;
-      [ fs gdata python_keyczar mock pyasn1 pycrypto pytest_28 six setuptools_scm pytestrunner ];
-
-    propagatedBuildInputs = [ self.secretstorage ];
-
-    checkPhase = ''
-      py.test $out
-    '';
-
-    meta = {
-      description = "Store and access your passwords safely";
-      homepage    = "https://pypi.python.org/pypi/keyring";
-      license     = licenses.psfl;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-  };
+  keyring = callPackage ../development/python-modules/keyring { };
 
   klaus = buildPythonPackage rec {
     version = "0.9.1";
@@ -27487,7 +27462,7 @@ EOF
 
   preshed = callPackage ../development/python-modules/preshed { };
 
-  backports_weakref = callPackage ../development/python-modules/backports_weakref { }; 
+  backports_weakref = callPackage ../development/python-modules/backports_weakref { };
 
   thinc = callPackage ../development/python-modules/thinc { };
 
@@ -27496,7 +27471,7 @@ EOF
   behave = callPackage ../development/python-modules/behave { };
 
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
- 
+
   parse = callPackage ../development/python-modules/parse { };
 
   parse-type = callPackage ../development/python-modules/parse-type { };

From 382afe8c62221851486cbfb0f2f3e596a3883367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Sep 2017 10:02:59 +0100
Subject: [PATCH 16/88] mongodb248: remove

reason: build fails in hydra
Do still need this and want to maintain this @elitak?
---
 pkgs/servers/nosql/mongodb/2.4.8.nix | 45 ----------------------------
 pkgs/top-level/all-packages.nix      |  2 --
 2 files changed, 47 deletions(-)
 delete mode 100644 pkgs/servers/nosql/mongodb/2.4.8.nix

diff --git a/pkgs/servers/nosql/mongodb/2.4.8.nix b/pkgs/servers/nosql/mongodb/2.4.8.nix
deleted file mode 100644
index ccd64da3c6a..00000000000
--- a/pkgs/servers/nosql/mongodb/2.4.8.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-# This derivation was resurrected from 4c8ec5e12e187347fd97b1a1a9a43eb19e009ed0
-# by elitak for use with the Ubiquiti mFi Controller package, which breaks at
-# runtime on mongodb3+ and jre8+. We will need to pull in sufficiently old
-# versions of boost and v8 to build this, as well.
-{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre-cpp, snappy }:
-with stdenv.lib;
-let
-  version = "2.4.8";
-in
-stdenv.mkDerivation rec {
-  name = "mongodb-${version}";
-
-  src = fetchurl {
-    url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x";
-  };
-
-  nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre-cpp snappy ];
-
-  postPatch = ''
-    substituteInPlace SConstruct \
-        --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \
-        --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]'
-  '';
-
-  NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs";
-
-  buildPhase = ''
-    export SCONSFLAGS="-j$NIX_BUILD_CORES"
-    scons all --use-system-all
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    scons install --use-system-all --full --prefix=$out
-  '';
-
-  meta = {
-    description = "A scalable, high-performance, open source NoSQL database";
-    homepage = http://www.mongodb.org;
-    license = licenses.agpl3;
-    maintainers = with maintainers; [ bluescreen303 elitak ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4324e76b668..4087896d123 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11479,8 +11479,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
-
   percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
   percona-server = percona-server56;
 

From 41e7e1304ea61e9bd4948e3f4a299c85522a15b4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 7 Sep 2017 17:17:39 +0800
Subject: [PATCH 17/88] dict: enable the default upstream server so the client
 works out of the box

---
 pkgs/servers/dict/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index ee0477734c2..0e6c39ec924 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,22 +1,31 @@
 { stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
 
 stdenv.mkDerivation rec {
-  version = "1.12.1";
   name = "dictd-${version}";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
     sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2";
   };
 
-  buildInputs = [ flex bison which libmaa zlib libtool ];
+  buildInputs = [ libmaa zlib ];
+
+  nativeBuildInputs = [ bison flex libtool which ];
+
+  enableParallelBuilding = true;
 
   patchPhase = "patch -p0 < ${./buildfix.diff}";
-  configureFlags = "--datadir=/var/run/current-system/share/dictd";
+  configureFlags = [
+    "--enable-dictorg"
+    "--datadir=/run/current-system/share/dictd"
+  ];
 
   meta = with stdenv.lib; {
     description = "Dict protocol server and client";
-    maintainers = [ maintainers.mornfall ];
-    platforms = platforms.linux;
+    homepage    = http://www.dict.org;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ mornfall ];
+    platforms   = platforms.linux;
   };
 }

From 9ee572745994723447ceacffb87113753b616ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Sep 2017 10:20:22 +0100
Subject: [PATCH 18/88] v8: remove 3.14.5.10

was only used by mongodb248
---
 pkgs/development/libraries/v8/3.14.nix | 28 --------------------------
 pkgs/top-level/all-packages.nix        |  4 ----
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/libraries/v8/3.14.nix

diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
deleted file mode 100644
index fee0f868ea9..00000000000
--- a/pkgs/development/libraries/v8/3.14.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, callPackage, fetchFromGitHub, python, ... } @ args:
-with stdenv.lib;
-let
-  version = "3.14.5.10";
-  sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k";
-in
-(callPackage ./generic.nix (args // {
-  inherit version sha256;
-})).overrideDerivation (oldAttrs:{
-  patchPhase = [
-    oldAttrs.patchPhase
-    "sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8"
-  ];
-
-  # http://code.google.com/p/v8/issues/detail?id=2149
-  NIX_CFLAGS_COMPILE = concatStringsSep " " [
-    oldAttrs.NIX_CFLAGS_COMPILE
-    "-Wno-unused-local-typedefs"
-    "-Wno-aggressive-loop-optimizations"
-  ];
-
-  src = fetchFromGitHub {
-    owner = "v8";
-    repo = "v8";
-    rev = "${version}";
-    inherit sha256;
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4087896d123..c047f40fef0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10630,10 +10630,6 @@ with pkgs;
     gnutls = gnutls;
   });
 
-  v8_3_14 = callPackage ../development/libraries/v8/3.14.nix {
-    inherit (python2Packages) python gyp;
-  };
-
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (python2Packages) python gyp;
     cctools = darwin.cctools;

From 6f0b5380442cf49d40d1b45cc307dc2b9b390820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Sep 2017 10:24:03 +0100
Subject: [PATCH 19/88] nixos/mfi: remove

---
 nixos/modules/misc/ids.nix                |   2 -
 nixos/modules/services/networking/mfi.nix | 100 ----------------------
 2 files changed, 102 deletions(-)
 delete mode 100644 nixos/modules/services/networking/mfi.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 859838182ed..0f3b8bcab8b 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -254,7 +254,6 @@
       hydra-queue-runner = 235;
       hydra-www = 236;
       syncthing = 237;
-      mfi = 238;
       caddy = 239;
       taskd = 240;
       factorio = 241;
@@ -522,7 +521,6 @@
       octoprint = 230;
       radicale = 234;
       syncthing = 237;
-      #mfi = 238; # unused
       caddy = 239;
       taskd = 240;
       factorio = 241;
diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix
deleted file mode 100644
index 775564a2c44..00000000000
--- a/nixos/modules/services/networking/mfi.nix
+++ /dev/null
@@ -1,100 +0,0 @@
-{ config, lib, pkgs, utils, ... }:
-with lib;
-let
-  name = "Ubiquiti mFi Controller";
-  cfg = config.services.mfi;
-  stateDir = "/var/lib/mfi";
-  # XXX 2 runtime exceptions using jre8: JSPException on GET / ; can't initialize ./data/keystore on first run.
-  cmd = "@${pkgs.jre7}/bin/java java -jar ${stateDir}/lib/ace.jar";
-  mountPoints = [
-    { what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; }
-    { what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; }
-    { what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; }
-    { what = "${cfg.dataDir}"; where = "${stateDir}/data"; }
-  ];
-  systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints;
-  ports = [ 6080 6880 6443 6843 ];
-in
-{
-  options = {
-    services.mfi = {
-      enable = mkEnableOption name;
-      openPorts = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services.";
-      };
-      dataDir = mkOption {
-        type = types.str;
-        default = "${stateDir}/data";
-        description = ''
-          Where to store the database and other data.
-
-          This directory will be bind-mounted to ${stateDir}/data as part of the service startup.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-
-    networking.firewall.allowedTCPPorts = mkIf config.services.mfi.openPorts ports;
-
-    users.users.mfi = {
-      uid = config.ids.uids.mfi;
-      description = "mFi controller daemon user";
-      home = "${stateDir}";
-    };
-
-    # We must create the binary directories as bind mounts instead of symlinks
-    # This is because the controller resolves all symlinks to absolute paths
-    # to be used as the working directory.
-    systemd.mounts = map ({ what, where }: {
-        bindsTo = [ "mfi.service" ];
-        partOf = [ "mfi.service" ];
-        unitConfig.RequiresMountsFor = stateDir;
-        options = "bind";
-        what = what;
-        where = where;
-      }) mountPoints;
-
-    systemd.services.mfi = {
-      description = "mFi controller daemon";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ] ++ systemdMountPoints;
-      partOf = systemdMountPoints;
-      bindsTo = systemdMountPoints;
-      unitConfig.RequiresMountsFor = stateDir;
-
-      preStart = ''
-        # Clear ./webapps each run.
-        rm -rf                               "${stateDir}/webapps"
-        mkdir -p                             "${stateDir}/webapps"
-        ln -s "${pkgs.mfi}/webapps/ROOT.war" "${stateDir}/webapps"
-
-        # Copy initial config only once.
-        test -e "${stateDir}/conf" || cp -ar "${pkgs.mfi}/conf" "${stateDir}/conf"
-        test -e "${stateDir}/data" || cp -ar "${pkgs.mfi}/data" "${stateDir}/data"
-
-        # Fix Permissions.
-        # (Bind-mounts cause errors; ignore exit codes)
-        chown -fR mfi:      "${stateDir}" || true
-        chmod -fR u=rwX,go= "${stateDir}" || true
-      '';
-
-      postStop = ''
-        rm -rf "${stateDir}/webapps"
-      '';
-
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${cmd} start";
-        ExecStop = "${cmd} stop";
-        User = "mfi";
-        PermissionsStartOnly = true;
-        UMask = "0077";
-        WorkingDirectory = "${stateDir}";
-      };
-    };
-  };
-}

From 6b6ffd5b216553c03e6e650644e3cb2f8539b752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Sep 2017 10:24:24 +0100
Subject: [PATCH 20/88] mfi: remove

---
 pkgs/servers/mfi/default.nix    | 28 ----------------------------
 pkgs/top-level/all-packages.nix |  2 --
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/servers/mfi/default.nix

diff --git a/pkgs/servers/mfi/default.nix b/pkgs/servers/mfi/default.nix
deleted file mode 100644
index e431ca993a9..00000000000
--- a/pkgs/servers/mfi/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "mfi-controller-${version}";
-  version = "2.1.11";
-
-  src = fetchurl {
-    url = "https://dl.ubnt.com/mfi/${version}/mFi.unix.zip";
-    sha256 = "0b9q6025zf9zjzq8dcmcyai8rslx67g52j41gacxsk9i5dspmw90";
-  };
-
-  buildInputs = [ unzip ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -ar conf data dl lib webapps $out
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ubnt.com/;
-    description = "Controller for Ubiquiti mFi devices";
-    license = licenses.unfree;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ elitak ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c047f40fef0..85248611fc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11332,8 +11332,6 @@ with pkgs;
 
   meteor = callPackage ../servers/meteor/default.nix { };
 
-  mfi = callPackage ../servers/mfi { };
-
   minio = callPackage ../servers/minio { };
 
   # Backwards compatibility.

From 8343a6c7a534a7ac537cf35923ddd0a7e78936e2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 7 Sep 2017 11:37:09 +0200
Subject: [PATCH 21/88] lispPackages.clsql-sqlite3: init

---
 .../quicklisp-to-nix-output/clsql-sqlite3.nix | 31 +++++++++++++++++++
 .../lisp-modules/quicklisp-to-nix-systems.txt |  1 +
 .../lisp-modules/quicklisp-to-nix.nix         | 11 +++++++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
new file mode 100644
index 00000000000..653adb3d12b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clsql-sqlite3'';
+  version = ''clsql-20160208-git'';
+
+  description = ''Common Lisp Sqlite3 Driver'';
+
+  deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
+    sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
+  };
+
+  packageName = "clsql-sqlite3";
+
+  asdFilesToKeep = ["clsql-sqlite3.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM clsql-sqlite3 DESCRIPTION Common Lisp Sqlite3 Driver SHA256
+    0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
+    http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz
+    MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-sqlite3 FILENAME
+    clsql-sqlite3 DEPS
+    ((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi)
+     (NAME uffi FILENAME uffi))
+    DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20160208-git SIBLINGS
+    (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket
+     clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-tests
+     clsql-uffi clsql)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index fab5f2f5048..32ef6367e27 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -38,6 +38,7 @@ cl-smtp
 clsql
 clsql-postgresql
 clsql-postgresql-socket
+clsql-sqlite3
 clss
 cl+ssl
 cl-syntax-annot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 1047b60f1fc..22b58895747 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -1941,6 +1941,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clsql-sqlite3" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-sqlite3" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
   "clsql-postgresql-socket" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clsql-postgresql-socket" or (x: {}))

From 0bac95c9762effff7b6555187532dd42f915ef35 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 7 Sep 2017 17:50:26 +0800
Subject: [PATCH 22/88] rake: 11.1.0 -> 12.0.0

---
 pkgs/development/tools/build-managers/rake/Gemfile.lock | 4 ++--
 pkgs/development/tools/build-managers/rake/default.nix  | 2 +-
 pkgs/development/tools/build-managers/rake/gemset.nix   | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock
index cbea90ab1a9..c7f89c32c3f 100644
--- a/pkgs/development/tools/build-managers/rake/Gemfile.lock
+++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (11.1.1)
+    rake (12.0.0)
 
 PLATFORMS
   ruby
@@ -10,4 +10,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.10.5
+   1.14.6
diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix
index db7c987465a..f23edfd5f63 100644
--- a/pkgs/development/tools/build-managers/rake/default.nix
+++ b/pkgs/development/tools/build-managers/rake/default.nix
@@ -1,7 +1,7 @@
 { lib, bundlerEnv, ruby }:
 
 bundlerEnv {
-  name = "rake-11.1.1";
+  name = "rake-${(import ./gemset.nix).rake.version}";
 
   inherit ruby;
   gemdir = ./.;
diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/development/tools/build-managers/rake/gemset.nix
index efea7a79dbb..d5dc29e378a 100644
--- a/pkgs/development/tools/build-managers/rake/gemset.nix
+++ b/pkgs/development/tools/build-managers/rake/gemset.nix
@@ -1,9 +1,10 @@
 {
-  "rake" = {
-    version = "11.1.1";
+  rake = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
       type = "gem";
-      sha256 = "0h8wcic2xh3lv7yvs05pqnfqb80jyl488f7136lgxmajb0s1rqhg";
     };
+    version = "12.0.0";
   };
 }
\ No newline at end of file

From adb8a0a7e1506106d928abc4894ae21b192888c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 7 Sep 2017 12:17:36 +0200
Subject: [PATCH 23/88] Change owner of stdenv and lib

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

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 44d22fb5225..734f0d562d0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,14 +8,11 @@
 # Mentioned users will get code review requests.
 
 # Boostraping and core infra
-pkgs/stdenv/    @Ericson2314
-pkgs/build-support/cc-wrapper/  @Ericson2314
+pkgs/stdenv/    @edolstra
+pkgs/build-support/cc-wrapper/  @edolstra
 
 # Libraries
-lib/  @Profpatsch
-
-# Build-Support
-pkgs/build-support  @Profpatsch
+lib/  @edolstra
 
 # Python-related code and docs
 pkgs/top-level/python-packages.nix      @FRidh

From 24646266bb2b7d513a1d94178e0761a1712b73dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 7 Sep 2017 12:19:54 +0200
Subject: [PATCH 24/88] Set ownership of CODEOWNERS

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

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 734f0d562d0..0f73a5c6536 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,6 +7,9 @@
 # For documentation on this file, see https://help.github.com/articles/about-codeowners/
 # Mentioned users will get code review requests.
 
+# This file
+.github/CODEOWNERS @edolstra
+
 # Boostraping and core infra
 pkgs/stdenv/    @edolstra
 pkgs/build-support/cc-wrapper/  @edolstra

From a26ae760e2ebacc5780ebb2906a4c3cc467747c2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 15:04:47 +0200
Subject: [PATCH 25/88] python.pkgs.setuptools: upgrade to 36.4.0

---
 .../development/python-modules/bootstrapped-pip/default.nix | 6 +++---
 pkgs/development/python-modules/setuptools/default.nix      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 3e07806986b..26db071cad5 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -9,16 +9,16 @@ let
   };
   setuptools_source = fetchPypi {
     pname = "setuptools";
-    version = "36.0.1";
+    version = "36.4.0";
     format = "wheel";
-    sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
+    sha256 = "4d54c0bfee283e78609169213f9c075827d5837086f58b588b417b093c23464b";
   };
 
   # TODO: Shouldn't be necessary anymore for pip > 9.0.1!
   # https://github.com/NixOS/nixpkgs/issues/26392
   # https://github.com/pypa/setuptools/issues/885
   pkg_resources = fetchurl {
-    url = https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py;
+    url = "https://raw.githubusercontent.com/pypa/setuptools/v36.4.0/pkg_resources/__init__.py";
     sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv";
   };
 
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index b6bf629e746..1c6fb414a73 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "36.2.7";
+  version = "36.4.0";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5";
+    sha256 = "2758b0270fe8ceec42f336ee5b411e60dc8579febc27bb3ba9b794dc7f0239ae";
   };
 
   buildInputs = [ python wrapPython unzip ];

From 1704eeb9306e33b57d85c4e554a612a6191c7f28 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 24 Aug 2017 18:28:34 +0300
Subject: [PATCH 26/88] gcc7: 7.1.0 -> 7.2.0

---
 pkgs/development/compilers/gcc/7/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 87d5c751e85..6dcd36eb3ea 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -59,7 +59,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "7.1.0";
+let version = "7.2.0";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
@@ -213,8 +213,8 @@ stdenv.mkDerivation ({
   builder = ../builder.sh;
 
   src = fetchurl {
-    url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca";
+    url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
+    sha256 = "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw";
   };
 
   inherit patches;

From 88641353d6a6c9233241c10e2c1739285a1f3baa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Sep 2017 14:55:57 +0300
Subject: [PATCH 27/88] caffe: 2015-07-02 -> 1.0-rc5

---
 .../science/math/caffe/default.nix            | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index fc7d9611529..9773c30d6d8 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -4,7 +4,7 @@
 , cudaSupport ? true
 , cudnnSupport ? false
 , cudnn ? null
-, cudatoolkit7
+, cudatoolkit
 , fetchFromGitHub
 , google-gflags
 , glog
@@ -19,29 +19,31 @@
 
 let optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
-  # Use git revision because latest "release" is really old
-  name = "caffe-git-2015-07-02";
+  name = "caffe-${version}";
+  version = "1.0-rc5";
 
   src = fetchFromGitHub {
     owner = "BVLC";
     repo = "caffe";
-    rev = "77d66dfc907dd875d69bb9fc12dd950b531e464f";
-    sha256 = "0vd4qrc49dhsawj298xpkd5mvi35sh56kdswx3yp8ya4fjajwakx";
+    rev = "rc5";
+    sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c";
   };
 
   preConfigure = "mv Makefile.config.example Makefile.config";
 
-  makeFlags = "BLAS=open " +
-              (if !cudaSupport then "CPU_ONLY=1 " else "CUDA_DIR=${cudatoolkit7} ") +
-              (if cudnnSupport then "USE_CUDNN=1 " else "");
+  makeFlags = [ "BLAS=open"
+                (if !cudaSupport then "CPU_ONLY=1" else "CUDA_DIR=${cudatoolkit}") ]
+              ++ optional cudnnSupport "USE_CUDNN=1";
 
   # too many issues with tests to run them for now
   doCheck = false;
-  checkPhase = "make runtest ${makeFlags}";
+  checkTarget = "runtest";
+
+  enableParallelBuilding = true;
 
   buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv
                   protobuf snappy ]
-                ++ optional cudaSupport cudatoolkit7
+                ++ optional cudaSupport cudatoolkit
                 ++ optional cudnnSupport cudnn;
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4324e76b668..e4d2adb19c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18456,8 +18456,10 @@ with pkgs;
 
   ### SCIENCE / MATH
 
-  caffe = callPackage ../applications/science/math/caffe {
+  caffe = callPackage ../applications/science/math/caffe rec {
     cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true;
+    # CUDA 8 doesn't support GCC 6.
+    stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv;
   };
 
   ecm = callPackage ../applications/science/math/ecm { };

From e5059a8739ee93ee7c7cf12ed605443615f7496d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Sep 2017 14:56:21 +0300
Subject: [PATCH 28/88] bazel: 0.4.5 -> 0.5.4

---
 .../tools/build-managers/bazel/default.nix    | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 989d8bc7003..f30aed29ba1 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }:
+{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python }:
 
 stdenv.mkDerivation rec {
 
-  version = "0.4.5";
+  version = "0.5.4";
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/bazelbuild/bazel/;
+    homepage = "https://github.com/bazelbuild/bazel/";
     description = "Build tool that builds code quickly and reliably";
     license = licenses.asl20;
     maintainers = [ maintainers.philandstuff ];
@@ -16,40 +16,38 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb";
+    sha256 = "1jdb8zbgafhz2qi0ajk34845kpmfhxchdimvwkq6lkb1159v0mr1";
   };
 
   sourceRoot = ".";
 
+  # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
+
+  customBash = writeScriptBin "bash" ''
+    #!${stdenv.shell}
+    PATH="$PATH:${lib.makeBinPath [ coreutils ]}" exec ${bash}/bin/bash "$@"
+  '';
+
   postPatch = ''
-    for f in $(grep -l -r '#!/bin/bash'); do
-      substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash'
-    done
-    for f in \
-      src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \
-      src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \
-      src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \
-      src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \
-      ; do
-      substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash
+    find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
+      substituteInPlace "$path" \
+        --replace /bin/bash ${customBash}/bin/bash \
+        --replace /usr/bin/env ${coreutils}/bin/env
     done
+    patchShebangs .
   '';
 
   buildInputs = [
-    stdenv.cc
-    stdenv.cc.cc.lib
     jdk
+  ];
+
+  nativeBuildInputs = [
     zip
+    python
     unzip
     makeWrapper
     which
-  ];
-
-  # These must be propagated since the dependency is hidden in a compressed
-  # archive.
-
-  propagatedBuildInputs = [
-    bash
+    customBash
   ];
 
   # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
@@ -80,7 +78,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     mv output/bazel $out/bin
-    wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin"
+    wrapProgram "$out/bin/bazel" --prefix PATH : "${lib.makeBinPath [ stdenv.cc jdk ]}"
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
     mv output/bazel-complete.bash $out/share/bash-completion/completions/
     cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/

From eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Sep 2017 15:22:13 +0300
Subject: [PATCH 29/88] dlib: 19.4 -> 19.6

---
 pkgs/development/libraries/dlib/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index fe4e7907c9f..61932b29e62 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }:
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, openblas, libpng, libjpeg
+, guiSupport ? false, libX11
+}:
 
 stdenv.mkDerivation rec {
-  version = "19.4";
+  version = "19.6";
   name = "dlib-${version}";
 
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
     rev ="v${version}";
-    sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4";
+    sha256 = "1nlx4z53jnk7wysaxrzbyyqb65m45rw4g1fagazl2jvwh1qn49ds";
   };
 
+  postPatch = ''
+    rm -rf dlib/external
+  '';
+
   enableParallelBuilding = true;
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ openblas libpng libjpeg ] ++ lib.optional guiSupport libX11;
 
   meta = with stdenv.lib; {
     description = "A general purpose cross-platform C++ machine learning library";

From c4bed3043d9b0eb084ae5c4e96aa0f1e7da23d78 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Sep 2017 16:15:39 +0300
Subject: [PATCH 30/88] caffe: add Python support

Move to CMake in the process.
---
 .../science/math/caffe/default.nix            | 68 ++++++++++---------
 pkgs/top-level/python-packages.nix            |  7 ++
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 9773c30d6d8..5c6fe9c573d 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -1,24 +1,26 @@
-{ stdenv
-, openblas
-, boost
-, cudaSupport ? true
-, cudnnSupport ? false
-, cudnn ? null
-, cudatoolkit
+{ stdenv, lib
 , fetchFromGitHub
+, cmake
+, boost
 , google-gflags
 , glog
-, hdf5
+, hdf5-cpp
 , leveldb
 , lmdb
 , opencv
 , protobuf
 , snappy
+, atlas
+, doxygen
+, cudaSupport ? true, cudatoolkit
+, cudnnSupport ? false, cudnn ? null
+, pythonSupport ? false, python ? null, numpy ? null
 }:
 
+assert cudnnSupport -> cudaSupport;
+assert pythonSupport -> (python != null && numpy != null);
 
-let optional = stdenv.lib.optional;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "caffe-${version}";
   version = "1.0-rc5";
 
@@ -29,32 +31,34 @@ in stdenv.mkDerivation rec {
     sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c";
   };
 
-  preConfigure = "mv Makefile.config.example Makefile.config";
-
-  makeFlags = [ "BLAS=open"
-                (if !cudaSupport then "CPU_ONLY=1" else "CUDA_DIR=${cudatoolkit}") ]
-              ++ optional cudnnSupport "USE_CUDNN=1";
-
-  # too many issues with tests to run them for now
-  doCheck = false;
-  checkTarget = "runtest";
-
   enableParallelBuilding = true;
 
-  buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv
-                  protobuf snappy ]
-                ++ optional cudaSupport cudatoolkit
-                ++ optional cudnnSupport cudnn;
+  nativeBuildInputs = [ cmake doxygen ];
 
-  installPhase = ''
-    mkdir -p $out/{bin,share,lib}
-    for bin in $(find build/tools -executable -type f -name '*.bin');
-    do
-      cp $bin $out/bin/$(basename $bin .bin)
-    done
+  cmakeFlags = [ "-DCUDA_ARCH_NAME=All" ]
+               ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"
+               ++ lib.optional (!pythonSupport) "-DBUILD_python=OFF";
 
-    cp -r build/examples $out/share
-    cp -r build/lib $out
+  buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ]
+                ++ lib.optional cudaSupport cudatoolkit
+                ++ lib.optional cudnnSupport cudnn
+                ++ lib.optionals pythonSupport [ python numpy ];
+
+  propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf;
+
+  outputs = [ "out" "bin" ];
+  # Don't propagate bin.
+  outputBin = "out";
+
+  postInstall = ''
+    # Internal static library.
+    rm $out/lib/libproto.a
+
+    moveToOutput "bin" "$bin"
+  '' + lib.optionalString pythonSupport ''
+    mkdir -p $out/${python.sitePackages}
+    mv $out/python/caffe $out/${python.sitePackages}
+    rm -rf $out/python
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ab25a2cbb1..f0a1ed21d3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1565,6 +1565,13 @@ in {
     };
   };
 
+  caffe = pkgs.caffe.override {
+    python = self.python;
+    boost = self.boost;
+    numpy = self.numpy;
+    pythonSupport = true;
+  };
+
   capstone = buildPythonPackage rec {
     name = "capstone-3.0.4";
     src = pkgs.fetchurl {

From 4999aeb7b767ef5e6f259ba52b6d2c2743cf9ddc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Sep 2017 17:20:31 +0300
Subject: [PATCH 31/88] python.pkgs.protobuf: fix build

---
 pkgs/development/python-modules/protobuf.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix
index 44b9ed70a18..4a67a3132ed 100644
--- a/pkgs/development/python-modules/protobuf.nix
+++ b/pkgs/development/python-modules/protobuf.nix
@@ -8,8 +8,10 @@ buildPythonPackage rec {
   inherit (protobuf) name src;
   inherit disabled doCheck;
 
-  # work around python distutils compiling C++ with $CC
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE =
+    # work around python distutils compiling C++ with $CC
+    optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
+    ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98";
 
   propagatedBuildInputs = [ protobuf google_apputils ];
   buildInputs = [ google_apputils pyext ];

From 5a2bb4c9925a715e79cd473ca8e0b77039641df1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Sep 2017 17:42:36 +0300
Subject: [PATCH 32/88] python.pkgs.dlib: init at 19.6

---
 pkgs/top-level/python-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0a1ed21d3c..0068e345464 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1753,6 +1753,12 @@ in {
 
   cycler = callPackage ../development/python-modules/cycler { };
 
+  dlib = buildPythonPackage rec {
+    inherit (pkgs.dlib) name src nativeBuildInputs meta;
+
+    buildInputs = pkgs.dlib.buildInputs ++ [ self.boost ];
+  };
+
   datadog = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "datadog";

From f1f944f23b88b715f8e95844bea8451fcea83776 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Sep 2017 17:47:53 +0300
Subject: [PATCH 33/88] caffe: don't use CUDA by default

CUDA currently requires old GCC. Also, this way Caffe is usable without proprietary blobs.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4d2adb19c7..72b0d08b767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18457,7 +18457,7 @@ with pkgs;
   ### SCIENCE / MATH
 
   caffe = callPackage ../applications/science/math/caffe rec {
-    cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true;
+    cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false;
     # CUDA 8 doesn't support GCC 6.
     stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv;
   };

From c3b9eca87621f9102eba844c2f89ff4c34944202 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 5 Sep 2017 18:12:27 +0300
Subject: [PATCH 34/88] python.pkgs.backports_weakref: init at 1.0rc1

---
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0068e345464..50f7311e7cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1222,6 +1222,28 @@ in {
 
   backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {};
 
+  backports_weakref = buildPythonPackage rec {
+    name = "backports.weakref-${version}";
+    version = "1.0rc1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/b/backports.weakref/${name}.tar.gz";
+      sha256 = "14i8m3lspykdfpzf50grij3z286j9q8f32f2bnwdicv659qvy4w8";
+    };
+
+    buildInputs = with self; [ setuptools_scm ];
+
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
+    meta = {
+      homepage = "https://github.com/pjdelport/backports.weakref";
+      license = licenses.psfl;
+      description = "Backport of new features in Python's weakref module";
+    };
+  };
+
   babelfish = buildPythonPackage rec {
     version = "0.5.5";
     name = "babelfish-${version}";

From db5a5ccf2b32c98489bce935f05ebb7092bf40ae Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 5 Sep 2017 19:34:24 +0300
Subject: [PATCH 35/88] python.pkgs.TheanoWithoutCuda: don't propagate stdenv

Fixes errors during buildEnv.
---
 .../python-modules/Theano/theano-without-cuda/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
index 90255407002..e93af743619 100644
--- a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
+++ b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   # the fix for which hasn't been merged yet.
 
   # keep Nose around since running the tests by hand is possible from Python or bash
-  propagatedBuildInputs = [ stdenv nose numpy numpy.blas pydot_ng scipy six ];
+  propagatedBuildInputs = [ nose numpy numpy.blas pydot_ng scipy six ];
 
   meta = {
     homepage = http://deeplearning.net/software/theano/;

From 2df59769ab1e6585fd61a98534194d95d8e5c213 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Sep 2017 17:11:14 +0300
Subject: [PATCH 36/88] Revert "python.pkgs.backports_weakref: init at 1.0rc1"

This reverts commit c3b9eca87621f9102eba844c2f89ff4c34944202.

It's already in the tree on master. For some reason nox-review hasn't caught that.
---
 pkgs/top-level/python-packages.nix | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50f7311e7cc..0068e345464 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1222,28 +1222,6 @@ in {
 
   backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {};
 
-  backports_weakref = buildPythonPackage rec {
-    name = "backports.weakref-${version}";
-    version = "1.0rc1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/backports.weakref/${name}.tar.gz";
-      sha256 = "14i8m3lspykdfpzf50grij3z286j9q8f32f2bnwdicv659qvy4w8";
-    };
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
-
-    meta = {
-      homepage = "https://github.com/pjdelport/backports.weakref";
-      license = licenses.psfl;
-      description = "Backport of new features in Python's weakref module";
-    };
-  };
-
   babelfish = buildPythonPackage rec {
     version = "0.5.5";
     name = "babelfish-${version}";

From a1912c9eb42c21966bb4653278b8c88e8d16f34e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 7 Sep 2017 10:27:39 -0400
Subject: [PATCH 37/88] linux: 4.12.10 -> 4.12.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix
index ca9ed265799..4bcbca4dacc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12.10";
+  version = "4.12.11";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1156ly1lmsr3l8ad8z80agsl026yk86nyypw67ksc66mznvzgyy0";
+    sha256 = "015kyh0v9lkk4a6sa7ysddi7dm639z5p45v2sh2kswsih4sf7kxf";
   };
 
   kernelPatches = args.kernelPatches;

From dc8b228a89d62ba5754b35b816d376d3e4c0b3d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 7 Sep 2017 10:31:02 -0400
Subject: [PATCH 38/88] linux: 4.9.47 -> 4.9.48

---
 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 faa61372fef..81f4f2a9577 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.47";
+  version = "4.9.48";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1ja14l9gy7cpj94zwacr3gi4vqzfv2k78556fxga8q4lsrwrdgkm";
+    sha256 = "0y3s5xbh5axdvsx9iwz7sinbm7v6j2dvmj8dz46zj1mziwicagwq";
   };
 
   kernelPatches = args.kernelPatches;

From e1c5e81b9074d76f85bb9111f792cb95da82dbdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Sep 2017 19:52:22 +0200
Subject: [PATCH 39/88] haskell-aeson-compat: use latest version when building
 with ghc 8.2.x

Also, disable test suite to avoid depending on QuickCheck 2.10.*.
---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index fc0c34f0397..ddc32b74ec6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -67,5 +67,6 @@ self: super: {
   path = dontCheck super.path;
   path-io = super.path-io_1_3_3;
   trifecta = super.trifecta_1_7_1_1;
+  aeson-compat = dontCheck super.aeson-compat_0_3_7_1;  # test suite needs QuickCheck 2.10.*
 
 }

From e8826a9ac4856bc4f29fa4b535749d2797ad2d69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 09:54:18 +0200
Subject: [PATCH 40/88] haskell-aws: jailbreak when building with ghc-8.2.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index ddc32b74ec6..a3337bbb351 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -63,6 +63,9 @@ self: super: {
   protolude = doJailbreak super.protolude;
   quickcheck-instances = doJailbreak super.quickcheck-instances;
 
+  # https://github.com/aristidb/aws/issues/238
+  aws = doJailbreak super.aws;
+
   # LTS-9 versions do not compile.
   path = dontCheck super.path;
   path-io = super.path-io_1_3_3;

From 8809e87684bf6ad2014a42b43b91f7008001aded Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 10:26:31 +0200
Subject: [PATCH 41/88] haskell-pandoc: compile ghc-8.2.x version with Cabal
 1.x to avoid errors in Setup.hs

---
 .../haskell-modules/configuration-ghc-8.2.x.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index a3337bbb351..8b261112ad0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -36,6 +36,11 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # Make sure we can still build Cabal 1.x.
+  Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
+    prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
+  });
+
   # cabal-install can use the native Cabal library.
   cabal-install = super.cabal-install.override { Cabal = null; };
 
@@ -66,6 +71,18 @@ self: super: {
   # https://github.com/aristidb/aws/issues/238
   aws = doJailbreak super.aws;
 
+  # https://github.com/jgm/pandoc/issues/3876
+  pandoc = let fixSetup = pkgs.fetchpatch {
+                            url = "https://github.com/jgm/pandoc/pull/3899.patch";
+                            sha256 = "0lk9vs2l1wc1kr0y8fkdcarfi4sjd3dl81r52n39r25xx9kqawv7";
+                          };
+           in overrideCabal super.pandoc (drv: {
+                editedCabalFile = null;
+                patches = drv.patches or [] ++ [fixSetup];
+                setupHaskellDepends = drv.setupHaskellDepends or [self.Cabal_1_24_2_0];
+                preCompileBuildDriver = "setupCompileFlags+=' -package=Cabal-1.24.2.0'";
+              });
+
   # LTS-9 versions do not compile.
   path = dontCheck super.path;
   path-io = super.path-io_1_3_3;

From 072a0d887280ae1a5e7a754c5329024798948fcf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 10:47:47 +0200
Subject: [PATCH 42/88] haskell-happy: fix build with ghc-7.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 3914e3d9b93..b4e975187cc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -162,4 +162,7 @@ self: super: {
   comonad = dontCheck super.comonad;
   semigroupoids = dontCheck super.semigroupoids;
 
+  # https://github.com/simonmar/happy/issues/103
+  happy = super.happy.override { mtl = self.mtl_2_2_1; };
+
 }

From d382d2b91f6744735e8cbb2bacb130916477bcfa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Sep 2017 19:58:07 +0200
Subject: [PATCH 43/88] hackage2nix: disable broken builds

---
 .../configuration-hackage2nix.yaml            | 55 +++++++++++++++++--
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 28e7532f1c4..1de914cd033 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2807,9 +2807,12 @@ dont-distribute-packages:
   Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agda-executable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   agda-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  agda-snippets-hakyll:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  agda-snippets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   agentx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   AGI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AhoCorasick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aivika-distributed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2944,10 +2947,11 @@ dont-distribute-packages:
   attic-schedule:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-data:                              [ "x86_64-darwin" ]
+  attoparsec-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text-enumerator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-time:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-trans:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   attosplit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Attrac:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3646,11 +3650,18 @@ dont-distribute-packages:
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptoconditions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-catalog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression-dynamic:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression-opcodes:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-sampler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-FiringRules:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4119,6 +4130,7 @@ dont-distribute-packages:
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ex-pool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4204,6 +4216,7 @@ dont-distribute-packages:
   filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-trees:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fillit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   filtrable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4251,6 +4264,7 @@ dont-distribute-packages:
   FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foldl-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4312,6 +4326,7 @@ dont-distribute-packages:
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsh-csv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fsnotify-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4370,6 +4385,7 @@ dont-distribute-packages:
   generators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-binary:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-church:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-maybe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-pretty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4424,6 +4440,7 @@ dont-distribute-packages:
   ghc-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-proofs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4433,6 +4450,7 @@ dont-distribute-packages:
   giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-cairo:                                     [ "x86_64-darwin" ]
   Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gdkx11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gdk:                                       [ "x86_64-darwin" ]
   gi-ggit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstpbutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4544,6 +4562,7 @@ dont-distribute-packages:
   gpx-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPX:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   graceful:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grakn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4977,6 +4996,7 @@ dont-distribute-packages:
   hexml-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5056,6 +5076,7 @@ dont-distribute-packages:
   hipbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipchat-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HipmunkPlayground:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hipmunk-Utils:                                [ "x86_64-darwin" ]
   Hipmunk:                                      [ "x86_64-darwin" ]
@@ -5084,6 +5105,7 @@ dont-distribute-packages:
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-iadd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5100,7 +5122,7 @@ dont-distribute-packages:
   hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-morpheus:                             [ "x86_64-darwin" ]
+  hmatrix-morpheus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nlopt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5120,6 +5142,7 @@ dont-distribute-packages:
   Hmpf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmumps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnetcdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hnix:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HNM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnormalise:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoauth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5137,11 +5160,11 @@ dont-distribute-packages:
   hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hold-em:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Distribution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-MapReduce:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Searchengine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Storage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hol:                                          [ "x86_64-darwin" ]
   homeomorphic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hommage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   homplexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5420,7 +5443,7 @@ dont-distribute-packages:
   hwsl2-bytevector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-xml:                                       [ "x86_64-darwin" ]
+  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   H:                                            [ "x86_64-darwin" ]
   hXmixer:                                      [ "x86_64-darwin" ]
   hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5600,6 +5623,7 @@ dont-distribute-packages:
   iyql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   j2hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jack-bindings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jackminimix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   JackMiniMix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jack:                                         [ "x86_64-darwin" ]
@@ -5620,6 +5644,7 @@ dont-distribute-packages:
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Jdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jenkinsPlugins2nix:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   join:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5792,6 +5817,8 @@ dont-distribute-packages:
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-puppet:                              [ "x86_64-darwin" ]
   language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-python:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-python-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-qux:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5927,6 +5954,7 @@ dont-distribute-packages:
   list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ll-picosat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6119,6 +6147,7 @@ dont-distribute-packages:
   memo-ptr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   merge-bash-history:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  merkle-patricia-db:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   messente:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metadata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MetaHDBC:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6141,8 +6170,12 @@ dont-distribute-packages:
   MicrosoftTranslator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mida:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   midair:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-alsa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mighttpd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6245,6 +6278,7 @@ dont-distribute-packages:
   morph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mosaico-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mount:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  movie-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp3decoder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpdmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6731,6 +6765,7 @@ dont-distribute-packages:
   plot-gtk3:                                    [ "x86_64-darwin" ]
   Plot-ho-matic:                                [ "x86_64-darwin" ]
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot-light:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6785,6 +6820,7 @@ dont-distribute-packages:
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed-lifted:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark-streams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6996,6 +7032,7 @@ dont-distribute-packages:
   react-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-gi-gtk:                       [ "x86_64-darwin" ]
   reactive-banana-sdl2:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7004,7 +7041,9 @@ dont-distribute-packages:
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-jack:                                [ "x86_64-darwin" ]
+  reactive-midyim:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7105,6 +7144,7 @@ dont-distribute-packages:
   representable-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-tries:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reprinter:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7607,6 +7647,7 @@ dont-distribute-packages:
   sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlvalue-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqsd-local:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  squeal-postgresql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscan:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7618,6 +7659,7 @@ dont-distribute-packages:
   stable-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack2nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage2nix:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-build-plan:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7710,6 +7752,7 @@ dont-distribute-packages:
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swagger-test:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   swf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7738,9 +7781,11 @@ dont-distribute-packages:
   syntax-printer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees-fork-bairyn:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer-alsa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sysinfo:                                      [ "x86_64-darwin" ]
   Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8241,6 +8286,7 @@ dont-distribute-packages:
   wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-secure-cookies:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-mysql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-postgresql:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8364,6 +8410,7 @@ dont-distribute-packages:
   x509-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xbattbar:                                     [ "x86_64-darwin" ]
+  xcffib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xdot:                                         [ "x86_64-darwin" ]

From d2c9a8c6a4427b063c2adb706363fd50b2e1e959 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 14:09:11 +0200
Subject: [PATCH 44/88] hackage2nix: keep old happy 1.19.5 around for Agda

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1de914cd033..7761ad4b5ec 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2535,6 +2535,7 @@ extra-packages:
   - haddock-api == 2.15.*               # required on GHC 7.8.x
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
+  - happy <1.19.6                       # newer versions break Agda
   - haskell-src-exts == 1.18.*          # required by hoogle-5.0.4
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms

From 7af6cb984e10e819224d4c92721bda386415bc99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Sep 2017 19:48:07 +0200
Subject: [PATCH 45/88] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/119ce17843a35f569d15460b00734c62af05167a.
---
 .../haskell-modules/hackage-packages.nix      | 530 +++++++++++++++---
 1 file changed, 444 insertions(+), 86 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ba9864d2605..e119bba3938 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9493,8 +9493,8 @@ self: {
     ({ mkDerivation, base, Hipmunk, linear, StateVar }:
      mkDerivation {
        pname = "Hipmunk-Utils";
-       version = "0.1.0.0";
-       sha256 = "0bybsm350fkqiwsmyd0x4ck4jrnzs1i0cdvww70dcbd2m4r099mm";
+       version = "0.1.1.1";
+       sha256 = "1nql9101c1philljk20idllpxgq79hlihkk3kyl57bk4cb4iyr2h";
        libraryHaskellDepends = [ base Hipmunk linear StateVar ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme";
@@ -22008,6 +22008,7 @@ self: {
        homepage = "http://github.com/liamoc/agda-snippets#readme";
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agda-snippets-hakyll" = callPackage
@@ -22025,6 +22026,7 @@ self: {
        homepage = "https://github.com/liamoc/agda-snippets#readme";
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agentx" = callPackage
@@ -22111,6 +22113,7 @@ self: {
        homepage = "https://github.com/qfpl/aip";
        description = "Aeronautical Information Package (AIP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "air" = callPackage
@@ -25463,12 +25466,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ansi-terminal_0_7" = callPackage
+  "ansi-terminal_0_7_1_1" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.7";
-       sha256 = "1p66w12i2nr653ixdxly98q4g895a4nav8afmgq6yifm96shf89f";
+       version = "0.7.1.1";
+       sha256 = "1z2lllm5f2wy3a1j1198mpwq9cb6qclrxr2gpdzjyxzzvybpdj3g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -28615,7 +28618,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/attoparsec-data";
        description = "Parsers for the standard Haskell data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-enumerator" = callPackage
@@ -28732,6 +28735,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/attoparsec-time";
        description = "Attoparsec parsers of time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-time_1" = callPackage
@@ -41579,7 +41583,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "chart-unit_0_5_1" = callPackage
+  "chart-unit_0_5_2" = callPackage
     ({ mkDerivation, base, colour, containers, data-default
      , diagrams-lib, diagrams-rasterific, diagrams-svg, foldl
      , formatting, lens, linear, mwc-probability, mwc-random, numhask
@@ -41588,8 +41592,8 @@ self: {
      }:
      mkDerivation {
        pname = "chart-unit";
-       version = "0.5.1";
-       sha256 = "1hwbhzs22glikckwbbj9y5hn2vdsz3178gdw7hjrb32aa5kxj45j";
+       version = "0.5.2";
+       sha256 = "1fslw870412dpc333hhxqhly7lz5gr8m2x7bvndfj4a98mmsv056";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41598,8 +41602,8 @@ self: {
        ];
        executableHaskellDepends = [
          base containers diagrams-lib diagrams-rasterific diagrams-svg foldl
-         lens mwc-probability mwc-random numhask primitive protolude tdigest
-         text
+         formatting lens mwc-probability mwc-random numhask primitive
+         protolude tdigest text
        ];
        testHaskellDepends = [ base numhask tasty tasty-hspec text ];
        homepage = "https://github.com/tonyday567/chart-unit";
@@ -47006,6 +47010,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit_1_2_12" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
+     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
+     , mwc-random, primitive, QuickCheck, resourcet, safe, split
+     , transformers, transformers-base, transformers-compat, vector
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.2.12";
+       sha256 = "05k6kn83mw72xfqhrlsapnbsscyw1dqf1g335mxfifs2a32s1ad4";
+       libraryHaskellDepends = [
+         base exceptions lifted-base mmorph monad-control mtl primitive
+         resourcet transformers transformers-base transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck resourcet safe
+         split transformers
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-algorithms" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, containers, deepseq
@@ -50674,6 +50706,7 @@ self: {
        homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash";
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -51221,6 +51254,7 @@ self: {
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression" = callPackage
@@ -51241,6 +51275,7 @@ self: {
        homepage = "https://github.com/anton-k/csound-expression";
        description = "library to make electronic music";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression-dynamic" = callPackage
@@ -51258,6 +51293,7 @@ self: {
        homepage = "https://github.com/anton-k/csound-expression-dynamic";
        description = "dynamic core for csound-expression library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression-opcodes" = callPackage
@@ -51273,6 +51309,7 @@ self: {
        ];
        description = "opcodes for the library csound-expression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression-typed" = callPackage
@@ -51294,6 +51331,7 @@ self: {
        homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-sampler" = callPackage
@@ -51306,6 +51344,7 @@ self: {
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csp" = callPackage
@@ -59066,8 +59105,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-monad-control";
-       version = "0.5.1.2";
-       sha256 = "1iz030x11qxbc6hnk77c6sfjx7i51d90ix6mgic4v3m7jfkzckr8";
+       version = "0.5.1.3";
+       sha256 = "16zlwlk52rc8q4bfxk9ah5ikyw2gh0bwws9lhvp5zkzlmhfmdzx1";
        libraryHaskellDepends = [
          base distributed-process monad-control transformers
          transformers-base
@@ -66806,6 +66845,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "expressions" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, lattices, QuickCheck
+     , singletons, tasty, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "expressions";
+       version = "0.1.1";
+       sha256 = "0vbykw97f1zb4nlj1ibamyk4bi0467ldlxwlknhr5b940dfs3rmy";
+       libraryHaskellDepends = [
+         attoparsec base containers lattices singletons text transformers
+       ];
+       testHaskellDepends = [
+         base QuickCheck singletons tasty tasty-quickcheck text
+       ];
+       description = "Expressions and Formulas a la carte";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extcore" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, mtl, parsec, pretty, syb
@@ -69208,6 +69266,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fillit" = callPackage
+    ({ mkDerivation, base, data-default, doctest, hspec, parsec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "fillit";
+       version = "0.1.0.0";
+       sha256 = "0qk1i2mjvsq3qqsh2zw9n83l210m0f17q9mqwnbmzhw0yf1mgswc";
+       libraryHaskellDepends = [
+         base data-default parsec text unordered-containers
+       ];
+       testHaskellDepends = [ base doctest hspec unordered-containers ];
+       homepage = "https://github.com/ishiy1993/fillit#readme";
+       description = "Flexible string substitution";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "filter-logger" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , bytestring, data-default, fast-logger, http-types, HUnit, scotty
@@ -70905,6 +70981,7 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -72685,6 +72762,7 @@ self: {
        homepage = "https://github.com/fpco/fsnotify-conduit#readme";
        description = "Get filesystem notifications as a stream of events";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fst" = callPackage
@@ -74252,21 +74330,22 @@ self: {
      }) {};
 
   "generic-lens" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, hspec, lens, profunctors
-     , QuickCheck
+    ({ mkDerivation, base, criterion, deepseq, ghc-proofs, lens
+     , profunctors, QuickCheck
      }:
      mkDerivation {
        pname = "generic-lens";
-       version = "0.4.0.0";
-       sha256 = "0gqw9wdz2kf0jsx42l49f16xkb6yh741sv3kzss4d5laznmyh2v2";
+       version = "0.4.0.1";
+       sha256 = "1imldy8sf7cfzyhxfijh70pclrvdxxr0i4j5gygvi7n5khkh1ask";
        libraryHaskellDepends = [ base profunctors ];
-       testHaskellDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base ghc-proofs ];
        benchmarkHaskellDepends = [
          base criterion deepseq lens QuickCheck
        ];
        homepage = "https://github.com/kcsongor/generic-lens";
        description = "Generic data-structure operations exposed as lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-lucid-scaffold" = callPackage
@@ -75943,6 +76022,7 @@ self: {
        homepage = "https://github.com/nomeata/ghc-proofs";
        description = "GHC plugin to prove program equations by simplification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-server" = callPackage
@@ -76743,6 +76823,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk-x11 = null;};
 
   "gi-ggit" = callPackage
@@ -77454,7 +77535,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "ginger_0_6_0_2" = callPackage
+  "ginger_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
@@ -77462,8 +77543,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.6.0.2";
-       sha256 = "0h6db6pm7i19rgn8hfx0m3qjl3b4ybf1ngd2451jn16n859sljbm";
+       version = "0.7.0.0";
+       sha256 = "0sxg3mc47f578srkcvgd5p52abxqmrbbydm3ngh16jpz998y8cm4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -81823,6 +81904,7 @@ self: {
        homepage = "https://github.com/graknlabs/grakn-haskell";
        description = "A Haskell client for <http://grakn.ai Grakn>";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grammar-combinators" = callPackage
@@ -82657,6 +82739,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "greenclip" = callPackage
+    ({ mkDerivation, base, binary, classy-prelude, directory, microlens
+     , microlens-mtl, text, unix, utf8-string, vector, X11
+     }:
+     mkDerivation {
+       pname = "greenclip";
+       version = "2.0.1";
+       sha256 = "05f146ff9ff4kyaxx92jwb5g0nj0bb2j41hx12b4vjk28vik1x5y";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base binary classy-prelude directory microlens microlens-mtl text
+         unix utf8-string vector X11
+       ];
+       homepage = "https://github.com/erebe/greenclip#readme";
+       description = "Simple clipboard manager to be integrated with rofi";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "greg-client" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, hostname, network
      , stm, system-uuid, time
@@ -87719,6 +87820,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "happy_1_19_5" = callPackage
+    ({ mkDerivation, array, base, Cabal, containers, directory
+     , filepath, mtl, process
+     }:
+     mkDerivation {
+       pname = "happy";
+       version = "1.19.5";
+       sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32";
+       revision = "2";
+       editedCabalFile = "1dvhv94lzmya938i5crshg9qbx7dxvkyxkhfbqimxkydxn7l2w7w";
+       isLibrary = false;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ array base containers mtl ];
+       testHaskellDepends = [ base process ];
+       homepage = "http://www.haskell.org/happy/";
+       description = "Happy is a parser generator for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happy" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, directory
      , filepath, mtl, process
@@ -94896,6 +95018,7 @@ self: {
        homepage = "https://github.com/allonsy/hexpress";
        description = "An express-like http framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexquote" = callPackage
@@ -96401,6 +96524,7 @@ self: {
        homepage = "https://github.com/lehins/hip";
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hipbot" = callPackage
@@ -97156,6 +97280,7 @@ self: {
        homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-interest" = callPackage
@@ -97205,8 +97330,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.3.1";
-       sha256 = "1pb49s54rg396b15753h5wi3iyhpd3dadn3cvs3bplb5r432ni1i";
+       version = "1.3.2";
+       sha256 = "1qlfzw8nh4isfjqmnq16qrfas9flhyn2b6mf9nvcg0bgm4m7hs7n";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
@@ -97219,8 +97344,9 @@ self: {
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory
          doctest filepath Glob hashtables HUnit megaparsec mtl mtl-compat
-         old-time parsec pretty-show regex-tdfa safe split test-framework
-         test-framework-hunit text time transformers uglymemo utf8-string
+         old-time parsec pretty-show regex-tdfa safe semigroups split
+         test-framework test-framework-hunit text time transformers uglymemo
+         utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
@@ -97671,7 +97797,7 @@ self: {
        homepage = "https://github.com/Alexander-Ignatyev/morpheus/tree/master/hmatrix-morpheus";
        description = "Low-level machine learning auxiliary functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hmatrix-nipals" = callPackage
@@ -98097,6 +98223,7 @@ self: {
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -98490,7 +98617,7 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hold-em" = callPackage
@@ -106676,14 +106803,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-bits_0_7_0_1" = callPackage
+  "hw-bits_0_7_0_2" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.7.0.1";
-       sha256 = "1h8gpxqlyiq6zfipbmv6377s21dx5idjjakw8rwwhp476pa6dxnw";
+       version = "0.7.0.2";
+       sha256 = "1s0as4d1a80hzx47zpa7qjiwdbgwzg1j4lgqd0grri5scq0iwqiq";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -106941,8 +107068,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "1.1.4";
-       sha256 = "1vh3nq6mv8aq5ws17kilkcmdgxg1i1v582ddydrwz3p42kpg1qi4";
+       version = "2.0.0";
+       sha256 = "0l3vyygyan5j52af8g5s24435hxy0pr6j89yqzy5mp3dv12qlr53";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106970,8 +107097,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "1.1.4";
-       sha256 = "17rmal7kncddyqw7y3sa9kr5frv3gqcr4s85lb8k9iaj64wa2cfl";
+       version = "2.0.0";
+       sha256 = "0j1qwn9an397vl3y3mlrzhjw3c8jbmw1c0wpsywk0v0p7rfjg5nn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107069,6 +107196,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-prim-bits" = callPackage
+    ({ mkDerivation, base, criterion, vector }:
+     mkDerivation {
+       pname = "hw-prim-bits";
+       version = "0.1.0.1";
+       sha256 = "1fvmmp8l93j4wqcszk8lq4isl1xjyqnjzlaghs1wh9m6vywv5ncy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       homepage = "https://github.com/githubuser/hw-prim-bits#readme";
+       description = "Primitive support for bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-rankselect" = callPackage
     ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
      , hw-rankselect-base, QuickCheck, vector
@@ -107226,7 +107370,7 @@ self: {
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -108199,6 +108343,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hyperion" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, clock
+     , containers, deepseq, directory, exceptions, filepath
+     , generic-deriving, hashable, hspec, lens, mtl
+     , optparse-applicative, process, QuickCheck, random, random-shuffle
+     , statistics, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hyperion";
+       version = "0.1.0.0";
+       sha256 = "06292m9igzqilhw5ybmfqkbncg713644i31wdpn0yl8j9iyqw6im";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring clock containers deepseq
+         directory exceptions filepath generic-deriving hashable lens mtl
+         optparse-applicative random random-shuffle statistics text time
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [ base process ];
+       testHaskellDepends = [
+         base hspec lens QuickCheck text unordered-containers
+       ];
+       homepage = "https://github.com/tweag/hyperion#readme";
+       description = "Reliable performance measurement with robust data export";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hyperloglog" = callPackage
     ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal
      , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory
@@ -113921,6 +114093,7 @@ self: {
        homepage = "https://github.com/Fuuzetsu/jenkinsPlugins2nix#readme";
        description = "Generate nix for Jenkins plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jespresso" = callPackage
@@ -119281,6 +119454,7 @@ self: {
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python-colour" = callPackage
@@ -119312,6 +119486,7 @@ self: {
        homepage = "http://github.com/bjpop/language-python-test";
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-qux" = callPackage
@@ -123530,6 +123705,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
        description = "Live coding of MIDI music";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "liveplot" = callPackage
@@ -129536,6 +129712,7 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mersenne-random" = callPackage
@@ -130169,6 +130346,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Handling of MIDI messages and files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-alsa" = callPackage
@@ -130183,7 +130361,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-music-box" = callPackage
@@ -130204,6 +130382,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/midi-music-box";
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-simple" = callPackage
@@ -130243,6 +130422,7 @@ self: {
        homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-utils" = callPackage
@@ -132071,6 +132251,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_25_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.25.1";
+       sha256 = "0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -133685,6 +133888,7 @@ self: {
        homepage = "https://github.com/lettier/movie-monad";
        description = "Plays videos using GStreamer and GTK+";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moving-averages" = callPackage
@@ -148404,6 +148608,30 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "ping-wrapper" = callPackage
+    ({ mkDerivation, attoparsec, base, either, optparse-applicative
+     , optparse-generic, ping-parser-attoparsec, placeholders, process
+     , text
+     }:
+     mkDerivation {
+       pname = "ping-wrapper";
+       version = "0.1.0.1";
+       sha256 = "0f0j324z94znvyp77dnpjdjimfrz8zs8iyk9f0vpr9j8y3bg4d3d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base either ping-parser-attoparsec placeholders process
+         text
+       ];
+       executableHaskellDepends = [
+         base optparse-applicative optparse-generic
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/frincon/ping-wrapper";
+       description = "Haskell Ping wrapper";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "pipe-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, pipes, transformers }:
      mkDerivation {
@@ -150045,6 +150273,7 @@ self: {
        homepage = "https://github.com/ocramz/plot-light";
        description = "A lightweight plotting library, exporting to SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotfont" = callPackage
@@ -150080,8 +150309,8 @@ self: {
     ({ mkDerivation, base, hspec, optparse-applicative, process }:
      mkDerivation {
        pname = "ploton";
-       version = "0.3.0.0";
-       sha256 = "1c045pc42bangg2rlclc91ad78ynjbc5lccmc33hjswcxynv6lj2";
+       version = "1.0.0.0";
+       sha256 = "1x2ypljgknyya3pwg2y323va1hl396qm30lfy982sa6p0d0m8hfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base optparse-applicative process ];
@@ -150814,10 +151043,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "polyvariadic";
-       version = "0.3.0.0";
-       sha256 = "13q6sq56gkn6gfjl9mblhjkkfk5bgi86l1x2x9yirfjms4x8445z";
-       revision = "1";
-       editedCabalFile = "0xnj571ccbpwnra5nzlvsj9qfj79aiq2cphwl8454jpl17cjnir2";
+       version = "0.3.0.1";
+       sha256 = "0bnwcpk5bgp784d68427vbcdvyavqpj87khwr5gdyxr58apih2z6";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/fgaz/polyvariadic";
        description = "Creation and application of polyvariadic functions";
@@ -151857,49 +152084,49 @@ self: {
      }) {};
 
   "postgrest" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async
-     , auto-update, base, base64-bytestring, bytestring
-     , case-insensitive, cassava, configurator-ng, containers
-     , contravariant, cookie, either, hasql, hasql-pool
-     , hasql-transaction, heredoc, hjsonpointer, hjsonschema, hspec
-     , hspec-wai, hspec-wai-json, HTTP, http-types
-     , insert-ordered-containers, interpolatedstring-perl6, jwt, lens
+    ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async, base
+     , base64-bytestring, bytestring, case-insensitive, cassava
+     , configurator-ng, containers, contravariant, cookie, either, hasql
+     , hasql-pool, hasql-transaction, heredoc, hjsonpointer, hjsonschema
+     , hspec, hspec-wai, hspec-wai-json, HTTP, http-types
+     , insert-ordered-containers, interpolatedstring-perl6, jose, lens
      , lens-aeson, monad-control, network-uri, optparse-applicative
      , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe
-     , scientific, swagger2, text, time, transformers-base, unix
+     , scientific, swagger2, text, transformers-base, unix
      , unordered-containers, vector, wai, wai-cors, wai-extra
      , wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.4.2.0";
-       sha256 = "0256mjq9xc0shanyb54p1bhbpb68mdadc71c5p7lpr0q4cn91c0m";
+       version = "0.4.3.0";
+       sha256 = "1a0l5j755h6nlnv3xww0l88pz6ny5y40d1as9vfn1i1ybk4jx5gq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring case-insensitive cassava
-         configurator-ng containers contravariant cookie either hasql
-         hasql-pool hasql-transaction heredoc HTTP http-types
-         insert-ordered-containers interpolatedstring-perl6 jwt lens
-         lens-aeson network-uri optparse-applicative parsec protolude
-         Ranged-sets regex-tdfa safe scientific swagger2 text time
+         aeson ansi-wl-pprint base base64-bytestring bytestring
+         case-insensitive cassava configurator-ng containers contravariant
+         cookie either hasql hasql-pool hasql-transaction heredoc HTTP
+         http-types insert-ordered-containers interpolatedstring-perl6 jose
+         lens lens-aeson network-uri optparse-applicative parsec protolude
+         Ranged-sets regex-tdfa safe scientific swagger2 text
          unordered-containers vector wai wai-cors wai-extra
          wai-middleware-static
        ];
        executableHaskellDepends = [
-         auto-update base base64-bytestring bytestring hasql hasql-pool
-         protolude retry text time unix warp
+         base base64-bytestring bytestring hasql hasql-pool protolude retry
+         text unix warp
        ];
        testHaskellDepends = [
-         aeson aeson-qq async auto-update base base64-bytestring bytestring
+         aeson aeson-qq async base base64-bytestring bytestring
          case-insensitive cassava containers contravariant hasql hasql-pool
          heredoc hjsonpointer hjsonschema hspec hspec-wai hspec-wai-json
          http-types lens lens-aeson monad-control process protolude
-         regex-tdfa time transformers-base wai wai-extra
+         regex-tdfa transformers-base wai wai-extra
        ];
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgrest-ws" = callPackage
@@ -157976,17 +158203,17 @@ self: {
      }) {};
 
   "random-bytestring" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, entropy
-     , ghc-prim, mwc-random, primitive, random
+    ({ mkDerivation, async, base, bytestring, criterion, cryptonite
+     , entropy, ghc-prim, mwc-random, pcg-random, primitive, random
      }:
      mkDerivation {
        pname = "random-bytestring";
-       version = "0.1.1";
-       sha256 = "08hpzxa4dzxpkcsb18yg093h7z14x73rfhg3l1qs9mddj37wghmh";
-       libraryHaskellDepends = [ base bytestring mwc-random ];
+       version = "0.1.2";
+       sha256 = "132xlls7qw94y2ljc74m0qhlzb19yv3yfxmwhi25cnghggsb22qz";
+       libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
        benchmarkHaskellDepends = [
-         async base bytestring criterion entropy ghc-prim mwc-random
-         primitive random
+         async base bytestring criterion cryptonite entropy ghc-prim
+         mwc-random pcg-random primitive random
        ];
        homepage = "https://www.github.com/larskuhtz/random-bytestring";
        description = "Efficient generation of random bytestrings";
@@ -159302,6 +159529,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana" = callPackage
@@ -159505,6 +159733,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-thread" = callPackage
@@ -162712,6 +162941,7 @@ self: {
        ];
        description = "Scrap Your Reprinter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reproject" = callPackage
@@ -165158,7 +165388,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "rss-conduit_0_4_0_0" = callPackage
+  "rss-conduit_0_4_1_0" = callPackage
     ({ mkDerivation, atom-conduit, base, bytestring, conduit
      , conduit-combinators, containers, data-default
      , dublincore-xml-conduit, hlint, lens-simple, mono-traversable
@@ -165169,13 +165399,12 @@ self: {
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.4.0.0";
-       sha256 = "0120r3hb6321cb8n8q3l9fybmjndar8plplgx2qxnxwsbq4r7h10";
+       version = "0.4.1.0";
+       sha256 = "0lal33vjsdz5k63ljlx4430an1x3hgw6nn1aixf531bwdglxgg5c";
        libraryHaskellDepends = [
          atom-conduit base conduit conduit-combinators containers
-         dublincore-xml-conduit lens-simple mono-traversable safe
-         safe-exceptions singletons text time timerep uri-bytestring vinyl
-         xml-conduit xml-types
+         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
@@ -165959,6 +166188,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "safeio_0_0_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , directory, filepath, HUnit, resourcet, test-framework
+     , test-framework-hunit, test-framework-th, unix
+     }:
+     mkDerivation {
+       pname = "safeio";
+       version = "0.0.4.0";
+       sha256 = "1abbg6nxpz4va54r2005swlyw8k4y61xjhcz4s3rshc09cmrrn6l";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         resourcet unix
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         HUnit resourcet test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       description = "Write output to disk atomically";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safepath" = callPackage
     ({ mkDerivation, base, doctest, text, validity }:
      mkDerivation {
@@ -166100,8 +166352,8 @@ self: {
      }:
      mkDerivation {
        pname = "salve";
-       version = "0.0.5";
-       sha256 = "05m24awd4laqxh5mqbi1yzpmbnz2s8sh4xsz7j128dcxlsnrkldf";
+       version = "0.0.6";
+       sha256 = "1269qhsck9mx5adhzbvyznbfmi2lwrafmf8b750y31cpiziw4mfb";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest microlens ];
        benchmarkHaskellDepends = [
@@ -166680,8 +166932,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.2";
-       sha256 = "0kqgx84kp1y63iakmmhfcgmqn4b7d3hrgcl2j7xdzi3fw6ig93y7";
+       version = "7.3";
+       sha256 = "01vcil4zij8ap1bnkmmi8439mmnsbw3qc1gw994wdnar082wzh66";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -179084,6 +179336,7 @@ self: {
        homepage = "https://github.com/morphismtech/squeal";
        description = "Squeal PostgreSQL Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "squeeze" = callPackage
@@ -180129,6 +180382,7 @@ self: {
        homepage = "https://github.com/4e6/stackage2nix#readme";
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "staf" = callPackage
@@ -182804,8 +183058,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-cli";
-       version = "0.9.1.0";
-       sha256 = "0yhdfwvw15b1srjkmjafxjgpxcxwjqpdg4r5681cc9s4dqrhhgxw";
+       version = "0.9.3.0";
+       sha256 = "107kyi11634r7iqx0n6ry60byjab3xigl0xf3waq0lrv7jgrmhbz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183864,6 +184118,7 @@ self: {
        homepage = "https://github.com/rodrigosetti/swagger-test";
        description = "Testing of Swagger APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger2" = callPackage
@@ -184642,6 +184897,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Control synthesizer effects via ALSA/MIDI";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-core" = callPackage
@@ -184790,6 +185046,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sys-auth-smbclient" = callPackage
@@ -195943,14 +196200,14 @@ self: {
 
   "type-of-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, criterion, hspec
-     , text
+     , QuickCheck, text
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "0.2.1.1";
-       sha256 = "1dvmpi1bal10vr5l4phllwxij9yw5lgjyx7aimb1yalri2dapipk";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [ base hspec text ];
+       version = "0.3.0.0";
+       sha256 = "1cj0q9h7dda8zmn8lnvm0scn97cfwxihvj31x28nzfywgbhimhv6";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [
          base blaze-html bytestring criterion text
        ];
@@ -196181,6 +196438,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "typed-process_0_1_1" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring
+     , conduit, conduit-extra, exceptions, hspec, http-conduit, process
+     , stm, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.1.1";
+       sha256 = "1n93jy1z2xyin8j5dy972hdv2ydwfdbf5x1bygvn8cc6llb4wsml";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra exceptions process stm
+         transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring conduit conduit-extra hspec
+         http-conduit temporary
+       ];
+       homepage = "https://haskell-lang.org/library/typed-process";
+       description = "Run external processes, with strong typing of streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -199911,6 +200191,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "validation_0_5_5" = callPackage
+    ({ mkDerivation, base, bifunctors, directory, doctest, filepath
+     , lens, mtl, QuickCheck, semigroupoids, semigroups
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "validation";
+       version = "0.5.5";
+       sha256 = "0fgwgpwcisbabzyq11pkj57gp0kydi4px9gmgzqcq2hn6xb43qkd";
+       libraryHaskellDepends = [
+         base bifunctors lens mtl semigroupoids semigroups transformers
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/qfpl/validation";
+       description = "A data-type like Either but with an accumulating Applicative";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validations" = callPackage
     ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl
      , QuickCheck, test-framework, test-framework-hunit
@@ -203363,6 +203664,7 @@ self: {
        executableHaskellDepends = [ base bytestring cryptonite memory ];
        homepage = "https://github.com/habibalamin/wai-secure-cookies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session" = callPackage
@@ -207357,6 +207659,7 @@ self: {
        homepage = "http://github.com/tych0/xcffib";
        description = "A cffi-based python binding for X";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xchat-plugin" = callPackage
@@ -210057,6 +210360,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_4_19" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptonite, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, memory
+     , mime-mail, network-uri, nonce, persistent, persistent-template
+     , random, resourcet, safe, shakespeare, template-haskell, text
+     , time, transformers, unordered-containers, wai, yesod-core
+     , yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.19";
+       sha256 = "1r6ykh9q9080wrshicmgxkjjlxb1rxv56kabqnyx44xihhcr19jp";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base memory
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -210851,6 +211184,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_16" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.16";
+       sha256 = "0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-bootstrap4" = callPackage
     ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
      mkDerivation {

From 0898cd25213b9396fedec69711f81f8002477888 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 14:12:35 +0200
Subject: [PATCH 46/88] haskell-Agda: use old Happy version to fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cdb15fd9f81..13063aeb975 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -899,4 +899,7 @@ self: super: {
     sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
   });
 
+  # happy 1.19.6 and later break some packages.
+  Agda = super.Agda.override { happy = self.happy_1_19_5; };
+
 }

From 9903f4e2edb1015ccd9d0f95f3abb2309b32fe76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 17:11:33 +0200
Subject: [PATCH 47/88] haskell-binary-orphans: use latest version when
 compiling with ghc-8.2.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 8b261112ad0..4153e96e74a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -88,5 +88,6 @@ self: super: {
   path-io = super.path-io_1_3_3;
   trifecta = super.trifecta_1_7_1_1;
   aeson-compat = dontCheck super.aeson-compat_0_3_7_1;  # test suite needs QuickCheck 2.10.*
+  binary-orphans = dontCheck super.binary-orphans_0_1_7_0; # test suite needs QuickCheck 2.10.*
 
 }

From 2ae7e952b2d841ab82e934f22f65609ecd92a51b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 7 Sep 2017 18:09:15 +0100
Subject: [PATCH 48/88] yarn: 0.28.4 -> 1.0.1

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

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 26c0fe281e7..fda4e9abd45 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "0.28.4";
+  version = "1.0.1";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "12l1ljgzk45i24d9x7036hdrb8f46in93xfc2z4wq94wzm24s2za";
+    sha256 = "1adp5wzxbq5glxbmqfvmjn3vld93mvl65y4bmhjn8clzj7n25piq";
   };
 
   buildInputs = [makeWrapper nodejs];

From f9ea527a02773b33967bde2fe9675fb4d4d3c2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 7 Sep 2017 19:12:10 +0200
Subject: [PATCH 49/88] factorio: use `throw` instead of `abort`

Otherwise if you try to listing all available packages, you will get a
hard error on platforms not supported by this package.  Consequently the
tarball job was broken.
---
 pkgs/games/factorio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index e10d97a047b..5ca699c3317 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -26,7 +26,7 @@ let
       demo     = bdist { };
     };
   };
-  actual = binDists.${stdenv.system}.${releaseType};
+  actual = binDists.${stdenv.system}.${releaseType} or throw "Factorio: unsupported platform";
 
   bdistForArch = arch: { sha256 ? null
                        , version ? "0.15.34"
@@ -34,7 +34,7 @@ let
                        , nameMut ? x: x
                        }:
     if sha256 == null then
-      abort "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download"
+      throw "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download"
     else {
       inherit version arch;
       src = fetcher {

From b73e3bfafd42dbc9caca2eae918ce936c9471c23 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Sep 2017 19:22:06 +0200
Subject: [PATCH 50/88] python.pkgs.buildPythonPackage: use distutils-cfg to
 block downloads, fixes #25428

While we tell pip not to fetch (with the `--no-index` option),
`setuptools` can do so itself. In the past we used a `distutils.cfg`
with `allow-hosts = None` to prevent setuptools from fetching itself.
This was removed when we started building wheels in
2562f94de4e4fd2ddc677187fa2e2848L69.

The `dist-utils.cfg` code was still there, and adding it to
`buildInputs` is sufficient.

Tested with python.pkgs.passlib by removing the `checkInputs` / `nose`.
---
 pkgs/development/interpreters/python/mk-python-derivation.nix | 4 +++-
 pkgs/top-level/python-packages.nix                            | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index bc586e0b3ce..dae465edc0d 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -6,6 +6,8 @@
 , setuptools
 , unzip
 , ensureNewerSourcesHook
+# Prevent impurities by blocking setuptools/easy-install from downloading sdists
+, distutils-cfg
 }:
 
 { name
@@ -60,7 +62,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"
 
   inherit pythonPath;
 
-  buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
+  buildInputs = [ distutils-cfg wrapPython ] ++ buildInputs ++ pythonPath
     ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
     ++ lib.optionals doCheck checkInputs;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6312fb25f4b..4a63203c551 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -34,6 +34,7 @@ let
   bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
 
   mkPythonDerivation = makeOverridable( callPackage ../development/interpreters/python/mk-python-derivation.nix {
+    distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
   });
 
   # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.

From eed14baec3db43df7294d3b549045c7298044eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 2 Sep 2017 09:50:21 +0200
Subject: [PATCH 51/88] nixos/postfix: undo deprecation of extraConfig,
 extraMasterConf

I realize that advanced users like to configure services with Nix
attrsets, but I don't think we should remove the option to use the
(configuration) language provided by upstream.
---
 nixos/modules/services/mail/postfix.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 01ae49d4909..d88a38def82 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -836,11 +836,5 @@ in
     (mkIf (cfg.dnsBlacklists != []) {
       services.postfix.mapFiles."client_access" = checkClientAccessFile;
     })
-    (mkIf (cfg.extraConfig != "") {
-      warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
-    })
-    (mkIf (cfg.extraMasterConf != "") {
-      warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
-    })
   ]);
 }

From c24820db93afe3dbffba2d9031c0c496029e363d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 7 Sep 2017 21:44:27 +0200
Subject: [PATCH 52/88] perlPackages.BoostGeometryUtils: unbreak build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set LD=$CC to fix this build error:

...
ExtUtils::Mkbootstrap::Mkbootstrap('blib/arch/auto/Boost/Geometry/Utils/Utils.bs')
ld -shared -O2 -L/nix/store/sgjc1147vi5hd57ck9xgck5xjkydg5lz-glibc-2.25/lib -fstack-protector-strong -o blib/arch/auto/Boost/Geometry/Utils/Utils.so buildtmp/Utils.o -lstdc++
buildtmp/Utils.o: In function `_GLOBAL__sub_I_Utils.c':
Utils.c:(.text.startup+0x1a): undefined reference to `__dso_handle'
/nix/store/yf4p5w2v4h4i8rja9zw1akp007av624j-binutils-2.28.1/bin/ld: buildtmp/Utils.o: relocation R_X86_64_PC32 against undefined hidden symbol `__dso_handle' can not be used when making a shared object
/nix/store/yf4p5w2v4h4i8rja9zw1akp007av624j-binutils-2.28.1/bin/ld: final link failed: Bad value
error building blib/arch/auto/Boost/Geometry/Utils/Utils.so from buildtmp/Utils.o at /nix/store/7q2hps69zkj501lsmvnd2ry95mmdbh80-perl-5.24.2/lib/perl5/5.24.2/ExtUtils/CBuilder/Base.pm line 321.
builder for ‘/nix/store/bdwqvgxlgcqsmlqfh0d74jkpw96p78kh-perl-Boost-Geometry-Utils-0.15.drv’ failed with exit code 2
error: build of ‘/nix/store/bdwqvgxlgcqsmlqfh0d74jkpw96p78kh-perl-Boost-Geometry-Utils-0.15.drv’ failed
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7cf4c445192..475d456eb23 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -746,6 +746,7 @@ let self = _self // overrides; _self = with self; {
       # Fix out of memory error on Perl 5.19.4 and later.
       ../development/perl-modules/boost-geometry-utils-fix-oom.patch
     ];
+    perlPreHook = "export LD=$CC";
   };
 
   BusinessHours = buildPerlPackage rec {

From 94036cabda974cdbefeac0821d022480b9009fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 7 Sep 2017 21:11:06 +0200
Subject: [PATCH 53/88] nixos/release*: fixup evaluation of the tested job

---
 nixos/release-combined.nix | 4 ++--
 nixos/release.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 6f6253e330b..7e1b01c3081 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -81,8 +81,8 @@ in rec {
         (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
         nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
-        nixos.tests.docker.x86_64-linux
-        nixos.tests.docker-edge.x86_64-linux
+        nixos.tests.docker
+        nixos.tests.docker-edge
         (all nixos.tests.ecryptfs)
         (all nixos.tests.env)
         (all nixos.tests.ipv6)
diff --git a/nixos/release.nix b/nixos/release.nix
index a893a64df1c..5c4ac7752cf 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -264,9 +264,9 @@ in rec {
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
   tests.kernel-copperhead = tests/kernel-copperhead.nix {};
-  tests.kernel-latest = tests/kernel-latest.nix {};
-  tests.kernel-lts = tests/kernel-lts.nix {};
-  tests.kernel-params = tests/kernel-params.nix {};
+  tests.kernel-latest = callTest tests/kernel-latest.nix {};
+  tests.kernel-lts = callTest tests/kernel-lts.nix {};
+  tests.kernel-params = callTest tests/kernel-params.nix {};
   tests.keystone = callTest tests/keystone.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };

From 0ad1d8939f019260e4befdebe95ed355a1f01ff2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Sep 2017 21:07:18 +0200
Subject: [PATCH 54/88] atlassian-crowd: 2.12.0 -> 3.0.1

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

diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 0d78f361525..6d7b332da13 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-crowd-${version}";
-  version = "2.12.0";
+  version = "3.0.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
-    sha256 = "1kfnsa25axlyhnapfza381p94pyfixh7j999qhpg3ii821n9sggm";
+    sha256 = "17pz0rgzdv40sbvzb9w6xmdg598m6gs7gsznfnxcy1j011cgg1wr";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From 5901a645a8b3b467035503dac5ba60d857f4d224 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Sep 2017 21:29:47 +0200
Subject: [PATCH 55/88] searx: fix build

---
 pkgs/servers/web-apps/searx/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index 0feae7d7241..1c5f52d4938 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -17,7 +17,10 @@ pythonPackages.buildPythonApplication rec {
       --replace 'certifi==2017.1.23' 'certifi' \
       --replace 'lxml==3.7.3' 'lxml' \
       --replace 'pyopenssl==16.2.0' 'pyopenssl' \
-      --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0'
+      --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
+      --replace 'flask==0.12' 'flask==0.12.*' \
+      --replace 'requests[socks]==2.13.0' 'requests[socks]==2.*' \
+      --replace 'python-dateutil==2.6.0' 'python-dateutil==2.6.*'
   '';
 
   propagatedBuildInputs = with pythonPackages; [

From 4955943101c3646024302744f45eb7956d22a72b Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Thu, 7 Sep 2017 22:27:13 +0200
Subject: [PATCH 56/88] Add gosu

---
 pkgs/tools/misc/gosu/default.nix | 24 ++++++++++++++++++++++++
 pkgs/tools/misc/gosu/deps.nix    | 11 +++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/misc/gosu/default.nix
 create mode 100644 pkgs/tools/misc/gosu/deps.nix

diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
new file mode 100644
index 00000000000..81606e1ca7f
--- /dev/null
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "gosu-${version}";
+  version = "2017-05-09";
+  rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
+
+  goPackagePath = "github.com/tianon/gosu";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/tianon/gosu";
+    sha256 = "1qp1cfx0hrr4qlnh7rhjb4xlxv9697flmgzzl6jcdkrpk1f0bz8m";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su";
+    homepage = "https://github.com/tianon/gosu";
+    licence = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/misc/gosu/deps.nix b/pkgs/tools/misc/gosu/deps.nix
new file mode 100644
index 00000000000..9bdfa392340
--- /dev/null
+++ b/pkgs/tools/misc/gosu/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "github.com/opencontainers/runc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/runc";
+      rev = "5274430fee9bc930598cfd9c9dbd33213f79f96e";
+      sha256 = "149057gm2y1mc45s7bh43c1ngjg1m54jkpaxw534ir9v5mb1zsxx";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce213c8688a..c089cc71e6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1081,6 +1081,8 @@ with pkgs;
 
   gorilla-bin = callPackage ../tools/security/gorilla-bin { };
 
+  gosu = callPackage ../tools/misc/gosu { };
+
   gringo = callPackage ../tools/misc/gringo { };
 
   gti = callPackage ../tools/misc/gti { };

From 3a93d9c516576223029698a3c4aafeb613d3eee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 7 Sep 2017 23:15:08 +0200
Subject: [PATCH 57/88] factorio: fixup my eval fixup f9ea527a027

---
 pkgs/games/factorio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 5ca699c3317..f8d715ccc32 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -26,7 +26,7 @@ let
       demo     = bdist { };
     };
   };
-  actual = binDists.${stdenv.system}.${releaseType} or throw "Factorio: unsupported platform";
+  actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform");
 
   bdistForArch = arch: { sha256 ? null
                        , version ? "0.15.34"

From 539dcef15e9c364f64445482f1d170d4f9aafaba Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 7 Sep 2017 19:43:51 -0400
Subject: [PATCH 58/88] tests: Fix copperhead call

---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 5c4ac7752cf..c43034ff44b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -263,7 +263,7 @@ in rec {
   tests.plasma5 = callTest tests/plasma5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
-  tests.kernel-copperhead = tests/kernel-copperhead.nix {};
+  tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
   tests.kernel-latest = callTest tests/kernel-latest.nix {};
   tests.kernel-lts = callTest tests/kernel-lts.nix {};
   tests.kernel-params = callTest tests/kernel-params.nix {};

From 00829717e86c2923bb57d5f5b8de8e257995a3fe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 7 Sep 2017 20:11:00 -0400
Subject: [PATCH 59/88] atom: 1.19.4 -> 1.19.7

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index e3e889abd87..5fe4d0910ee 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.19.4";
+  version = "1.19.7";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "13k98ghz943yd5lqsbsvp1qy79lhgi3vww97qhqcbmmh15n0gsb0";
+    sha256 = "0ividd7bmx0fqz1ykcx5cbnd6qyms1h7r662pcclyzzm3vxj9zif";
     name = "${name}.deb";
   };
 

From e93d92d391bd93587b78a0a78ba42abcab64d880 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 8 Sep 2017 03:00:27 +0000
Subject: [PATCH 60/88] ocamlPackages.cmdliner: 1.0.0 -> 1.0.2

---
 pkgs/development/ocaml-modules/cmdliner/1.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cmdliner/1.0.nix b/pkgs/development/ocaml-modules/cmdliner/1.0.nix
index 9448610a378..2e2abe897e0 100644
--- a/pkgs/development/ocaml-modules/cmdliner/1.0.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/1.0.nix
@@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
 
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x";
+    sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
   };
 
   unpackCmd = "tar xjf $src";

From 01a6878bb1dedfdbffe0e5ee0a77fe362388f5c6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 8 Sep 2017 12:07:39 +0800
Subject: [PATCH 61/88] ruby: boy scout cleanups

---
 pkgs/development/interpreters/ruby/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index f3d4ae4bb00..ba67e3bf406 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -151,12 +151,12 @@ let
           sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
         '';
 
-        meta = {
-          license = stdenv.lib.licenses.ruby;
-          homepage = http://www.ruby-lang.org/en/;
+        meta = with stdenv.lib; {
           description = "The Ruby language";
-          maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
-          platforms = stdenv.lib.platforms.all;
+          homepage    = http://www.ruby-lang.org/en/;
+          license     = licenses.ruby;
+          maintainers = with maintainers; [ vrthra manveru ];
+          platforms   = platforms.all;
         };
 
         passthru = rec {

From 9f51b3c105a5302691552b166f3cbc0581bd85b4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 8 Sep 2017 12:07:55 +0800
Subject: [PATCH 62/88] rubygems: 2.6.10 -> 2.6.13

Fixes a number of CVEs:

- a DNS request hijacking vulnerability. (CVE-2017-0902)
- an ANSI escape sequence vulnerability. (CVE-2017-0899)
- a DoS vulnerability in the query command. (CVE-2017-0900)
- a vulnerability in the gem installer that allowed a malicious gem to overwrite arbitrary files. (CVE-2017-0901)
---
 pkgs/development/interpreters/ruby/rubygems-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix
index 7658c303a1e..99870e6ba2c 100644
--- a/pkgs/development/interpreters/ruby/rubygems-src.nix
+++ b/pkgs/development/interpreters/ruby/rubygems-src.nix
@@ -1,6 +1,6 @@
 { fetchurl
-, version ? "2.6.10"
-, sha256 ? "364c0eee8e0c9e8ab4879c5035832e5a27f0c97292d2264af5ae0020585280f0"
+, version ? "2.6.13"
+, sha256 ? "1j98ww8cz9y4wwshg7p4i4acrmls3ywkyj1nlkh4k3bywwm50hfh"
 }:
 fetchurl {
   url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";

From ebd5c936fd6760c61022f6c342003c9dc0d5bac2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 8 Sep 2017 04:09:11 +0000
Subject: [PATCH 63/88] ocamlPackages.cmdliner: make version 1.0 the default

---
 .../cmdliner/{1.0.nix => 0.9.nix}             | 21 ++++++++-----------
 .../ocaml-modules/cmdliner/default.nix        | 21 +++++++++++--------
 pkgs/top-level/ocaml-packages.nix             | 10 ++++-----
 3 files changed, 26 insertions(+), 26 deletions(-)
 rename pkgs/development/ocaml-modules/cmdliner/{1.0.nix => 0.9.nix} (62%)

diff --git a/pkgs/development/ocaml-modules/cmdliner/1.0.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix
similarity index 62%
rename from pkgs/development/ocaml-modules/cmdliner/1.0.nix
rename to pkgs/development/ocaml-modules/cmdliner/0.9.nix
index 2e2abe897e0..e8824f31807 100644
--- a/pkgs/development/ocaml-modules/cmdliner/1.0.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/0.9.nix
@@ -1,33 +1,30 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
 
 let
   pname = "cmdliner";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
+assert stdenv.lib.versionAtLeast ocaml.version "3.12";
 
 stdenv.mkDerivation rec {
+
   name = "ocaml-${pname}-${version}";
-  version = "1.0.2";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
+    sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
   };
 
   unpackCmd = "tar xjf $src";
-
-  nativeBuildInputs = [ ocamlbuild opam topkg ];
+  nativeBuildInputs = [ ocamlbuild opam ];
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ result ];
 
   createFindlibDestdir = true;
 
-  buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
-  '';
-
-  installPhase = ''
+  configurePhase = "ocaml pkg/git.ml";
+  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
+  installPhase   = ''
     opam-installer --script --prefix=$out | sh
     ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
   '';
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index e8824f31807..2e2abe897e0 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -1,30 +1,33 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
 
 let
   pname = "cmdliner";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
+assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
 
 stdenv.mkDerivation rec {
-
   name = "ocaml-${pname}-${version}";
-  version = "0.9.8";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
+    sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
   };
 
   unpackCmd = "tar xjf $src";
-  nativeBuildInputs = [ ocamlbuild opam ];
+
+  nativeBuildInputs = [ ocamlbuild opam topkg ];
   buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ result ];
 
   createFindlibDestdir = true;
 
-  configurePhase = "ocaml pkg/git.ml";
-  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
-  installPhase   = ''
+  buildPhase = ''
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
+  '';
+
+  installPhase = ''
     opam-installer --script --prefix=$out | sh
     ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
   '';
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 27c24a8adf9..cccb378068d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -54,7 +54,7 @@ let
 
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
-    bap = callPackage ../development/ocaml-modules/bap { };
+    bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; };
 
     bitstring = callPackage ../development/ocaml-modules/bitstring { };
 
@@ -124,9 +124,9 @@ let
 
     cil = callPackage ../development/ocaml-modules/cil { };
 
-    cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
+    cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { };
 
-    cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { };
+    cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
 
     cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {
       lwt = lwt2;
@@ -447,8 +447,8 @@ let
 
     ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
 
-    ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; };
-    ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { };
+    ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
+    ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; };
 
     ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; };
 

From dce314e55bbe2e035c257b5bc1aa2eabd9ffb9ef Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 7 Sep 2017 09:00:19 -0300
Subject: [PATCH 64/88] terminology: 1.1.0 -> 1.1.1

---
 pkgs/desktops/enlightenment/terminology.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 71d92f6f3cb..935546efa86 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,16 +2,23 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "13rl1k22yf8qrpzdm5nh6ij641fibadr2ww1r7rnz7mbhzj3d4gb";
+    sha256 = "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns";
   };
 
-  nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
+  nativeBuildInputs = [
+    (pkgconfig.override { vanilla = true; })
+    makeWrapper
+  ];
 
-  buildInputs = [ efl pcre curl ];
+  buildInputs = [
+    efl
+    pcre
+    curl
+  ];
 
   postInstall = ''
     for f in $out/bin/*; do

From c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 8 Sep 2017 08:55:05 +0200
Subject: [PATCH 65/88] Revert "python.pkgs.buildPythonPackage: use
 distutils-cfg to block downloads, fixes #25428"

This reverts commit b73e3bfafd42dbc9caca2eae918ce936c9471c23.

See https://github.com/NixOS/nixpkgs/issues/29103
---
 pkgs/development/interpreters/python/mk-python-derivation.nix | 4 +---
 pkgs/top-level/python-packages.nix                            | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index dae465edc0d..bc586e0b3ce 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -6,8 +6,6 @@
 , setuptools
 , unzip
 , ensureNewerSourcesHook
-# Prevent impurities by blocking setuptools/easy-install from downloading sdists
-, distutils-cfg
 }:
 
 { name
@@ -62,7 +60,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"
 
   inherit pythonPath;
 
-  buildInputs = [ distutils-cfg wrapPython ] ++ buildInputs ++ pythonPath
+  buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
     ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
     ++ lib.optionals doCheck checkInputs;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53f3cd82c3d..aebb8e2be77 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -34,7 +34,6 @@ let
   bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
 
   mkPythonDerivation = makeOverridable( callPackage ../development/interpreters/python/mk-python-derivation.nix {
-    distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
   });
 
   # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.

From 3205d164c62cc52c904d3d1937cc97055c82ec13 Mon Sep 17 00:00:00 2001
From: Ben Ford <ben@perurbis.com>
Date: Fri, 8 Sep 2017 12:31:02 +0100
Subject: [PATCH 66/88] Fix hw-kafka-client haskell package

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 36f5f28f2f8..50005c06f7d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -105,6 +105,11 @@ self: super: builtins.intersectAttrs super {
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
   });
 
+  hw-kafka-client = overrideCabal super.hw-kafka-client (drv: {
+    preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal";
+    configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
+  });
+
   # Foreign dependency name clashes with another Haskell package.
   libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
 

From 017a356082fb10cee000acba4eab8337ac9a706e Mon Sep 17 00:00:00 2001
From: Ben Ford <ben@perurbis.com>
Date: Fri, 8 Sep 2017 13:08:26 +0100
Subject: [PATCH 67/88] Also had to add dontCheck integration test seems to
 hang

(unit tests all pass)
---
 pkgs/development/haskell-modules/configuration-nix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 50005c06f7d..df6fe0f2d26 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -105,10 +105,10 @@ self: super: builtins.intersectAttrs super {
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
   });
 
-  hw-kafka-client = overrideCabal super.hw-kafka-client (drv: {
+  hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: {
     preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal";
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
-  });
+  }));
 
   # Foreign dependency name clashes with another Haskell package.
   libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };

From 30ce53d105ce99fdc001c719b44be22565f4bac2 Mon Sep 17 00:00:00 2001
From: Ben Ford <ben@perurbis.com>
Date: Fri, 8 Sep 2017 13:13:22 +0100
Subject: [PATCH 68/88] Add a note about the changes

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index df6fe0f2d26..84311e6b09a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -105,6 +105,7 @@ self: super: builtins.intersectAttrs super {
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
   });
 
+  # library has hard coded directories that need to be removed https://github.com/NixOS/nixpkgs/pull/29109
   hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: {
     preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal";
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";

From cd283e9234667de526e0d055e7f4108ec535b941 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 8 Sep 2017 08:03:16 -0400
Subject: [PATCH 69/88] mfi: Remove remaining reference to mfi.nix

This file was removed in 6f0b538044, but sufficient care was not taken
to remove all references to it.  Without this change, trying to
rebuild nixos fails.
---
 nixos/modules/module-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8a7a5bf4bc4..a46448b9437 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -458,7 +458,6 @@
   ./services/networking/lldpd.nix
   ./services/networking/logmein-hamachi.nix
   ./services/networking/mailpile.nix
-  ./services/networking/mfi.nix
   ./services/networking/mjpg-streamer.nix
   ./services/networking/minidlna.nix
   ./services/networking/miniupnpd.nix

From 94ba1c02f6aaa18b425cd2032ccdb4fbb728a04c Mon Sep 17 00:00:00 2001
From: Ben Ford <ben@perurbis.com>
Date: Fri, 8 Sep 2017 13:45:56 +0100
Subject: [PATCH 70/88] Change link in explanation to upstream issue

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 84311e6b09a..6b0eb8c7002 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -105,7 +105,7 @@ self: super: builtins.intersectAttrs super {
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
   });
 
-  # library has hard coded directories that need to be removed https://github.com/NixOS/nixpkgs/pull/29109
+  # library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32
   hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: {
     preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal";
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";

From dc15c153381377088b497e515f8725118cfc0926 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <disasm@gmail.com>
Date: Fri, 8 Sep 2017 09:08:00 -0400
Subject: [PATCH 71/88] scorched3d: fixing build with gcc6

---
 pkgs/games/scorched3d/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index be921bf1189..0c2952696e2 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  patches = [ ./file-existence.patch ];
+  patches = [
+    ./file-existence.patch
+    (fetchurl {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch?id=1bbcfc9ae3dfdfcbdd35151cb7b6050776215e4d";
+      sha256 = "1farmjxbc2wm4scsdbdnvh29fipnb6mp6z85hxz4bx6n9kbc8y7n";
+    })
+  ];
 
   sourceRoot = "scorched";
 

From 2524e4cfd5d49bfed0a7472dcd820147e3855f66 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 8 Sep 2017 15:27:28 +0200
Subject: [PATCH 72/88] vbam: svn-1507 -> unstable-2017-09-04

---
 pkgs/misc/emulators/vbam/default.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 8ef64a11a17..9f1cbdf3908 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -1,9 +1,10 @@
 { stdenv
 , cairo
 , cmake
-, fetchsvn
+, fetchFromGitHub
 , ffmpeg
 , gettext
+, gtk2-x11
 , libpng
 , libpthreadstubs
 , libXdmcp
@@ -11,18 +12,21 @@
 , mesa
 , openal
 , pkgconfig
-, SDL
+, SDL2
+, sfml
 , wxGTK
 , zip
 , zlib
 }:
 
-stdenv.mkDerivation {
-  name = "VBAM-1507";
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/vbam/code/trunk";
-    rev = 1507;
-    sha256 = "0fqvgi5s0sacqr9yi7kv1klqlvfzr13sjq5ikipirz0jv50kjxa7";
+stdenv.mkDerivation rec {
+  name = "visualboyadvance-m-${version}";
+  version = "unstable-2017-09-04";
+  src = fetchFromGitHub {
+    owner = "visualboyadvance-m";
+    repo = "visualboyadvance-m";
+    rev = "ceef480";
+    sha256 = "1lpmlj8mv6fwlfg9m58hzggx8ld6cnjvaqx5ka5sffxd9v95qq2l";
   };
 
   buildInputs = [
@@ -30,14 +34,12 @@ stdenv.mkDerivation {
     cmake
     ffmpeg
     gettext
-    libpng
-    libpthreadstubs
-    libXdmcp
-    libxshmfence
+    gtk2-x11
     mesa
     openal
     pkgconfig
-    SDL
+    SDL2
+    sfml
     wxGTK
     zip
     zlib

From 3d325000abd3bcfb4ffa6eae56c3563cf8a4c5a6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 8 Sep 2017 15:43:18 +0200
Subject: [PATCH 73/88] rosegarden: 15.08 -> 17.04

---
 .../applications/audio/rosegarden/default.nix | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 00d7559cd58..4fec0d0c37b 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH,
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH,
   dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
   libsamplerate, perl, makedepend, libjack2,
   withLirc ? false, lirc ? null } :
 
 stdenv.mkDerivation (rec {
-  version = "15.08";
+  version = "17.04";
   name = "rosegarden-${version}";
+
   src = fetchurl {
     url  = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
-    sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls";
+    sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
   };
 
-  QTDIR=qt4;
-  
-  buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
-                  libsndfile libsamplerate perl makedepend libjack2 ]
-		++ stdenv.lib.optional withLirc [ lirc ];
-  
-  #enableParallelBuilding = true; issues on hydra
-  
+  QTDIR = qt4;
+
+  buildInputs = [
+    cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
+    libsndfile libsamplerate perl makedepend libjack2
+  ] ++ stdenv.lib.optional withLirc [ lirc ];
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.rosegardenmusic.com/;
     description = "Music composition and editing environment";

From 04f456ef9409f7cfb7b53e9c8d9aaa4aeb14eb05 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 8 Sep 2017 15:53:13 +0200
Subject: [PATCH 74/88] dmtcp: 2.5.0 -> 2.5.1

---
 pkgs/os-specific/linux/dmtcp/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index e67e54f7b43..cedd5a1cb76 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, bash, perl, python }:
 
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "dmtcp";
     repo = "dmtcp";
     rev = version;
-    sha256 = "08l774i8yp41j6kmzhj7x13475m5kdfhn678ydpm5cbg4l3dda3c";
+    sha256 = "1z6cc7avs2sj8csf7rapf7nbw0giva6xpj0cshv7p9s643y8yxmi";
   };
 
   dontDisableStatic = true;
 
   postPatch = ''
+    patchShebangs .
+
     substituteInPlace configure \
       --replace '#define ELF_INTERPRETER "$interp"' \
                 "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
@@ -25,16 +27,13 @@ stdenv.mkDerivation rec {
     substituteInPlace util/gdb-add-symbol-file \
       --replace /bin/bash ${stdenv.shell}
     substituteInPlace test/autotest.py \
-      --replace /usr/bin/env $(type -p env) \
-      --replace /bin/bash $(type -p bash) \
-      --replace /usr/bin/perl $(type -p perl) \
-      --replace /usr/bin/python $(type -p python) \
+      --replace /bin/bash ${bash}/bin/bash \
+      --replace /usr/bin/perl ${perl}/bin/perl \
+      --replace /usr/bin/python ${python}/bin/python \
       --replace "os.environ['USER']" "\"nixbld1\"" \
       --replace "os.getenv('USER')" "\"nixbld1\""
   '';
 
-  doCheck = false;
-
   meta = {
     description = "Distributed MultiThreaded Checkpointing";
     longDescription = ''

From 72451b5b77c656d3629d7ac2b6c61285ec867316 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Sep 2017 21:02:57 +0200
Subject: [PATCH 75/88] hackage2nix: include "haskell-gi-overloading == 0.0" in
 our package set

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7761ad4b5ec..45c3f094e2d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2536,6 +2536,7 @@ extra-packages:
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
   - happy <1.19.6                       # newer versions break Agda
+  - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
   - haskell-src-exts == 1.18.*          # required by hoogle-5.0.4
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms

From 8a71425b82442b196c75e0f48cd9b916972bd60f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Sep 2017 03:00:32 +0200
Subject: [PATCH 76/88] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/4c3ddafacc21a249fffebd09f7b9ae133956e45c.
---
 .../haskell-modules/hackage-packages.nix      | 221 +++++++++++++++---
 1 file changed, 183 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e119bba3938..e281cf9e774 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -851,8 +851,8 @@ self: {
      }:
      mkDerivation {
        pname = "Allure";
-       version = "0.6.0.0";
-       sha256 = "1baqvfrg5qsrfzlg6para87vf11srk0dmi062fpzfv1x452wx6ja";
+       version = "0.6.1.0";
+       sha256 = "1358gafgm91vqsdn9wxpd9qzar1via9fl5xcg2pn30bcg7dsqahh";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -11047,8 +11047,8 @@ self: {
      }:
      mkDerivation {
        pname = "LambdaHack";
-       version = "0.6.0.0";
-       sha256 = "12bvsl4bshks02dqk09nzjz8jd8mspf408h88bmswsxyhq6r03gc";
+       version = "0.6.1.0";
+       sha256 = "0h9b67x9mnn3nyz0a8lhh9amd511cgvmwlzaj7lkh8vqqxy2syhz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -15462,16 +15462,17 @@ self: {
      }) {};
 
   "SCalendar" = callPackage
-    ({ mkDerivation, base, containers, text, time }:
+    ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }:
      mkDerivation {
        pname = "SCalendar";
-       version = "0.1.0.0";
-       sha256 = "0dvmfr82hnavgpiv2zi0dccldpyl84l653gncrbgd7dmdnmbsvw9";
-       revision = "1";
-       editedCabalFile = "0vcdmzisi7v7jsm6bj34q43f42ab0bhq992lyq740ickzp3a6k22";
+       version = "1.0.0";
+       sha256 = "0w69p3min1iijbk5cv645v5cizd2k5xwdzr52l7fg72bv17l0xcx";
        libraryHaskellDepends = [ base containers text time ];
-       homepage = "https://github.com/sebasHack/SCalendar";
-       description = "XXXX";
+       testHaskellDepends = [
+         base containers hspec QuickCheck text time
+       ];
+       homepage = "https://github.com/stackbuilders/scalendar";
+       description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -17977,6 +17978,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Unique_0_4_7_1" = callPackage
+    ({ mkDerivation, base, containers, extra, hashable, hspec
+     , QuickCheck, unordered-containers
+     }:
+     mkDerivation {
+       pname = "Unique";
+       version = "0.4.7.1";
+       sha256 = "1a912180fk2xhz6md50n21xz0z89n9ylansyqxq034jgsfkz8b7s";
+       libraryHaskellDepends = [
+         base containers extra hashable unordered-containers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       description = "It provides the functionality like unix \"uniq\" utility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Unixutils" = callPackage
     ({ mkDerivation, base, bytestring, directory, exceptions, filepath
      , mtl, process, process-extras, pureMD5, regex-tdfa, unix, zlib
@@ -89334,6 +89352,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-overloading_0_0" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "haskell-gi-overloading";
+       version = "0.0";
+       sha256 = "1smz5fr5saw1l129h21qcywyp47mrbf7355kmwkspjh75yl2gix5";
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Overloading support for haskell-gi";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-gi-overloading" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -95606,12 +95637,12 @@ self: {
      }:
      mkDerivation {
        pname = "hgrev";
-       version = "0.2.1";
-       sha256 = "0kc7sm8kny3vyhdfpkj543796c51zxm1s5xgmjzr8gmjzgrbidqb";
+       version = "0.2.2";
+       sha256 = "05ly5dl0x0khanbhl3yanns5zk9w1fblakqxyvc0yvhq0413991s";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath process template-haskell
        ];
-       homepage = "https://github.com/LukeHoersten/hgrev";
+       homepage = "https://github.com/bitnomial/hgrev";
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124047,6 +124078,34 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {llvm-config = null;};
 
+  "llvm-hs_5_0_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+     , containers, exceptions, llvm-config, llvm-hs-pure, mtl
+     , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, temporary, transformers, transformers-compat
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "llvm-hs";
+       version = "5.0.0";
+       sha256 = "1lngf77ir1ffmqmwjpvax3rwmkapqrap66nc5lms3zxkpd3sh31x";
+       setupHaskellDepends = [ base Cabal containers ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers exceptions llvm-hs-pure
+         mtl template-haskell transformers transformers-compat utf8-string
+       ];
+       libraryToolDepends = [ llvm-config ];
+       testHaskellDepends = [
+         base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
+         tasty tasty-hunit tasty-quickcheck temporary transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/llvm-hs/llvm-hs/";
+       description = "General purpose LLVM bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {llvm-config = null;};
+
   "llvm-hs-pure" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, mtl
      , tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -124069,6 +124128,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "llvm-hs-pure_5_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, mtl
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "llvm-hs-pure";
+       version = "5.0.0";
+       sha256 = "1brz1zc9mmx4vyivvidjxv4x3i04wwpn1y060lcpnzmp89zz5pc1";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers mtl template-haskell
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers mtl tasty tasty-hunit tasty-quickcheck transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/llvm-hs/llvm-hs/";
+       description = "Pure Haskell LLVM functionality (no FFI)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "llvm-ht" = callPackage
     ({ mkDerivation, base, bytestring, directory, mtl, process
      , type-level
@@ -141494,6 +141576,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye-trans_0_3_6" = callPackage
+    ({ mkDerivation, base, mtl, opaleye, postgresql-simple
+     , product-profunctors, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "opaleye-trans";
+       version = "0.3.6";
+       sha256 = "03pg31rxnfw22zqpk3l098z32gl2r4dk9pma8z4f8ssp7crz7z8p";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base mtl opaleye postgresql-simple product-profunctors transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         base opaleye postgresql-simple product-profunctors
+       ];
+       homepage = "https://github.com/WraithM/opaleye-trans";
+       description = "A monad transformer for Opaleye";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "open-browser" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -142056,14 +142161,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "openssl-streams_1_2_1_2" = callPackage
+  "openssl-streams_1_2_1_3" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams
      , network, test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "openssl-streams";
-       version = "1.2.1.2";
-       sha256 = "0szfh7jjp8z8yz043a5vil8i1nhrwshaklx2m62n0jz8p6ff3h1b";
+       version = "1.2.1.3";
+       sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL io-streams network
        ];
@@ -154415,13 +154520,13 @@ self: {
      }:
      mkDerivation {
        pname = "prometheus";
-       version = "0.4.1";
-       sha256 = "1fvpfbzpwdpscn3gnpz6wnbk6w6fah3d6pxzn1mrx0m2a4rracis";
+       version = "0.4.2";
+       sha256 = "0k5avxjv1z4cfrx5x368ygzv30ghwykv4ngifigy1ydnmp7c7n1h";
        libraryHaskellDepends = [
          atomic-primops base bytestring containers http-types text
          transformers wai warp
        ];
-       homepage = "http://github.com/LukeHoersten/prometheus#readme";
+       homepage = "http://github.com/bitnomial/prometheus";
        description = "Prometheus Haskell Client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167019,6 +167124,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scalendar" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }:
+     mkDerivation {
+       pname = "scalendar";
+       version = "1.1.0";
+       sha256 = "077v0k745z1hs8k8yb5s6ln1ing8b5fllp7gw2kcrlrw108ijvwb";
+       libraryHaskellDepends = [ base containers text time ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck text time
+       ];
+       homepage = "https://github.com/stackbuilders/scalendar";
+       description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "scalp-webhooks" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, hastache, hspec
      , lens, lens-aeson, rainbow, random, regex-compat, shelly, Spock
@@ -169318,10 +169438,12 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "seqid";
-       version = "0.5.1";
-       sha256 = "15b6z2jq8gaygrblxhql5yimxjczxzzyjfjbhpjyymx4c7l6r8yf";
+       version = "0.5.2";
+       sha256 = "0b1c2fdrfxbgh8b1pbj5d436lylc73wjwnlkvhnx0mmg9ay8ixf9";
+       revision = "1";
+       editedCabalFile = "0khdf4panw2wvs80z6lx1vgn5h7xaswdxsh9rppb1fvvfjqzb7d9";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/LukeHoersten/seqid";
+       homepage = "https://github.com/bitnomial/seqid";
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169342,10 +169464,10 @@ self: {
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
        pname = "seqid-streams";
-       version = "0.6.1";
-       sha256 = "17chhnyfzjn6lkd9b1ilz9s0swayhwplawhwnmnjfbk8fgybc6fd";
+       version = "0.6.2";
+       sha256 = "0iaxd3ay36lbkzz19dgnb0pn6fi699afv556wkpnd8zl23p4qif3";
        libraryHaskellDepends = [ base io-streams seqid ];
-       homepage = "https://github.com/LukeHoersten/seqid-streams";
+       homepage = "https://github.com/bitnomial/seqid-streams";
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179206,6 +179328,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "sqlcli" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "sqlcli";
+       version = "0.1.0.0";
+       sha256 = "1xkq7pjvmhb4gc85val4fnd6jsbx7dmybq842r40vdbbxj8swh5v";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli";
+       description = "Sql Call-Level Interface bindings for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "sqlcli-odbc" = callPackage
+    ({ mkDerivation, base, sqlcli }:
+     mkDerivation {
+       pname = "sqlcli-odbc";
+       version = "0.1.0.1";
+       sha256 = "176jz0y435rdg1cg03a9aa2jd1a26gi5id9d3fbm91wv6fyjj6lm";
+       libraryHaskellDepends = [ base sqlcli ];
+       homepage = "https://hub.darcs.com/mihaigiurgeanu/sqlcli-odbc";
+       description = "Specific ODBC definitions to be used by SQL CLI clients";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sqlite" = callPackage
     ({ mkDerivation, base, bytestring, directory, pretty, sqlite, time
      , utf8-string
@@ -179319,8 +179465,8 @@ self: {
      }:
      mkDerivation {
        pname = "squeal-postgresql";
-       version = "0.1.1.1";
-       sha256 = "09cxxg780vy9hjaaybs402gcbajlla6yv84c5zyxl6kbp7apr6la";
+       version = "0.1.1.2";
+       sha256 = "1kfdyy6an151ans0p4xk102fjgn23hqsgyy05izb4z3mzahk6qij";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184101,8 +184247,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger-test";
-       version = "0.2.3";
-       sha256 = "0hs1ylml6bjqmy697fhrbm83s7y5c2bz1zy8y1drvjms1lrlipgs";
+       version = "0.2.4";
+       sha256 = "1rm001vwhl648xhb02jr6c72q8klx4wigk9kz2lw9ipkz2pra15a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197241,10 +197387,10 @@ self: {
     ({ mkDerivation, base, io-streams, unagi-chan }:
      mkDerivation {
        pname = "unagi-streams";
-       version = "0.2.2";
-       sha256 = "1v38007ldhwapwxqx5znl0ygl1fi2bhr4vg707ifw1f0wxxw154a";
+       version = "0.2.3";
+       sha256 = "1nhv6wbaw9knryq4rsb3y0k5kvhzb9ivkh9vjkvw4rccjikabc9a";
        libraryHaskellDepends = [ base io-streams unagi-chan ];
-       homepage = "https://github.com/LukeHoersten/unagi-streams";
+       homepage = "https://github.com/bitnomial/unagi-streams";
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210211,16 +210357,15 @@ self: {
 
   "yeshql" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, HDBC
-     , parsec, stm, syb-with-class, tasty, tasty-hunit, tasty-quickcheck
+     , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell
      }:
      mkDerivation {
        pname = "yeshql";
-       version = "3.0.0.1";
-       sha256 = "1qlx0wpcf6dms7q8rkdj41az01d7yywi2j8khi36k4r298l2g4v5";
+       version = "3.0.1.1";
+       sha256 = "07swxkxjdvsgsfz9qanygv1fmp3vzcd18hffyp0m6c7qv4av7zps";
        libraryHaskellDepends = [
-         base containers convertible filepath HDBC parsec syb-with-class
-         template-haskell
+         base containers convertible filepath HDBC parsec template-haskell
        ];
        testHaskellDepends = [
          base HDBC stm tasty tasty-hunit tasty-quickcheck

From f93a019816274bb5d50e605568f2fb567bfd1827 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 8 Sep 2017 11:20:44 -0300
Subject: [PATCH 77/88] mcomix: fixup

MComix is failing in the check phase; so, we'll not check it.
---
 pkgs/applications/graphics/mcomix/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index 318c2caee6f..eea0e501cb8 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -11,13 +11,10 @@ python27Packages.buildPythonApplication rec {
 
     propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
 
-    postPatch = ''
-      sed -i -e '/test_suite/d' setup.py
-    '';
+    doCheck = false;
 
     meta = {
       description = "Image viewer designed to handle comic books";
-
       longDescription = ''
         MComix is an user-friendly, customizable image viewer. It is specifically
         designed to handle comic books, but also serves as a generic viewer.
@@ -28,9 +25,10 @@ python27Packages.buildPythonApplication rec {
         MComix is a fork of the Comix project, and aims to add bug fixes and
         stability improvements after Comix development came to a halt in late 2009.
       '';
-
       homepage = http://mcomix.sourceforge.net/;
       license = stdenv.lib.licenses.gpl2;
-      maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+      maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ];
     };
 }
+# TODO:
+# - error in check phase

From 707ee76522caeda8391dac9f7185c9c53993a548 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 4 Sep 2017 16:01:04 -0400
Subject: [PATCH 78/88] slic3r: fix build with gcc6

---
 pkgs/applications/misc/slic3r/default.nix |  5 +++
 pkgs/applications/misc/slic3r/gcc6.patch  | 40 +++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/misc/slic3r/gcc6.patch

diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 64bcb0e1921..8624cc9dda5 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "1z8h11k29b7z49z5k8ikyfiijyycy1q3krlzi8hfd0vdybvymw21";
   };
 
+  patches = [
+    ./gcc6.patch
+  ];
+
   buildInputs = with perlPackages; [ perl makeWrapper which
     EncodeLocale MathClipper ExtUtilsXSpp threads
     MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
@@ -31,6 +35,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     export SLIC3R_NO_AUTO=true
+    export LD=$CXX
     export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
 
     substituteInPlace Build.PL \
diff --git a/pkgs/applications/misc/slic3r/gcc6.patch b/pkgs/applications/misc/slic3r/gcc6.patch
new file mode 100644
index 00000000000..f382a252f0d
--- /dev/null
+++ b/pkgs/applications/misc/slic3r/gcc6.patch
@@ -0,0 +1,40 @@
+diff --git i/xs/src/libslic3r/Config.hpp w/xs/src/libslic3r/Config.hpp
+index 49e999b..d9b65d8 100644
+--- i/xs/src/libslic3r/Config.hpp
++++ w/xs/src/libslic3r/Config.hpp
+@@ -65,7 +65,7 @@ class ConfigOptionFloat : public ConfigOption
+     
+     bool deserialize(std::string str) {
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+ 
+@@ -124,7 +124,7 @@ class ConfigOptionInt : public ConfigOption
+     
+     bool deserialize(std::string str) {
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+ 
+@@ -249,7 +249,7 @@ class ConfigOptionPercent : public ConfigOption
+     bool deserialize(std::string str) {
+         // don't try to parse the trailing % since it's optional
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+ 
+@@ -279,7 +279,7 @@ class ConfigOptionFloatOrPercent : public ConfigOption
+     bool deserialize(std::string str) {
+         this->percent = str.find_first_of("%") != std::string::npos;
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+ 

From d70e64ceffa1bce9a0d6829cf713a39a30f6c12a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 8 Sep 2017 16:39:25 +0200
Subject: [PATCH 79/88] yEd: 3.17 -> 3.17.1

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

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index fa85d44a498..dcb7c512dde 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
-  version = "3.17";
+  version = "3.17.1";
 
   src = requireFile {
     name = "${name}.zip";
     url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za";
+    sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 72699348c8739ae47dc773243712143e006cebc5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 8 Sep 2017 17:31:25 +0200
Subject: [PATCH 80/88] centerim: 4.22.10 -> 5.0.1

---
 .../instant-messengers/centerim/default.nix   | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix
index d6921e1082b..350d09078c4 100644
--- a/pkgs/applications/networking/instant-messengers/centerim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix
@@ -1,24 +1,27 @@
-{stdenv, fetchurl, openssl, curl, ncurses, libjpeg
+{stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg
 , withGpg ? true, gpgme ? null}:
 
 stdenv.mkDerivation rec {
-  version = "4.22.10";
-  debPatch = "2";
-  name = "centerim-${version}";
+  version = "5.0.1";
+  name = "centerim5-${version}";
 
   src = fetchurl {
-    url = "http://centerim.org/download/releases/${name}.tar.gz";
+    url = "http://centerim.org/download/cim5/${name}.tar.gz";
     sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
   };
-  patches = fetchurl {
-    url = "mirror://debian/pool/main/c/centerim/centerim_${version}-${debPatch}.diff.gz";
-    sha256 = "18iz3hkvr31jsyznryvyldxm9ckyrpy9sczxikrnw2i2r1xyfj8m";
-  };
+
+  CXXFLAGS = "-std=gnu++98";
 
   buildInputs = [ openssl curl ncurses libjpeg ]
     ++ stdenv.lib.optional withGpg gpgme;
 
-  configureFlags = [ "--with-openssl=${openssl.dev}" ];
+  preConfigure = ''
+    ${gnused}/bin/sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h
+  '';
+
+  configureFlags = [
+    "--with-openssl=${openssl.dev}"
+  ];
 
   meta = {
     homepage = http://www.centerim.org/;

From 653cad7a3ced572d92f611e14b180eb54e0124bf Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 8 Sep 2017 09:22:53 +0200
Subject: [PATCH 81/88] gdb: 8.0 -> 8.0.1

See http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00005.html
for release information.
---
 pkgs/development/tools/misc/gdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 02ff52155b1..1ee2a270b49 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -17,7 +17,7 @@
 
 let
   basename = "gdb-${version}";
-  version = "8.0";
+  version = "8.0.1";
 in
 
 assert targetPlatform.isHurd -> mig != null && hurd != null;
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn";
+    sha256 = "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x";
   };
 
   patches = [ ./debug-info-from-env.patch ];

From 5d1a8ecd916893ac377311de4abd5d7043646280 Mon Sep 17 00:00:00 2001
From: PanAeon <vitalii.voloshyn@gmail.com>
Date: Fri, 8 Sep 2017 17:05:44 +0100
Subject: [PATCH 82/88] update skypeforlinux to 5.4.0.1; Fix autologin issue
 (#29122)

skypeforlinux: 5.3.0.1 -> 5.4.0.1
---
 .../skypeforlinux/default.nix                 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index d476b9b35c4..37bbfef65bb 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, dpkg, makeWrapper
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
-, libnotify, nspr, nss, systemd, xorg }:
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2, libsecret
+, libnotify, nspr, nss, systemd, xorg, libv4l, libstdcxx5 }:
 
 let
 
-  version = "5.3.0.1";
+  version = "5.4.0.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -17,6 +17,9 @@ let
     fontconfig
     freetype
     glib
+    libsecret
+    glibc
+    libstdcxx5
 
     gnome2.GConf
     gnome2.gdk_pixbuf
@@ -30,6 +33,7 @@ let
     nss
     stdenv.cc.cc
     systemd
+    libv4l
 
     xorg.libxkbfile
     xorg.libX11
@@ -50,7 +54,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "08sf9nqnznsydw4965w7ixwwba54hjc02ga7vcnz9vpx5hln3nrz";
+        sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";
@@ -77,9 +81,10 @@ in stdenv.mkDerivation {
   '';
 
   postFixup = ''
-     patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
+    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do
+                patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+                patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
+    done
 
     ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
 

From edd94f5fcd077a9e7eb80102cc076a8f8bfe3524 Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Fri, 8 Sep 2017 14:26:41 +0000
Subject: [PATCH 83/88] mcrl2: 201409 -> 201707

---
 pkgs/applications/science/logic/mcrl2/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index c8493b59469..c9016a5ee0c 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -2,17 +2,16 @@
  python27, python27Packages}:
 
 stdenv.mkDerivation rec {
-  version = "201409.1";
-  build_nr = "13892";
+  version = "201707";
+  build_nr = "1";
   name = "mcrl2-${version}";
 
   src = fetchurl {
-    url = "http://www.mcrl2.org/download/devel/mcrl2-${version}.${build_nr}.tar.gz";
-    sha256 = "0cknpind6rma12q93rbm638ijhy8sj8nd20wnw8l0f651wm0x036";
+    url = "http://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
+    sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
   };
 
-  buildInputs = [ xlibs.libX11 cmake subversion mesa qt5.qtbase boost
-                  python27 python27Packages.pyyaml python27Packages.psutil ];
+  buildInputs = [ cmake mesa qt5.qtbase boost ];
 
   enableParallelBuilding = true;
 

From 4551099cb8ea51a1c5d833fa15566f79835292af Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 8 Sep 2017 00:16:10 +0900
Subject: [PATCH 84/88] offlineimap: 7.1.1 -> 7.1.2

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

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 4a4359551fa..c167851086e 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -2,7 +2,7 @@
   asciidoc, libxml2, libxslt, docbook_xml_xslt }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "7.1.1";
+  version = "7.1.2";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "12fv6fzi3cb0hkvs4h5vj2i440d85wzjjyjl90zvyxvlfy0pmljl";
+    sha256 = "1bvlbw3bsx3qs8np1qdqbhpdr9qykzsql9684gm7gg84gw51i667";
   };
 
   postPatch = ''

From 9810c0c9117fed4876f69f991004c9ff30367053 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 7 Sep 2017 21:10:50 +0300
Subject: [PATCH 85/88] rambox: 0.5.10 -> 0.5.12

---
 .../instant-messengers/rambox/default.nix     | 48 ++++++++-----------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 7cb89f019e0..38d489de02a 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, fetchurl, dpkg
 , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
 
@@ -6,7 +6,7 @@ let
   bits = if stdenv.system == "x86_64-linux" then "x64"
          else "ia32";
 
-  version = "0.5.10";
+  version = "0.5.12";
 
   runtimeDeps = [
     udev libnotify
@@ -18,53 +18,45 @@ let
     gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
   ] ++ runtimeDeps;
-
-  myIcon = fetchurl {
-    url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
-    sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b";
-  };
-  desktopItem = makeDesktopItem rec {
-    name = "Rambox";
-    exec = "rambox";
-    icon = myIcon;
-    desktopName = name;
-    genericName = "Rambox messenger";
-    categories = "Network;";
-  };
 in stdenv.mkDerivation rec {
   name = "rambox-${version}";
   src = fetchurl {
-    url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
+    url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
     sha256 = if bits == "x64" then
-      "1i5jbhsfdbhr0rsb5w2pfpwjiagz47ppxk65qny3ay3lr4lbccn3" else
-      "1p1m6vsa9xvl3pjf3pygvllyk7j4q9vnlzmrizb8f5q30fpls25x";
+      "1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else
+      "063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa";
   };
 
   # don't remove runtime deps
   dontPatchELF = true;
 
+  buildInputs = [ dpkg ];
+
+  unpackPhase = "dpkg-deb -x $src .";
+
   installPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
-    patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" opt/Rambox/rambox
+    patchelf --set-rpath "$out/opt/Rambox:${stdenv.lib.makeLibraryPath deps}" opt/Rambox/rambox
 
-    mkdir -p $out/bin $out/opt/rambox
-    cp -r * $out/opt/rambox
-    ln -s $out/opt/rambox/rambox $out/bin
+    mkdir -p $out/bin
+    cp -r opt $out
+    ln -s $out/opt/Rambox/rambox $out/bin
 
-    # provide desktop item
-    mkdir -p $out/share/applications
-    ln -s ${desktopItem}/share/applications/* $out/share/applications
+    # provide resources
+    cp -r usr/share $out
+    substituteInPlace $out/share/applications/rambox.desktop \
+      --replace Exec=\"/opt/Rambox/rambox\" Exec=rambox
   '';
 
   postFixup = ''
-    paxmark m $out/opt/rambox/rambox
+    paxmark m $out/opt/Rambox/rambox
   '';
 
   meta = with stdenv.lib; {
     description = "Free and Open Source messaging and emailing app that combines common web applications into one";
     homepage = http://rambox.pro;
     license = licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.gnidorah ];
+    maintainers = [ maintainers.gnidorah ];
     platforms = ["i686-linux" "x86_64-linux"];
     hydraPlatforms = [];
   };

From a6fcd2ce2f739ce74d1d18959585ea4c47a92c25 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 8 Sep 2017 11:35:36 -0500
Subject: [PATCH 86/88] dropbox: 33.4.23 -> 34.4.20

---
 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 a76d6bc2fa4..01dfa244a19 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 = "33.4.23";
+  version = "34.4.20";
   sha256 = {
-    "x86_64-linux" = "0z8sd71v0xfbq4x8gw0rjhg7kbd7r0465b1cqk1ls2fivb25qqxz";
-    "i686-linux"   = "07sj1ixpml56bx83jawslak6scb12wxwn53nnabvgnivhb9vzq97";
+    "x86_64-linux" = "04yc0sf4w4p86f2rpph4g4qhd4wxlsyhiwcf4201xadnnjj11gzz";
+    "i686-linux"   = "0ch5yxw1n6mwa6050pd10f5z3ys2yca9n8ccjlqi2d2aa4qcxsmr";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch = {

From 9f2ff1d31aee9a8c33c9896794d6ad3fd50a8d41 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 8 Sep 2017 19:36:43 +0100
Subject: [PATCH 87/88] terraform: revamp the providers list (#29097)

This fixes the ./update-all script to actually fetch all the available
providers (thanks pagination). It was also improver to user a more
compact representation of the data.
---
 .../cluster/terraform/providers/data.nix      | 585 +++++++++++-------
 .../cluster/terraform/providers/default.nix   |  21 +-
 .../cluster/terraform/providers/template.nix  |  16 -
 .../cluster/terraform/providers/update-all    |  48 +-
 4 files changed, 417 insertions(+), 253 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/terraform/providers/template.nix

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 76eaa21a42c..0778e221c12 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -1,333 +1,486 @@
+# Generated with ./update-all
 {
+  alicloud =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-alicloud";
+      version = "0.1.0";
+      sha256  = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj";
+    };
+  archive =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-archive";
+      version = "0.1.0";
+      sha256  = "1g7bjak1vgxpnmp4b9cb3mq8gqp1a7738fj0sxzflfk8k35p27ri";
+    };
+  arukas =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-arukas";
+      version = "0.1.0";
+      sha256  = "1msfr0rlzjfds02h35p99d1f541a1fzndjcpgijb41yx74h2v5dl";
+    };
+  atlas =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-atlas";
+      version = "0.1.1";
+      sha256  = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14";
+    };
   aws =
     {
-      pname = "terraform-provider-aws";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-aws";
       version = "0.1.4";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-aws";
-        rev    = "v0.1.4";
-        sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
-      };
+      sha256  = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
+    };
+  azure =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-azure";
+      version = "0.1.1";
+      sha256  = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1";
     };
   azurerm =
     {
-      pname = "terraform-provider-azurerm";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-azurerm";
       version = "0.1.6";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-azurerm";
-        rev    = "v0.1.6";
-        sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6";
-      };
+      sha256  = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6";
     };
   bitbucket =
     {
-      pname = "terraform-provider-bitbucket";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-bitbucket";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-bitbucket";
-        rev    = "v0.1.0";
-        sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
-      };
+      sha256  = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
     };
   chef =
     {
-      pname = "terraform-provider-chef";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-chef";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-chef";
-        rev    = "v0.1.0";
-        sha256 = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw";
-      };
+      sha256  = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw";
     };
   circonus =
     {
-      pname = "terraform-provider-circonus";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-circonus";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-circonus";
-        rev    = "v0.1.0";
-        sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64";
-      };
+      sha256  = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64";
+    };
+  clc =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-clc";
+      version = "0.1.0";
+      sha256  = "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf";
+    };
+  cloudflare =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-cloudflare";
+      version = "0.1.0";
+      sha256  = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq";
     };
   cloudstack =
     {
-      pname = "terraform-provider-cloudstack";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-cloudstack";
       version = "0.1.1";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-cloudstack";
-        rev    = "v0.1.1";
-        sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb";
-      };
+      sha256  = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb";
     };
   cobbler =
     {
-      pname = "terraform-provider-cobbler";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-cobbler";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-cobbler";
-        rev    = "v0.1.0";
-        sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz";
-      };
+      sha256  = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz";
     };
   consul =
     {
-      pname = "terraform-provider-consul";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-consul";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-consul";
-        rev    = "v0.1.0";
-        sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94";
-      };
+      sha256  = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94";
     };
   datadog =
     {
-      pname = "terraform-provider-datadog";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-datadog";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-datadog";
-        rev    = "v0.1.0";
-        sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk";
-      };
+      sha256  = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk";
+    };
+  digitalocean =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-digitalocean";
+      version = "0.1.2";
+      sha256  = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg";
     };
   dme =
     {
-      pname = "terraform-provider-dme";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-dme";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-dme";
-        rev    = "v0.1.0";
-        sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
-      };
+      sha256  = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
+    };
+  dns =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-dns";
+      version = "0.1.1";
+      sha256  = "0ccp02rbvfvrb808mg053q5y7ghvxsl7p1gzw7pkm934i6j90g9n";
     };
   dnsimple =
     {
-      pname = "terraform-provider-dnsimple";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-dnsimple";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-dnsimple";
-        rev    = "v0.1.0";
-        sha256 = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h";
-      };
+      sha256  = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h";
+    };
+  docker =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-docker";
+      version = "0.1.0";
+      sha256  = "1nacxkyy12w4rj1bdf5ayqmmm47nwh362pcksr227rkwmsjlmg1m";
     };
   dyn =
     {
-      pname = "terraform-provider-dyn";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-dyn";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-dyn";
-        rev    = "v0.1.0";
-        sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p";
-      };
+      sha256  = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p";
+    };
+  external =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-external";
+      version = "0.1.0";
+      sha256  = "160f0avv6wbh11z54wy0qcq0zrcj4s31kn7a9x6zikv7v4hfnbza";
+    };
+  fastly =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-fastly";
+      version = "0.1.2";
+      sha256  = "1z7nsgqqzvily9rxr79yjv6jfx56896c9lxb8flmzwjz6b6mvnz7";
+    };
+  github =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-github";
+      version = "0.1.1";
+      sha256  = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0";
+    };
+  gitlab =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-gitlab";
+      version = "0.1.0";
+      sha256  = "1xjhpaq2agdshrl5jbq9ak2nxdy86iay5bw16zww2qc5ah21sdg2";
     };
   google =
     {
-      pname = "terraform-provider-google";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-google";
       version = "0.1.3";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-google";
-        rev    = "v0.1.3";
-        sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
-      };
+      sha256  = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
+    };
+  grafana =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-grafana";
+      version = "0.1.0";
+      sha256  = "1m2anc5cyn2p3yh4zn0y6wvzb0s2fz3sfdqm9psvx53266c2c81q";
+    };
+  heroku =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-heroku";
+      version = "0.1.0";
+      sha256  = "1f72lm95bnkhaf2accypdn7xsxcgkqri5fq5mriya4n34c61z3l6";
     };
   http =
     {
-      pname = "terraform-provider-http";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-http";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-http";
-        rev    = "v0.1.0";
-        sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah";
-      };
+      sha256  = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah";
+    };
+  icinga2 =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-icinga2";
+      version = "0.1.1";
+      sha256  = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v";
     };
   ignition =
     {
-      pname = "terraform-provider-ignition";
-      version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-ignition";
-        rev    = "v0.1.0";
-        sha256 = "03jvngd3fjyqmdzg2847p0k2fjyqykgmdng5vss4rcsn0n3b9d39";
-      };
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-ignition";
+      version = "0.2.0";
+      sha256  = "07qsyjzbz34nh7qrmw97sg0zrqbchky9r3ywrdz96pmpr1yjmwr7";
     };
   influxdb =
     {
-      pname = "terraform-provider-influxdb";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-influxdb";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-influxdb";
-        rev    = "v0.1.0";
-        sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
-      };
+      sha256  = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
+    };
+  kubernetes =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-kubernetes";
+      version = "1.0.0";
+      sha256  = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6";
+    };
+  librato =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-librato";
+      version = "0.1.0";
+      sha256  = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923";
+    };
+  local =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-local";
+      version = "0.1.0";
+      sha256  = "02m0wg0jasnzrayamjsc2hzi0ibj83v4d0hmw2xbrxk7vmk71lgq";
     };
   logentries =
     {
-      pname = "terraform-provider-logentries";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-logentries";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-logentries";
-        rev    = "v0.1.0";
-        sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
-      };
+      sha256  = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
     };
   mailgun =
     {
-      pname = "terraform-provider-mailgun";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-mailgun";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-mailgun";
-        rev    = "v0.1.0";
-        sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
-      };
+      sha256  = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
+    };
+  mysql =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-mysql";
+      version = "0.1.0";
+      sha256  = "0vjr97xf15va9qypjb9318h1nxr0sd6ydcy7ijnqb8538v3581mv";
+    };
+  newrelic =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-newrelic";
+      version = "0.1.1";
+      sha256  = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051";
     };
   nomad =
     {
-      pname = "terraform-provider-nomad";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-nomad";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-nomad";
-        rev    = "v0.1.0";
-        sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8";
-      };
+      sha256  = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8";
+    };
+  ns1 =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-ns1";
+      version = "0.1.0";
+      sha256  = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj";
+    };
+  null =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-null";
+      version = "0.1.0";
+      sha256  = "069yhsqi4jc14cay1gk7mwwmrg8xv90kj1k5qy3a2ypfbss4fcjp";
     };
   oneandone =
     {
-      pname = "terraform-provider-oneandone";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-oneandone";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-oneandone";
-        rev    = "v0.1.0";
-        sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i";
-      };
+      sha256  = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i";
+    };
+  opc =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-opc";
+      version = "0.1.2";
+      sha256  = "0c4ywav89lln9417zwflrp3qhcs7qf96rgcvm1msmpgglrhzwp2i";
+    };
+  openstack =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-openstack";
+      version = "0.2.1";
+      sha256  = "1zsswsgv7lzhfd0v8llbm18gsfg6xji0r3f9rnvpjqkffj4088ca";
     };
   opsgenie =
     {
-      pname = "terraform-provider-opsgenie";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-opsgenie";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-opsgenie";
-        rev    = "v0.1.0";
-        sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
-      };
+      sha256  = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
     };
   ovh =
     {
-      pname = "terraform-provider-ovh";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-ovh";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-ovh";
-        rev    = "v0.1.0";
-        sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr";
-      };
+      sha256  = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr";
+    };
+  packet =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-packet";
+      version = "0.1.0";
+      sha256  = "0dk10d4b10pdlhqgm6fqg0cn0ff78ss1x76inj6gfwrnbn2amhp0";
     };
   pagerduty =
     {
-      pname = "terraform-provider-pagerduty";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-pagerduty";
       version = "0.1.2";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-pagerduty";
-        rev    = "v0.1.2";
-        sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
-      };
+      sha256  = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
     };
   postgresql =
     {
-      pname = "terraform-provider-postgresql";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-postgresql";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-postgresql";
-        rev    = "v0.1.0";
-        sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
-      };
+      sha256  = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
+    };
+  powerdns =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-powerdns";
+      version = "0.1.0";
+      sha256  = "1k9xjx2smk6478dsrcnqk1k6r2pddpa9n8aghq5d1a5yhfsq5zzz";
     };
   profitbricks =
     {
-      pname = "terraform-provider-profitbricks";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-profitbricks";
       version = "0.1.2";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-profitbricks";
-        rev    = "v0.1.2";
-        sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp";
-      };
+      sha256  = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp";
+    };
+  rabbitmq =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-rabbitmq";
+      version = "0.1.0";
+      sha256  = "0vn8456f2al1f6rs1gn157c86qz1fxz8sqphbr9lvdhy1jw1q2vp";
+    };
+  rancher =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-rancher";
+      version = "0.2.0";
+      sha256  = "05aci6cjrs7rv6hqhvcqy1i0nr8azds8flnrc7vba0nyy6v192qg";
+    };
+  random =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-random";
+      version = "0.1.0";
+      sha256  = "1lbv5yiw4qfsqm3gxf37gwadgp7g6ki0n70mj00d8l6v6jd0mdl5";
+    };
+  rundeck =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-rundeck";
+      version = "0.1.0";
+      sha256  = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg";
     };
   scaleway =
     {
-      pname = "terraform-provider-scaleway";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-scaleway";
       version = "0.1.1";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-scaleway";
-        rev    = "v0.1.1";
-        sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6";
-      };
+      sha256  = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6";
+    };
+  softlayer =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-softlayer";
+      version = "0.0.1";
+      sha256  = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq";
+    };
+  spotinst =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-spotinst";
+      version = "0.1.0";
+      sha256  = "04sxdbx6qjxixrv9shnp8fxkss6pylqmphlm1l4q5c83dwk96pka";
+    };
+  statuscake =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-statuscake";
+      version = "0.1.0";
+      sha256  = "084520cak2krwpks2ipqcjfw3k4rrzn6gqqncz8c4i6g01f1m7yg";
+    };
+  template =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-template";
+      version = "0.1.1";
+      sha256  = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn";
+    };
+  terraform =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-terraform";
+      version = "0.1.0";
+      sha256  = "1w465853gwffpydb7idvg7bk8ygadgy08s04fxsqc8i2683jbpiz";
     };
   tls =
     {
-      pname = "terraform-provider-tls";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-tls";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-tls";
-        rev    = "v0.1.0";
-        sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7";
-      };
+      sha256  = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7";
     };
   triton =
     {
-      pname = "terraform-provider-triton";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-triton";
       version = "0.1.2";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-triton";
-        rev    = "v0.1.2";
-        sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw";
-      };
+      sha256  = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw";
     };
   ultradns =
     {
-      pname = "terraform-provider-ultradns";
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-ultradns";
       version = "0.1.0";
-      src = {
-        owner  = "terraform-providers";
-        repo   = "terraform-provider-ultradns";
-        rev    = "v0.1.0";
-        sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
-      };
+      sha256  = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
+    };
+  vault =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-vault";
+      version = "0.1.0";
+      sha256  = "1rr4gaqfr6panjjdb5xx9vbq7701zjps0l75zi526kij1pph98p1";
+    };
+  vcd =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-vcd";
+      version = "1.0.0";
+      sha256  = "0sjqdb37lalvizf4imxwn7nmry1c76dw2fpnrfmal34gghddm91p";
+    };
+  vsphere =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-vsphere";
+      version = "0.2.2";
+      sha256  = "0d5d4wip57zmv9kqh4zr9mz8ylffa2qcf1vmx827rwyqdr25xvaz";
     };
-  # Broken with go/src/github.com/terraform-providers/terraform-provider-vsphere/vendor/github.com/hashicorp/terraform/config/testing.go:9: t.Helper undefined (type *testing.T has no field or method Helper)
-  # vsphere =
-    # {
-      # pname = "terraform-provider-vsphere";
-      # version = "0.2.1";
-      # src = {
-        # owner  = "terraform-providers";
-        # repo   = "terraform-provider-vsphere";
-        # rev    = "v0.2.1";
-        # sha256 = "04vz34w28nx7j6wlikgjabrb2l5fxj9icfm8d34w2fffz63nk77l";
-      # };
-    # };
 }
diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix
index df59439c7bf..8d41df24d8c 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix
@@ -1,12 +1,21 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub }:
 let
   list = import ./data.nix;
-  toDrv = _: data:
+
+  toDrv = data:
     buildGoPackage rec {
-      inherit (data) pname version;
-      name = "${pname}-${version}";
-      goPackagePath = "github.com/${data.src.owner}/${data.src.repo}";
-      src = fetchFromGitHub data.src;
+      inherit (data) owner repo version sha256;
+      name = "${repo}-${version}";
+      goPackagePath = "github.com/${owner}/${repo}";
+      src = fetchFromGitHub {
+        inherit owner repo sha256;
+        rev = "v${version}";
+      };
     };
+
+  maybeDrv = name: data:
+    # vsphere is currently broken
+    if name == "vsphere" then null
+    else toDrv data;
 in
-  lib.mapAttrs toDrv list
+  lib.mapAttrs maybeDrv list
diff --git a/pkgs/applications/networking/cluster/terraform/providers/template.nix b/pkgs/applications/networking/cluster/terraform/providers/template.nix
deleted file mode 100644
index 16650af870b..00000000000
--- a/pkgs/applications/networking/cluster/terraform/providers/template.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "terraform-provider-template";
-  name = "${pname}-${version}";
-  version = "0.1.1";
-
-  goPackagePath = "github.com/terraform-providers/terraform-provider-template";
-
-  src = fetchFromGitHub {
-    owner  = "terraform-providers";
-    repo   = pname;
-    rev    = "v${version}";
-    sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index 42c55a4c19d..d857e4f1870 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -10,18 +10,19 @@ set -euo pipefail
 GET() {
   local url=$1
   echo "fetching $url" >&2
-  curl -#fL "$url"
+  curl -#fL -u "$GITHUB_AUTH" "$url"
 }
 
 get_org_repos() {
   local org=$1
-  GET "https://api.github.com/orgs/$org/repos" | jq -r '.[].name'
+  local page=1
+  GET "https://api.github.com/orgs/$org/repos?per_page=100" | jq -r '.[].name'
 }
 
 get_repo_tags() {
   local owner=$1
   local repo=$2
-  GET "https://api.github.com/repos/$owner/$repo/git/refs/tags" | \
+  GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \
     jq -r '.[].ref' | \
     cut -d '/' -f 3- | \
     sort --version-sort
@@ -37,25 +38,37 @@ prefetch_github() {
 echo_entry() {
   local owner=$1
   local repo=$2
-  local rev=$3
-  local sha256=$4
   local version=${3:1}
+  local sha256=$4
   cat <<EOF
 {
-  pname = "$repo";
+  owner   = "$owner";
+  repo    = "$repo";
   version = "$version";
-  src = {
-    owner  = "$owner";
-    repo   = "$repo";
-    rev    = "$rev";
-    sha256 = "$sha256";
-  };
+  sha256  = "$sha256";
 };
 EOF
 }
 
 indent() { sed 's/^/    /'; }
 
+## Main ##
+
+cd "$(dirname "$0")"
+
+if [[ -z "${GITHUB_AUTH:-}" ]]; then
+  cat <<'HELP'
+Missing the GITHUB_AUTH env. Thi is required to work around the 60 request
+per hour rate-limit.
+
+Go to https://github.com/settings/tokens and create a new token with the
+"public_repo" scope.
+
+Then `export GITHUB_AUTH=<your user>:<your token>` and run this script again.
+HELP
+  exit 1
+fi
+
 org=terraform-providers
 
 repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
@@ -63,9 +76,11 @@ repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
 
 # Get all the providers with index
 
-echo -n > data.nix
+cat <<HEADER > data.nix
+# Generated with ./update-all
+{
+HEADER
 
-echo "{" >> data.nix
 for repo in $repos; do
   echo "*** $repo ***"
   name=$(echo "$repo" | cut -d - -f 3-)
@@ -77,6 +92,9 @@ for repo in $repos; do
     echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent
   } >> data.nix
 done
-echo "}" >> data.nix
+
+cat <<FOOTER >> data.nix
+}
+FOOTER
 
 echo Done.

From e9183fd2d4d3bb222b2ce3492935ec26d207524a Mon Sep 17 00:00:00 2001
From: Jason Miller <jason@milr.com>
Date: Fri, 8 Sep 2017 11:45:17 -0700
Subject: [PATCH 88/88] tigervnc: correct default ssh client path (#29084)

* tigervnc: correct default ssh client path

The -via command sets up an ssh tunnel, but is hardcoded to /usr/bin/ssh
upstream.  This patches it to use the nixpkgs openssh client.

* tigervnc: patch ssh path correctly
---
 pkgs/tools/admin/tigervnc/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 3df01dccced..369c2366fc1 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -5,7 +5,7 @@
 , cmake, gettext, libtool
 , glproto, mesa_glu
 , gnutls, pam, nettle
-, xterm }:
+, xterm, openssh }:
 
 with stdenv.lib;
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   inherit fontDirectories;
 
-  patchPhase = ''
+  postPatch = ''
     sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver
     fontPath=
     for i in $fontDirectories; do
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
       done
     done
     sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver
+    substituteInPlace vncviewer/vncviewer.cxx \
+       --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh'
   '';
 
   dontUseCmakeBuildDir = true;