From 1c8cb703a6934ac37bbc8d08cc9e8a6ff792076c Mon Sep 17 00:00:00 2001
From: Andrew Scott <andj.scott@gmail.com>
Date: Tue, 25 Oct 2016 12:58:49 +0100
Subject: [PATCH 01/70] mlocate: init at version 0.26

---
 nixos/modules/misc/locate.nix       | 11 ++++++++++-
 pkgs/tools/misc/mlocate/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/mlocate/default.nix

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 27a0fa6cf3d..3cb5bb1a351 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -15,6 +15,15 @@ in {
       '';
     };
 
+    locate = mkOption {
+      type = types.package;
+      default = pkgs.findutils;
+      example = "pkgs.mlocate";
+      description = ''
+        The locate implementation to use
+      '';
+    };
+
     interval = mkOption {
       type = types.str;
       default = "02:15";
@@ -77,7 +86,7 @@ in {
         script =
           ''
             mkdir -m 0755 -p $(dirname ${toString cfg.output})
-            exec updatedb \
+            exec ${cfg.locate}/bin/updatedb \
               --localuser=${cfg.localuser} \
               ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
               --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
new file mode 100644
index 00000000000..6dbd0bcc439
--- /dev/null
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mlocate-${version}";
+  version = "0.26";
+
+  src = fetchurl {
+    url = "http://fedorahosted.org/releases/m/l/mlocate/${name}.tar.xz";
+    sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
+  };
+
+  buildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    description = "Merging locate is an utility to index and quickly search for files";
+    homepage = https://fedorahosted.org/mlocate/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 146e13c21e3..dbf9ef071b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13881,6 +13881,8 @@ in
 
   diffpdf = callPackage ../applications/misc/diffpdf { };
 
+  mlocate = callPackage ../tools/misc/mlocate { };
+
   mypaint = callPackage ../applications/graphics/mypaint { };
 
   mythtv = callPackage ../applications/video/mythtv { };

From 33d778a1ca60f956f25b83ba85a01ac4048fdab5 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Mon, 31 Oct 2016 12:06:32 -0800
Subject: [PATCH 02/70] qsyncthingtray: init at 0.5.5rc2

---
 .../misc/qsyncthingtray/default.nix           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/applications/misc/qsyncthingtray/default.nix

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
new file mode 100644
index 00000000000..96d2aa0c85b
--- /dev/null
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub
+, qtbase, qtwebengine
+, qmakeHook }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.5rc2";
+  name = "qsyncthingtray-${version}";
+
+  src = fetchFromGitHub {
+    owner = "sieren";
+    repo = "QSyncthingTray";
+    rev = "${version}";
+    sha256 = "1x7j7ylgm4ih06m7gb5ls3c9bdjwbra675489caq2f04kgw4yxq2";
+  };
+
+  buildInputs = [ qtbase qtwebengine ];
+  nativeBuildInputs = [ qmakeHook ];
+  enableParallelBuilding = true;
+  
+  postInstall = ''
+    mkdir -p $out/bin
+    cp binary/QSyncthingTray $out/bin
+    cat > $out/bin/qt.conf <<EOF
+    [Paths]
+    Prefix = ${qtwebengine.out}
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sieren/QSyncthingTray/;
+    description = "A Traybar Application for Syncthing written in C++";
+    longDescription = ''
+        A cross-platform status bar for Syncthing.
+        Currently supports OS X, Windows and Linux.
+        Written in C++ with Qt.
+    '';
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ zraexy ];
+    platforms = platforms.all;
+  };
+}

From 9b0cec5eb29e7232d05f8556387a3de33d7861c0 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Mon, 31 Oct 2016 12:14:16 -0800
Subject: [PATCH 03/70] qsyncthingtray: init at 0.5.5rc2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05195015670..e8feef5a51d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14201,6 +14201,8 @@ in
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
     qt = qt4;
   };
+  
+  qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
 

From b7996efeae6c3fe108ba761e79c8eeb5ebb77e51 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Mon, 31 Oct 2016 12:17:32 -0800
Subject: [PATCH 04/70] maintainers: add zraexy

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6ff64599540..b1b1118aa32 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -483,4 +483,5 @@
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
   zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
+  zraexy = "David Mell <zraexy@gmail.com>";
 }

From 1c3c59ebd693a55d2a736b2b42f6f976b892cf8b Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 16 Dec 2016 22:15:21 -0200
Subject: [PATCH 05/70] qwt6_qt4: init at 6.1.2

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

diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix
new file mode 100644
index 00000000000..7774ab7df9e
--- /dev/null
+++ b/pkgs/development/libraries/qwt/6_qt4.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, qt4, qmake4Hook }:
+
+stdenv.mkDerivation rec {
+  name = "qwt-6.1.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qwt/${name}.tar.bz2";
+    sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b";
+  };
+
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ qmake4Hook ];
+
+  postPatch = ''
+    sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
+  '';
+
+  qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
+
+  meta = with stdenv.lib; {
+    description = "Qt widgets for technical applications";
+    homepage = http://qwt.sourceforge.net/;
+    # LGPL 2.1 plus a few exceptions (more liberal)
+    license = stdenv.lib.licenses.qwt;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+    branch = "6";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f8f4bb2bb..0afba55879f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9061,6 +9061,8 @@ in
 
   qwt = callPackage ../development/libraries/qwt {};
 
+  qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { };
+
   qxt = callPackage ../development/libraries/qxt {};
 
   rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};

From 662aa495dfa0e07610f4a9248501a8f6fca0740d Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 16 Dec 2016 22:17:29 -0200
Subject: [PATCH 06/70] gplates: init at 2.0.0

---
 .../science/misc/gplates/boostfix.patch       | 612 ++++++++++++++++++
 .../science/misc/gplates/default.nix          |  24 +
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 638 insertions(+)
 create mode 100644 pkgs/applications/science/misc/gplates/boostfix.patch
 create mode 100644 pkgs/applications/science/misc/gplates/default.nix

diff --git a/pkgs/applications/science/misc/gplates/boostfix.patch b/pkgs/applications/science/misc/gplates/boostfix.patch
new file mode 100644
index 00000000000..e429600b709
--- /dev/null
+++ b/pkgs/applications/science/misc/gplates/boostfix.patch
@@ -0,0 +1,612 @@
+--- a/src/app-logic/ApplicationState.h
++++ b/src/app-logic/ApplicationState.h
+@@ -33,6 +33,7 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "FeatureCollectionFileState.h"
+ #include "Layer.h"
+ #include "LayerTaskRegistry.h"
+@@ -48,6 +49,7 @@
+ #include "model/ModelInterface.h"
+ #include "model/types.h"
+ #include "model/WeakReferenceCallback.h"
++#endif
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers
+--- a/src/app-logic/CoRegistrationLayerTask.h
++++ b/src/app-logic/CoRegistrationLayerTask.h
+@@ -32,11 +32,13 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "CoRegistrationLayerParams.h"
+ #include "CoRegistrationLayerProxy.h"
+ #include "LayerTask.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/app-logic/RasterLayerTask.h
++++ b/src/app-logic/RasterLayerTask.h
+@@ -32,11 +32,13 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "RasterLayerParams.h"
+ #include "RasterLayerProxy.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructGraph.h
++++ b/src/app-logic/ReconstructGraph.h
+@@ -46,6 +46,7 @@
+ #include <boost/lambda/construct.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "FeatureCollectionFileState.h"
+ #include "Layer.h"
+ #include "Reconstruction.h"
+@@ -53,6 +54,7 @@
+ 
+ #include "model/FeatureCollectionHandle.h"
+ #include "model/WeakReferenceCallback.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructLayerTask.h
++++ b/src/app-logic/ReconstructLayerTask.h
+@@ -33,6 +33,7 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "ReconstructLayerProxy.h"
+ #include "ReconstructLayerParams.h"
+@@ -42,6 +43,7 @@
+ #include "maths/types.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructScalarCoverageLayerParams.h
++++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h
+@@ -30,6 +30,7 @@
+ #include <boost/optional.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerParams.h"
+ #include "ReconstructScalarCoverageLayerProxy.h"
+ #include "ReconstructScalarCoverageParams.h"
+@@ -38,6 +39,7 @@
+ #include "property-values/ValueObjectType.h"
+ 
+ #include "utils/SubjectObserverToken.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/ReconstructScalarCoverageLayerTask.h
++++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h
+@@ -30,12 +30,14 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "ReconstructScalarCoverageLayerParams.h"
+ #include "ReconstructScalarCoverageLayerProxy.h"
+ #include "ScalarCoverageFeatureProperties.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/TopologyNetworkResolverLayerTask.h
++++ b/src/app-logic/TopologyNetworkResolverLayerTask.h
+@@ -33,6 +33,7 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerParams.h"
+ #include "LayerTask.h"
+ #include "ReconstructLayerProxy.h"
+@@ -41,6 +42,7 @@
+ #include "TopologyNetworkResolverLayerProxy.h"
+ 
+ #include "model/FeatureCollectionHandle.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/app-logic/VelocityFieldCalculatorLayerTask.h
++++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h
+@@ -32,9 +32,11 @@
+ #include <QObject>
+ #include <QString>
+ 
++#ifndef Q_MOC_RUN
+ #include "LayerTask.h"
+ #include "VelocityFieldCalculatorLayerParams.h"
+ #include "VelocityFieldCalculatorLayerProxy.h"
++#endif
+ 
+ #include "model/FeatureCollectionHandle.h"
+ 
+--- a/src/data-mining/CoRegConfigurationTable.h
++++ b/src/data-mining/CoRegConfigurationTable.h
+@@ -28,6 +28,7 @@
+ 
+ #include <vector>
+ #include <map>
++#ifndef Q_MOC_RUN
+ #include <boost/operators.hpp>
+ 
+ #include "CoRegFilter.h"
+@@ -44,6 +45,7 @@
+ #include "scribe/Transcribe.h"
+ #include "scribe/TranscribeContext.h"
+ 
++#endif
+ 
+ namespace GPlatesDataMining
+ {
+--- a/src/gui/CommandServer.h
++++ b/src/gui/CommandServer.h
+@@ -38,9 +38,11 @@
+ #include <QRegExp>
+ #include <QtXml/QXmlStreamReader>
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ 
+ #include "presentation/ViewState.h"
++#endif
+ 
+ namespace GPlatesGui
+ {
+--- a/src/gui/FeatureTableModel.h
++++ b/src/gui/FeatureTableModel.h
+@@ -32,8 +32,10 @@
+ #include <QItemSelection>
+ #include <QHeaderView>
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/Layer.h"
+ #include "app-logic/ReconstructionGeometry.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/gui/TopologyTools.h
++++ b/src/gui/TopologyTools.h
+@@ -35,6 +35,7 @@
+ #include <QDebug>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "TopologySectionsContainer.h"
+ 
+ #include "app-logic/Layer.h"
+@@ -64,6 +65,7 @@
+ #include "utils/UnicodeStringUtils.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/opengl/GLVisualLayers.h
++++ b/src/opengl/GLVisualLayers.h
+@@ -35,6 +35,7 @@
+ #include <boost/shared_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "GLAgeGridMaskSource.h"
+ #include "GLContext.h"
+ #include "GLLight.h"
+@@ -79,6 +80,7 @@
+ 
+ #include "view-operations/RenderedGeometry.h"
+ #include "view-operations/ScalarField3DRenderParameters.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/presentation/VisualLayer.h
++++ b/src/presentation/VisualLayer.h
+@@ -32,6 +32,7 @@
+ #include <QString>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "VisualLayerParams.h"
+ #include "VisualLayerType.h"
+ 
+@@ -42,6 +43,7 @@
+ #include "model/FeatureCollectionHandle.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/presentation/VisualLayers.h
++++ b/src/presentation/VisualLayers.h
+@@ -34,6 +34,7 @@
+ #include <boost/weak_ptr.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "VisualLayer.h"
+ 
+ #include "app-logic/FeatureCollectionFileState.h"
+@@ -42,6 +43,7 @@
+ #include "gui/Symbol.h"
+ 
+ #include "view-operations/RenderedGeometryCollection.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h
++++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h
+@@ -39,6 +39,7 @@
+ #include "GPlatesDialog.h"
+ #include "InformationDialog.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/AssignPlateIds.h"
+ 
+ #include "file-io/File.h"
+@@ -47,6 +48,7 @@
+ #include "model/ModelInterface.h"
+ 
+ #include "presentation/VisualLayer.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h
++++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h
+@@ -38,6 +38,7 @@
+ 
+ #include "OpenDirectoryDialog.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ #include "app-logic/Layer.h"
+ #include "app-logic/LayerInputChannelName.h"
+@@ -45,6 +46,7 @@
+ 
+ #include "data-mining/CheckAttrTypeVisitor.h"
+ #include "data-mining/CoRegConfigurationTable.h"
++#endif
+ 
+ #include "global/PointerTraits.h"
+ 
+--- a/src/qt-widgets/CoRegistrationOptionsWidget.h
++++ b/src/qt-widgets/CoRegistrationOptionsWidget.h
+@@ -31,6 +31,7 @@
+ #include "CoRegistrationLayerConfigurationDialog.h"
+ #include "CoRegistrationOptionsWidgetUi.h"
+ #include "LayerOptionsWidget.h"
++#ifndef Q_MOC_RUN
+ #include "CoRegistrationResultTableDialog.h"
+ 
+ #include "app-logic/CoRegistrationLayerTask.h"
+@@ -41,7 +42,7 @@
+ #include "file-io/File.h"
+ 
+ #include "presentation/VisualLayer.h"
+-
++#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/qt-widgets/CoRegistrationResultTableDialog.h
++++ b/src/qt-widgets/CoRegistrationResultTableDialog.h
+@@ -36,6 +36,7 @@
+ #include <QEvent>
+ #include <qevent.h>
+ 
++#ifndef Q_MOC_RUN
+ #include "CoRegistrationResultTableDialogUi.h"
+ #include "SaveFileDialog.h"
+ 
+@@ -43,6 +44,7 @@
+ #include "data-mining/OpaqueDataToQString.h"
+ 
+ #include "presentation/VisualLayer.h"
++#endif
+ 
+ namespace GPlatesPresentation
+ {
+--- a/src/qt-widgets/DrawStyleDialog.h
++++ b/src/qt-widgets/DrawStyleDialog.h
+@@ -33,6 +33,7 @@
+ #include <QMutex>
+ #include <QMutexLocker>
+ 
++#ifndef Q_MOC_RUN
+ #include "DrawStyleDialogUi.h"
+ #include "GPlatesDialog.h"
+ #include "PythonArgumentWidget.h"
+@@ -41,6 +42,7 @@
+ #include "gui/PythonConfiguration.h"
+ 
+ #include "presentation/Application.h"
++#endif
+ 
+ namespace GPlatesAppLogic
+ {
+--- a/src/qt-widgets/EditTableActionWidget.h
++++ b/src/qt-widgets/EditTableActionWidget.h
+@@ -27,8 +27,11 @@
+ #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H
+ 
+ #include <QWidget>
++
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
+ #include "EditTableActionWidgetUi.h"
++#endif
+ 
+ namespace GPlatesQtWidgets
+ {
+--- a/src/qt-widgets/GlobeCanvas.h
++++ b/src/qt-widgets/GlobeCanvas.h
+@@ -41,6 +41,7 @@
+ #include <QPainter>
+ #include <QtOpenGL/qgl.h>
+ 
++#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ #include "gui/Globe.h"
+ #include "gui/ViewportZoom.h"
+@@ -58,6 +59,7 @@
+ #include "qt-widgets/SceneView.h"
+ 
+ #include "view-operations/RenderedGeometryFactory.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/LogDialog.h
++++ b/src/qt-widgets/LogDialog.h
+@@ -34,7 +34,9 @@
+ #include "GPlatesDialog.h"
+ #include "LogDialogUi.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/ApplicationState.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MapCanvas.h
++++ b/src/qt-widgets/MapCanvas.h
+@@ -39,6 +39,7 @@
+ #include <QSize>
+ #include <QTransform>
+ 
++#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ #include "gui/Map.h"
+ #include "gui/TextOverlay.h"
+@@ -47,6 +48,7 @@
+ #include "opengl/GLMatrix.h"
+ #include "opengl/GLOffScreenContext.h"
+ #include "opengl/GLVisualLayers.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MapView.h
++++ b/src/qt-widgets/MapView.h
+@@ -36,6 +36,7 @@
+ #include <QGLWidget>
+ #include <QMouseEvent>
+ 
++#ifndef Q_MOC_RUN
+ #include "gui/ColourScheme.h"
+ 
+ #include "maths/LatLonPoint.h"
+@@ -44,6 +45,7 @@
+ #include "opengl/GLVisualLayers.h"
+ 
+ #include "qt-widgets/SceneView.h"
++#endif
+ 
+ 
+ namespace GPlatesGui
+--- a/src/qt-widgets/MergeReconstructionLayersDialog.h
++++ b/src/qt-widgets/MergeReconstructionLayersDialog.h
+@@ -33,7 +33,9 @@
+ 
+ #include "MergeReconstructionLayersDialogUi.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "app-logic/Layer.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/RasterLayerOptionsWidget.h
++++ b/src/qt-widgets/RasterLayerOptionsWidget.h
+@@ -31,6 +31,7 @@
+ #include <QString>
+ #include <QToolButton>
+ 
++#ifndef Q_MOC_RUN
+ #include "RasterLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -40,6 +41,7 @@
+ 
+ #include "gui/BuiltinColourPaletteType.h"
+ #include "gui/RasterColourPalette.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h
++++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h
+@@ -28,6 +28,7 @@
+ 
+ #include <utility>
+ 
++#ifndef Q_MOC_RUN
+ #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -37,6 +38,7 @@
+ 
+ #include "gui/BuiltinColourPaletteType.h"
+ #include "gui/RasterColourPalette.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h
++++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h
+@@ -30,6 +30,7 @@
+ #include <vector>
+ #include <QSlider>
+ 
++#ifndef Q_MOC_RUN
+ #include "ScalarField3DLayerOptionsWidgetUi.h"
+ 
+ #include "LayerOptionsWidget.h"
+@@ -41,6 +42,7 @@
+ #include "gui/RasterColourPalette.h"
+ 
+ #include "view-operations/ScalarField3DRenderParameters.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/TotalReconstructionPolesDialog.h
++++ b/src/qt-widgets/TotalReconstructionPolesDialog.h
+@@ -32,12 +32,14 @@
+ #include <boost/weak_ptr.hpp>
+ #include <QDialog>
+ 
++#ifndef Q_MOC_RUN
+ #include "TotalReconstructionPolesDialogUi.h"
+ 
+ #include "GPlatesDialog.h"
+ #include "SaveFileDialog.h"
+ 
+ #include "presentation/VisualLayer.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/qt-widgets/VisualLayersComboBox.h
++++ b/src/qt-widgets/VisualLayersComboBox.h
+@@ -32,8 +32,10 @@
+ #include <QComboBox>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "presentation/VisualLayer.h"
+ #include "presentation/VisualLayerType.h"
++#endif
+ 
+ 
+ namespace GPlatesPresentation
+--- a/src/qt-widgets/VisualLayerWidget.h
++++ b/src/qt-widgets/VisualLayerWidget.h
+@@ -36,11 +36,13 @@
+ #include <QMenu>
+ #include <QStackedWidget>
+ 
++#ifndef Q_MOC_RUN
+ #include "VisualLayerWidgetUi.h"
+ 
+ #include "app-logic/Layer.h"
+ 
+ #include "gui/Colour.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/view-operations/InternalGeometryBuilder.h
++++ b/src/view-operations/InternalGeometryBuilder.h
+@@ -30,9 +30,11 @@
+ #include <vector>
+ #include <boost/optional.hpp>
+ 
++#ifndef Q_MOC_RUN
+ #include "maths/GeometryOnSphere.h"
+ #include "maths/GeometryType.h"
+ #include "maths/PointOnSphere.h"
++#endif
+ 
+ namespace GPlatesViewOperations
+ {
+--- a/src/view-operations/RenderedGeometryCollection.h
++++ b/src/view-operations/RenderedGeometryCollection.h
+@@ -39,7 +39,9 @@
+ #include <boost/foreach.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "RenderedGeometryLayer.h"
++#endif
+ 
+ namespace GPlatesViewOperations
+ {
+--- a/src/view-operations/RenderedGeometryFactory.h
++++ b/src/view-operations/RenderedGeometryFactory.h
+@@ -33,6 +33,7 @@
+ #include <QString>
+ #include <QFont>
+ 
++#ifndef Q_MOC_RUN
+ #include "RenderedGeometry.h"
+ #include "RenderedColouredEdgeSurfaceMesh.h"
+ #include "RenderedColouredTriangleSurfaceMesh.h"
+@@ -62,6 +63,7 @@
+ #include "property-values/TextContent.h"
+ 
+ #include "view-operations/ScalarField3DRenderParameters.h"
++#endif
+ 
+ 
+ namespace GPlatesAppLogic
+--- a/src/view-operations/RenderedGeometryLayer.h
++++ b/src/view-operations/RenderedGeometryLayer.h
+@@ -35,10 +35,12 @@
+ #include <boost/optional.hpp>
+ #include <QObject>
+ 
++#ifndef Q_MOC_RUN
+ #include "RenderedGeometry.h"
+ 
+ #include "maths/CubeQuadTreeLocation.h"
+ 
++#endif
+ 
+ namespace GPlatesMaths
+ {
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
new file mode 100644
index 00000000000..9dd7b6b72db
--- /dev/null
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "gplates-${version}";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2";
+    sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw";
+  };
+
+  patches = [
+    ./boostfix.patch
+  ];
+
+  buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop software for the interactive visualisation of plate-tectonics";
+    homepage = https://www.gplates.org;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0afba55879f..c1143ab7a75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16894,6 +16894,8 @@ in
 
   fityk = callPackage ../applications/science/misc/fityk { };
 
+  gplates = callPackage ../applications/science/misc/gplates { };
+
   gravit = callPackage ../applications/science/astronomy/gravit { };
 
   golly = callPackage ../applications/science/misc/golly { };

From 515573ef7f993787abacf31e3235ccfa59bc967e Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Sat, 17 Dec 2016 21:50:23 +0000
Subject: [PATCH 07/70] pg_similarity: init at 1.0

---
 .../sql/postgresql/pg_similarity/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/pg_similarity/default.nix

diff --git a/pkgs/servers/sql/postgresql/pg_similarity/default.nix b/pkgs/servers/sql/postgresql/pg_similarity/default.nix
new file mode 100644
index 00000000000..32945c9fa62
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/pg_similarity/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, gcc, postgresql }:
+
+stdenv.mkDerivation {
+
+  name = "pg_similarity-1.0";
+  src = fetchFromGitHub {
+    owner = "eulerto";
+    repo = "pg_similarity";
+    rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5";
+    sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim";
+  };
+
+  buildInputs = [ postgresql gcc ];
+  buildPhase = "USE_PGXS=1 make";
+  installPhase = ''
+    mkdir -p $out/bin   # for buildEnv to setup proper symlinks
+    install -D pg_similarity.so -t $out/lib/
+    install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension
+  '';
+
+  meta = {
+    description = ''
+       pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation
+       is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional
+       operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function).
+    '';
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ danbst ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f81a39bf9d..1771ce7eb2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8892,6 +8892,8 @@ in
 
   pg_repack = callPackage ../servers/sql/postgresql/pg_repack {};
 
+  pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};
+
   phonon = callPackage ../development/libraries/phonon {};
 
   phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};

From 7e54f35d65737f55525f8328dd9309bdb93b5ff9 Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_git@thebeckmeyers.xyz>
Date: Sun, 18 Dec 2016 17:08:33 -0500
Subject: [PATCH 08/70] mm: init at 2016.11.04

---
 .../instant-messengers/mm/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/mm/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
new file mode 100644
index 00000000000..a75835b3c7e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchFromGitLab }:
+
+buildGoPackage rec {
+  name = "mm-${version}";
+  version = "2016.11.04";
+
+  goPackagePath = "gitlab.com/meutraa/mm";
+
+  src = fetchFromGitLab {
+    owner = "meutraa";
+    repo = "mm";
+    rev = "473fdd97285168054b672dbad2ffc4047324c518";
+    sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp";
+  };
+
+  meta = {
+    description = "A file system based matrix client";
+    homepage = https://gitlab.com/meutraa/mm;
+    license = stdenv.lib.licenses.isc;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 210fdcde7f6..21227775ef9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13971,6 +13971,8 @@ in
 
   normalize = callPackage ../applications/audio/normalize { };
 
+  mm = callPackage ../applications/networking/instant-messengers/mm { };
+
   mplayer = callPackage ../applications/video/mplayer ({
     pulseSupport = config.pulseaudio or false;
     libdvdnav = libdvdnav_4_2_1;

From ca2fa4416e59ec72323e8b1bec52b8403d239e8e Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Sun, 25 Dec 2016 23:17:11 -0800
Subject: [PATCH 09/70] nginx: Allow GD to be optional.

This commit permits incantations like `pkgs.nginx.override { gd = null; }` to
produce a slimmed-down nginx.

When used, this functionality removes a pile of stuff from nginx's closure.
The resulting nginx's closure:

    $ nix-store -q -R /nix/store/wk3h0a4dmdmjmxkbd0q09iw0wfq0yzpz-nginx-1.10.2 | wc -l
    12
    $ nix-store -q -R /nix/store/gpcx77anqrj05qz0mrwm7hf4wgxry5py-nginx-1.10.2 | wc -l
    24
---
 pkgs/servers/http/nginx/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index b1d70907e28..5d5a98ad8a8 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation {
     "--with-http_realip_module"
     "--with-http_addition_module"
     "--with-http_xslt_module"
-    "--with-http_image_filter_module"
     "--with-http_geoip_module"
     "--with-http_sub_module"
     "--with-http_dav_module"
@@ -44,6 +43,7 @@ stdenv.mkDerivation {
     # Install destination problems
     # "--with-http_perl_module"
   ] ++ optional withStream "--with-stream"
+    ++ optional (gd != null) "--with-http_image_filter_module"
     ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
     ++ map (mod: "--add-module=${mod.src}") modules;
 

From c64789937b746b288c586a5658c9e1cab0f8455b Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <skosyrev@ptsecurity.com>
Date: Sun, 25 Dec 2016 16:45:37 +0300
Subject: [PATCH 10/70] emacs-packages:  init haskell-unicode-input-method at
 20110905

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 430da89fc22..092f352ec5b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -238,6 +238,22 @@ let
     };
   };
 
+  haskell-unicode-input-method = melpaBuild rec {
+    pname = "emacs-haskell-unicode-input-method";
+    version = "20110905.2307";
+    src = fetchFromGitHub {
+      owner = "roelvandijk";
+      repo = "emacs-haskell-unicode-input-method";
+      rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
+      sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
+    };
+    packageRequires = [];
+    meta = {
+      homepage = "https://melpa.org/#haskell-unicode-input-method/";
+      license = lib.licenses.free;
+    };
+  };
+
   hindent = melpaBuild rec {
     pname = "hindent";
     version = external.hindent.version;

From 28d6aee3714bbcb8a0842e83d081792332d8fd4a Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Mon, 26 Dec 2016 22:27:09 +0100
Subject: [PATCH 11/70] libstrophe: 0.8.8 -> 0.9.1

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

diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix
index b5eb2ae7dd7..76aa014392b 100644
--- a/pkgs/development/libraries/libstrophe/default.nix
+++ b/pkgs/development/libraries/libstrophe/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libstrophe-${version}";
-  version = "0.8.8";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "strophe";
     repo = "libstrophe";
     rev = version;
-    sha256 = "1xzyqqf99r0jfd0g3v0zwc68sac6y25v1d4m365zpc14l02midis";
+    sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml";
   };
 
   buildInputs = [ automake autoconf openssl expat libtool pkgconfig check ];
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
       runs well on both Linux, Unix, and Windows based platforms.
     '';
     homepage = http://strophe.im/libstrophe/;
-    license = stdenv.lib.licenses.gpl3;
+    license = with stdenv.lib.licenses; [gpl3 mit];
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.devhell ];
+    maintainers = with stdenv.lib.maintainers; [devhell flosse];
   };
 }

From 346c1db2ac336e15f2c0019292963a9c5ba37f58 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 25 Dec 2016 01:22:31 +0100
Subject: [PATCH 12/70] xournal: Allow to build it on darwin with X11 backend

---
 pkgs/applications/graphics/xournal/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 669fc5a28a7..97b418f08c1 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ghostscript atk gtk2 glib fontconfig freetype
-    libgnomecanvas libgnomeprint libgnomeprintui
+    libgnomecanvas
     pango libX11 xproto zlib poppler
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
+    libgnomeprint libgnomeprintui
   ];
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
@@ -47,11 +49,11 @@ stdenv.mkDerivation rec {
       cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xournal.sourceforge.net/;
     description = "Note-taking application (supposes stylus)";
-    maintainers = [ stdenv.lib.maintainers.guibert ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.guibert ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From febab15b01fc2ed68e688e3819941a2c62091d8a Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Tue, 27 Dec 2016 08:45:37 +0100
Subject: [PATCH 13/70] gtk2: Enable xinput for Darwin

---
 pkgs/development/libraries/gtk+/2.x.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 91407e556c0..ba12b4eea93 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
     ++ optional xineramaSupport libXinerama
     ++ optionals cupsSupport [ cups ];
 
-  configureFlags = if stdenv.isDarwin
-    then "--disable-glibtest --disable-introspection --disable-visibility"
-    else "--with-xinput=yes";
+  configureFlags = [
+    "--with-xinput=yes"
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "--disable-glibtest"
+    "--disable-introspection"
+    "--disable-visibility"
+  ];
 
   postInstall = ''
     moveToOutput share/gtk-2.0/demo "$devdoc"

From 1765784b5ea2964307a944ab702a0d0cb0b35725 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Tue, 27 Dec 2016 14:23:16 +0100
Subject: [PATCH 14/70] enpass: bump to 5.4.0.post4 and fix application icon

---
 pkgs/tools/security/enpass/data.json   | 12 ++++++------
 pkgs/tools/security/enpass/default.nix | 22 +++++++---------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json
index 4e245d1c80f..b3625d928b5 100644
--- a/pkgs/tools/security/enpass/data.json
+++ b/pkgs/tools/security/enpass/data.json
@@ -1,12 +1,12 @@
 {
   "amd64": {
-    "path": "pool/main/e/enpass/enpass_5.3.0_amd64.deb", 
-    "sha256": "d9da061c6456281da836bdd78bdb7baeced4b7f1805bb2495e4f1d15038cf86b", 
-    "version": "5.3.0"
+    "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb", 
+    "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579", 
+    "version": "5.4.0.post4"
   }, 
   "i386": {
-    "path": "pool/main/e/enpass/enpass_5.3.0_i386.deb", 
-    "sha256": "58d9f3b83c2da477c13976e1826d112236eabd46a389de7e8767ee99ac41f469", 
-    "version": "5.3.0"
+    "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb", 
+    "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692", 
+    "version": "5.4.0.post4"
   }
 }
\ No newline at end of file
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index b7f7282d292..f2e73e2749e 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -44,16 +44,6 @@ let
     inherit (data) version;
     name = "enpass-${version}";
 
-    desktopItem = makeDesktopItem {
-      name = "Enpass";
-      exec = "$out/bin/Enpass";
-      #icon = "Enpass";
-      desktopName = "Enpass";
-      genericName = "Password manager";
-      categories = "Application;Security;";
-    };
-
-
     src = fetchurl {
       inherit (data) sha256;
       url = "${baseUrl}/${data.path}";
@@ -74,11 +64,12 @@ let
     installPhase=''
       mkdir $out
       cp -r opt/Enpass/*  $out
+      cp -r usr/* $out
+      rm $out/bin/runenpass.sh
 
-      # Make desktop item
-      mkdir -p "$out"/share/applications
-      cp "$desktopItem"/share/applications/* "$out"/share/applications/
-      mkdir -p "$out"/share/icons
+      sed \
+      	-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
+      	$out/share/applications/enpass.desktop 
 
       patchelf  \
         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
@@ -88,7 +79,8 @@ let
         --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \
         --set QT_PLUGIN_PATH "$out/plugins" \
         --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \
-        --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"
+        --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
+        --set HIDE_TOOLBAR_LINE 0
     '';
   };
   updater = {

From 2436fc1b11647ed2ca2398088541a108440d75e6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Dec 2016 08:24:20 -0500
Subject: [PATCH 15/70] ghcHEAD comes with a ghci package.

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 559096ebd28..a2b6058b166 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -19,6 +19,7 @@ self: super: {
   directory = null;
   filepath = null;
   ghc-prim = null;
+  ghci = null;
   haskeline = null;
   hoopl = null;
   hpc = null;

From a55bf2b812463c992dad5f441efb8831dde10a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 11 Dec 2016 15:06:20 +0100
Subject: [PATCH 16/70] codesearch: init at 20150617

---
 pkgs/tools/text/codesearch/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/tools/text/codesearch/deps.nix    |  3 +++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/text/codesearch/default.nix
 create mode 100644 pkgs/tools/text/codesearch/deps.nix

diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
new file mode 100644
index 00000000000..ccb3f1d9ed9
--- /dev/null
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -0,0 +1,26 @@
+# This file was generated by go2nix.
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "codesearch-${version}";
+  version = "20150617-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";
+
+  goPackagePath = "github.com/google/codesearch";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/google/codesearch";
+    sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "Fast, indexed regexp search over large file trees";
+    homepage = "https://github.com/google/codesearch";
+    license = [ stdenv.lib.licenses.bsd3 ];
+    maintainers = [ stdenv.lib.maintainers.bennofs ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/tools/text/codesearch/deps.nix b/pkgs/tools/text/codesearch/deps.nix
new file mode 100644
index 00000000000..2d1dad70634
--- /dev/null
+++ b/pkgs/tools/text/codesearch/deps.nix
@@ -0,0 +1,3 @@
+# This file was generated by go2nix.
+[
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index beeed44ba78..c92eae2da9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -779,6 +779,8 @@ in
 
   cpulimit = callPackage ../tools/misc/cpulimit { };
 
+  codesearch = callPackage ../tools/text/codesearch { };
+
   contacts = callPackage ../tools/misc/contacts {
     inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
   };

From bef30f322f3fb9dee853264193decb3c9552aabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Dec 2016 15:46:22 +0100
Subject: [PATCH 17/70] cgit: 0.12 -> 1.1

---
 .../git-and-tools/cgit/default.nix                   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index d144d484ed3..e7511e10d40 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -5,21 +5,19 @@
 
 stdenv.mkDerivation rec {
   name = "cgit-${version}";
-  version = "0.12";
+  version = "1.1";
 
   src = fetchurl {
     url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
-    sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif";
+    sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288";
   };
 
   # cgit is tightly coupled with git and needs a git source tree to build.
   # IMPORTANT: Remember to check which git version cgit needs on every version
-  # bump (look in the Makefile).
-  # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
-  # 1.9.2 (see the repository history)
+  # bump (look for "GIT_VER" in the top-level Makefile).
   gitSrc = fetchurl {
-    url    = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz";
-    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
+    url    = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz";
+    sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
   };
 
   buildInputs = [

From 1896bf7a7831d612d1e8a188cb83b715aa476a7f Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@aon.at>
Date: Tue, 27 Dec 2016 15:47:27 +0100
Subject: [PATCH 18/70] pygraphviz: 1.3.1 -> 1.4rc1

This fixes a segmentation fault during the test phase
https://github.com/pygraphviz/pygraphviz/issues/84
---
 pkgs/top-level/python-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87cd2970fab..a682a04d7b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15058,14 +15058,15 @@ in {
   };
 
   pygraphviz = buildPythonPackage rec {
-    name = "pygraphviz-1.3.1";
+    name = "pygraphviz-${version}";
+    version = "1.4rc1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pygraphviz/${name}.tar.gz";
-      sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
+      sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
     };
 
-    buildInputs = with self; [ doctest-ignore-unicode ];
+    buildInputs = with self; [ doctest-ignore-unicode mock nose ];
     propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ];
 
     meta = {

From 9de120ff9d2a4cabf0ba0a7fa31a1daabd1ef5d9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:22:58 +0100
Subject: [PATCH 19/70] pythonPackages.resampy: init at 0.1.4

---
 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 875837d1032..5dfcb112e10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22493,6 +22493,28 @@ in {
     };
   };
 
+  resampy = buildPythonPackage rec {
+    pname = "resampy";
+    version = "0.1.4";
+    name = "${pname}-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "cf4f149d8699af70a1b4b0769fa16fab21835d936ea7ff25e98446aa49e743d4";
+    };
+
+    checkInputs = with self; [ pytest pytestcov ];
+    # No tests included
+    doCheck = false;
+    propagatedBuildInputs = with self; [ numpy scipy cython six ];
+
+    meta = {
+      homepage = https://github.com/bmcfee/resampy;
+      description = "Efficient signal resampling";
+      license = licenses.isc;
+    };
+  };
+
   robomachine = buildPythonPackage rec {
     name = "robomachine-0.6";
 

From 7847a02db9d3bfde2146e8a2e5a7b6ffca36c2fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:23:16 +0100
Subject: [PATCH 20/70] pythonPackages.numpydoc: 0.5 -> 0.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5dfcb112e10..cf0b2c8a511 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16105,12 +16105,13 @@ in {
   };
 
   numpydoc = buildPythonPackage rec {
-    name = "numpydoc-${version}";
-    version = "0.5";
+    pname = "numpydoc";
+    name = "${pname}-${version}";
+    version = "0.6.0";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/n/numpydoc/${name}.tar.gz";
-      sha256 = "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1";
     };
 
     buildInputs = [ self.nose ];

From 72385a35f87a998d3ffafd6673e832455a25a22a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:23:40 +0100
Subject: [PATCH 21/70] pythonPackages.librosa: 0.4.0 -> 0.4.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf0b2c8a511..a062cbcb36a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9304,15 +9304,25 @@ in {
 
 
   librosa = buildPythonPackage rec {
-    name = "librosa-${version}";
-    version = "0.4.0";
+    pname = "librosa";
+    name = "${pname}-${version}";
+    version = "0.4.3";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/l/librosa/librosa-0.4.0.tar.gz";
-      sha256 = "cc11dcc41f51c08e442292e8a2fc7d7ee77e0d47ff771259eb63f57fcee6f6e7";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "209626c53556ca3922e52d2fae767bf5b398948c867fcc8898f948695dacb247";
     };
 
-    propagatedBuildInputs = with self;
-      [ joblib matplotlib six scikitlearn decorator audioread samplerate ];
+    propagatedBuildInputs = with self; [ joblib matplotlib six scikitlearn
+      decorator audioread resampy ];
+
+    # No tests
+    doCheck = false;
+
+    meta = {
+      description = "Python module for audio and music processing";
+      homepage = http://librosa.github.io/;
+      license = licenses.isc;
+    };
   };
 
   joblib = buildPythonPackage rec {

From 3b050791e47362cb4d6ce4da74bbaa360eaa8ff3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Dec 2016 16:24:02 +0100
Subject: [PATCH 22/70] pythonPackages.joblib: 0.9.4 -> 0.10.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a062cbcb36a..8f312412878 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9326,15 +9326,26 @@ in {
   };
 
   joblib = buildPythonPackage rec {
-    name = "joblib-${version}";
-    version = "0.9.4";
+    pname = "joblib";
+    name = "${pname}-${version}";
+    version = "0.10.3";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/j/joblib/${name}.tar.gz";
-      sha256 = "e5faacf0da7b3035dbca9d56210962b86564aafca71a25f4ea376a405455cd60";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d";
     };
 
-    buildInputs = with self; [ nose ];
+    buildInputs = with self; [ nose sphinx numpydoc ];
 
+    # Failing test on Python 3.x
+    postPatch = '''' + optionalString isPy3k ''
+      sed -i -e '70,84d' joblib/test/test_format_stack.py
+    '';
+
+    meta = {
+      description = "Lightweight pipelining: using Python functions as pipeline jobs";
+      homepage = http://pythonhosted.org/joblib/;
+      license = licenses.bsd3;
+    };
   };
 
   samplerate = buildPythonPackage rec {

From 02c65bdac919fcb0cecc1a157744156ed39b9fc6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 27 Dec 2016 16:21:56 +0000
Subject: [PATCH 23/70] google-chrome: add channel name suffix

Updates would always select the unstable version otherwise. This was
copies from the chromium package.
---
 .../networking/browsers/google-chrome/default.nix            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 2863a595017..938dbe09ebe 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -51,10 +51,13 @@ let
     flac harfbuzz icu libpng opusWithCustomModes snappy speechd
     bzip2 libcap
   ] ++ optional pulseSupport libpulseaudio;
+
+  suffix = if channel != "stable" then "-" + channel else "";
+
 in stdenv.mkDerivation rec {
   inherit version;
 
-  name = "google-chrome-${version}";
+  name = "google-chrome${suffix}-${version}";
 
   src = binary;
 

From 857d0edcfb84364faffcc3de064dec0de1d5fab9 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 28 Dec 2016 01:01:12 +0800
Subject: [PATCH 24/70] facter: use boost160 (#21435)

---
 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 c92eae2da9c..7bc807082f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -867,6 +867,7 @@ in
   f3 = callPackage ../tools/filesystems/f3 { };
 
   facter = callPackage ../tools/system/facter {
+    boost = boost160;
     ruby = ruby_2_1;
   };
 

From 12532879b06d816ba88b52ed8ce5fdad53d6edb7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 27 Dec 2016 17:44:57 +0000
Subject: [PATCH 25/70] zerotierone: 1.1.12 -> 1.1.14

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index d97a6049745..76385312385 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.12";
+  version = "1.1.14";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "0mji6bmxjvxy2mhvzfz4vpdz62n1wv6a02rapzbiad8zr2c869cm";
+    sha256 = "1brlyqk2p5h9sws15nbkmm4qhx911aib1v7crmcm2rhwsad0c1nj";
   };
 
   preConfigure = ''
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = https://www.zerotier.com;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie zimbatm ];
     platforms = platforms.allBut [ "i686-linux" ];
   };
 }

From df5f88070e239a23d26055c138c1efb0706e0b4e Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Tue, 27 Dec 2016 18:55:10 +0100
Subject: [PATCH 26/70] ruby: 2.4.0 (#21419)

---
 pkgs/development/interpreters/ruby/default.nix       | 11 ++++++++++-
 pkgs/development/interpreters/ruby/patchsets.nix     |  5 +++++
 pkgs/development/interpreters/ruby/rvm-patchsets.nix |  6 +++---
 pkgs/top-level/all-packages.nix                      |  4 +++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9486d030a8b..d5f3a6d3990 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -113,6 +113,7 @@ let
 
         configureFlags = ["--enable-shared" "--enable-pthread"]
           ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+          ++ op (!docSupport) "--disable-install-doc"
           ++ ops stdenv.isDarwin [
             # on darwin, we have /usr/include/tk.h -- so the configure script detects
             # that tk is installed
@@ -154,7 +155,7 @@ let
           license = stdenv.lib.licenses.ruby;
           homepage = http://www.ruby-lang.org/en/;
           description = "The Ruby language";
-          maintainers = [ stdenv.lib.maintainers.vrthra ];
+          maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
           platforms = stdenv.lib.platforms.all;
         };
 
@@ -218,4 +219,12 @@ in {
       git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";
     };
   };
+
+  ruby_2_4_0 = generic {
+    version = rubyVersion "2" "4" "0" "";
+    sha256 = {
+      src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";
+      git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";
+    };
+  };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index d21e7d669dc..a3aeaf6a8ba 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -65,4 +65,9 @@ rec {
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
+  "2.4.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
 }
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index bbe1038bab2..51db26b7823 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -1,8 +1,8 @@
 { fetchFromGitHub }:
 
 fetchFromGitHub {
-  owner  = "skaes";
+  owner  = "manveru";
   repo   = "rvm-patchsets";
-  rev    = "951e47ca1022cd1e41de9177fa87438cfb72d127";
-  sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf";
+  rev    = "46e04f230ce91a786f5e583389443efec0ecd594";
+  sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bc807082f1..a9c86813cf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5777,7 +5777,8 @@ in
     ruby_2_0_0
     ruby_2_1_10
     ruby_2_2_5
-    ruby_2_3_3;
+    ruby_2_3_3
+    ruby_2_4_0;
 
   # Ruby aliases
   ruby = ruby_2_3;
@@ -5786,6 +5787,7 @@ in
   ruby_2_1 = ruby_2_1_10;
   ruby_2_2 = ruby_2_2_5;
   ruby_2_3 = ruby_2_3_3;
+  ruby_2_4 = ruby_2_4_0;
 
   scsh = callPackage ../development/interpreters/scsh { };
 

From cfbe501d4ecb6173be204e68a0d7b5e8f52086e8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 27 Dec 2016 17:26:56 +0100
Subject: [PATCH 27/70] nixos/graphite: fix beacon config parameter

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

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index b8be9296bc9..c5352e5887d 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -585,7 +585,7 @@ in {
         serviceConfig = {
           ExecStart = ''
             ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \
-              --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
+              --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
           '';
           User = "graphite";
           Group = "graphite";

From 228f657a2b486119c088a0e5a4c647bf55215706 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Tue, 27 Dec 2016 22:05:06 +0100
Subject: [PATCH 28/70] python:graphite_beacon: 0.22.1 -> 0.27.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49783ad83c5..edb81aac60e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28356,14 +28356,14 @@ EOF
   };
 
   graphite_beacon = buildPythonPackage rec {
-    name = "graphite_beacon-0.22.1";
+    name = "graphite_beacon-0.27.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/graphite_beacon/${name}.tar.gz";
-      sha256 = "ebde1aba8030c8aeffaeea39f9d44a2be464b198583ad4a390a2bff5f4172543";
+      sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks";
     };
 
-    propagatedBuildInputs = [ self.tornado ];
+    propagatedBuildInputs = [ self.tornado self.pyyaml self.funcparserlib ];
 
     preBuild = "> requirements.txt";
 

From c311871a6d0a3f83a0cec3e6b8804a741b83dcb5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 27 Dec 2016 23:47:29 +0100
Subject: [PATCH 29/70] xserver.wacom: update xorg.conf.d name after upstream
 change of the number

---
 nixos/modules/services/x11/hardware/wacom.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix
index 540ed168b48..a27889c36a7 100644
--- a/nixos/modules/services/x11/hardware/wacom.nix
+++ b/nixos/modules/services/x11/hardware/wacom.nix
@@ -22,7 +22,7 @@ in
           which will make Xorg reconfigure the device ?
 
           If you're not satisfied by the default behaviour you can override
-          <option>environment.etc."X11/xorg.conf.d/50-wacom.conf"</option> in
+          <option>environment.etc."X11/xorg.conf.d/70-wacom.conf"</option> in
           configuration.nix easily.
         '';
       };
@@ -40,7 +40,7 @@ in
 
     services.udev.packages = [ pkgs.xf86_input_wacom ];
 
-    environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf";
+    environment.etc."X11/xorg.conf.d/70-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf";
 
   };
 

From ca3f41d44bd701efd1b252ea7d717a2031ece332 Mon Sep 17 00:00:00 2001
From: Spiros Boosalis <SamBoosalis@gmail.com>
Date: Wed, 28 Dec 2016 03:28:07 +0000
Subject: [PATCH 30/70] pocketsphinx: 0.8 -> 5prealpha

---
 .../libraries/pocketsphinx/default.nix        | 33 ++++++++++++++++---
 .../libraries/sphinxbase/default.nix          |  8 +++--
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix
index ac4041ee964..bc37cfb3d18 100644
--- a/pkgs/development/libraries/pocketsphinx/default.nix
+++ b/pkgs/development/libraries/pocketsphinx/default.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchurl, sphinxbase, pkgconfig }:
+{ stdenv
+, fetchurl
+, sphinxbase
+, pkgconfig
+, python27 # >= 2.6
+, swig2 # 2.0
+}:
 
 stdenv.mkDerivation rec {
-  name = "pocketsphinx-0.8";
+  name = "pocketsphinx-5prealpha";
 
   src = fetchurl {
     url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
-    sha256 = "0ynf5ik4ib2d3ha3r4i8ywpr2dz5i6v51hmfl8kgzj4i7l44qk47";
+    sha256 = "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg";
   };
 
   propagatedBuildInputs = [ sphinxbase ];
 
-  buildInputs = [ pkgconfig ];
+  buildInputs = [ pkgconfig python27 swig2 ];
 
   meta = {
     description = "Voice recognition library written in C";
@@ -19,3 +25,22 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
+
+/* Example usage:
+
+
+1.
+
+$ cat << EOF > vocabulary.txt
+oh mighty computer /1e-40/
+hello world /1e-30/
+EOF
+
+2.
+
+$ pocketsphinx_continuous -inmic yes -kws vocabulary.txt 2> /dev/null
+# after you say "hello world":
+hello world
+...
+
+*/
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index 1b4cf69f704..e82b2fe045b 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -2,18 +2,20 @@
 , fetchurl
 , bison
 , pkgconfig
+, python27 # >= 2.6
+, swig2 # 2.0
 , multipleOutputs ? false #Uses incomplete features of nix!
 }:
 
 stdenv.mkDerivation (rec {
-  name = "sphinxbase-0.8";
+  name = "sphinxbase-5prealpha";
 
   src = fetchurl {
     url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";
-    sha256 = "1a3c91g6rcfb2k8qyfhnd7s68ds6pxwv61xfp0ai1arbhx28jw2m";
+    sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp";
   };
 
-  buildInputs = [ pkgconfig bison ];
+  buildInputs = [ swig2 python27 pkgconfig bison ];
 
   meta = {
     description = "Support Library for Pocketsphinx";

From 0e0fb196cae4224809b3e829e9c6f258b2bcd9ca Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Wed, 28 Dec 2016 13:35:42 +1000
Subject: [PATCH 31/70] openntpd: v6+ requires libressl for constraints

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

diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix
index 47d1dbbcbe6..6f3aab3082f 100644
--- a/pkgs/tools/networking/openntpd/default.nix
+++ b/pkgs/tools/networking/openntpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl
+{ stdenv, fetchurl, libressl
 , privsepPath ? "/var/empty"
 , privsepUser ? "ntp"
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [ libressl ];
 
   installFlags = [
     "sysconfdir=\${out}/etc"

From c6bcc485de63b4eeb8032b5f30611fa308b6740c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Dec 2016 14:56:15 +0100
Subject: [PATCH 32/70] linux_4_8: add patch to fix CVE-2016-9919

---
 pkgs/os-specific/linux/kernel/patches.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 74cf8d156af..1ad1155f8c3 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -165,4 +165,14 @@ rec {
         sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki";
       };
     };
+
+  panic_on_icmp6_frag_CVE_2016_9919 = rec
+    { name = "panic_on_icmp6_frag_CVE_2016_9919.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2";
+        sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
+      };
+    };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6a3cd97a17..ab4c2946d13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11079,6 +11079,7 @@ in
         # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.panic_on_icmp6_frag_CVE_2016_9919
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 7ae2d221cd13fd13c477387fb93aa5fb33f6bafa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 28 Dec 2016 06:35:31 +0100
Subject: [PATCH 33/70] bird service: add bird to systemPackages

For the tool birdc to monitor and configure bird.
---
 nixos/modules/services/networking/bird.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index 174354c9eb4..1a7a1e24b70 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -34,6 +34,7 @@ let
 
       ###### implementation
       config = mkIf cfg.enable {
+        environment.systemPackages = [ pkg ];
         systemd.services.${variant} = {
           description = "BIRD Internet Routing Daemon";
           wantedBy = [ "multi-user.target" ];

From 06090a73bbe8b1173b36bdf38ed4cbdd9348a911 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Wed, 28 Dec 2016 01:05:45 +0800
Subject: [PATCH 34/70] crystal: fix build in chroot environment, again

forgot to patch interpreter of the script used by Makefile,
carefully ensure it can build without /usr/bin/env this time.
---
 pkgs/development/compilers/crystal/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 5bb3b60d96d..39a06a4b1dc 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -60,6 +60,9 @@ stdenv.mkDerivation rec {
     # patch the script which launches the prebuilt compiler
     substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \
       "/usr/bin/env bash" "${stdenv.shell}"
+    substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \
+      "/usr/bin/env bash" "${stdenv.shell}"
+
     ${fixPrebuiltBinary}
 
     cd crystal-${version}

From 193017646245023735cf07106f6962f72123b5f6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 28 Dec 2016 12:50:24 +0300
Subject: [PATCH 35/70] deluge: 1.3.12 -> 1.3.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index edb81aac60e..fc48d6eda86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9990,15 +9990,16 @@ in {
   };
 
   deluge = buildPythonPackage rec {
-    name = "deluge-1.3.12";
+    name = "deluge-${version}";
+    version = "1.3.13";
 
     src = pkgs.fetchurl {
       url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
-      sha256 = "14rwc5k7q0d36b4jxnmxgnyvx9lnmaifxpyv0z07ymphlfr4amsn";
+      sha256 = "1ig8kv22009f0ny6n77a4lcfddhdsxrdklpmhdqvis1wx8na5crp";
     };
 
     propagatedBuildInputs = with self; [
-      pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl service-identity
+      pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl service-identity
     ];
 
     nativeBuildInputs = [ pkgs.intltool ];

From 3414470d9d3ec273bfe255abef6c92febff308b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20P=C3=A4tzel?= <david.a.paetzel+github@gmail.com>
Date: Sun, 23 Oct 2016 16:25:08 +0200
Subject: [PATCH 36/70] urlscan: init at 0.8.3

---
 lib/maintainers.nix                        |  1 +
 pkgs/applications/misc/urlscan/default.nix | 25 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix         |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/misc/urlscan/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6e39439e0b6..2431d56d9f8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -129,6 +129,7 @@
   dochang = "Desmond O. Chang <dochang@gmail.com>";
   domenkozar = "Domen Kozar <domen@dev.si>";
   doublec = "Chris Double <chris.double@double.co.nz>";
+  dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
   drets = "Dmytro Rets <dmitryrets@gmail.com>";
   drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
   dtzWill = "Will Dietz <nix@wdtz.org>";
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
new file mode 100644
index 00000000000..2d01d203ba1
--- /dev/null
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid }:
+
+buildPythonPackage rec {
+  name = "urlscan-${version}";
+  version = "0.8.3";
+
+  src = fetchFromGitHub {
+    owner = "firecat53";
+    repo = "urlscan";
+    rev = version;
+    # (equivalent but less nice(?): rev = "00333f6d03bf3151c9884ec778715fc605f58cc5")
+    sha256 = "0l40anfznam4d3q0q0jp2wwfrvfypz9ppbpjyzjdrhb3r2nizb0y";
+  };
+
+  propagatedBuildInputs = [ urwid ];
+
+  # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)
+  disabled = ! isPy35;
+
+  meta = with stdenv.lib; {
+    description = "Mutt and terminal url selector (similar to urlview)";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dpaetzel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc48d6eda86..4a3a7c6e3c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31725,6 +31725,8 @@ EOF
     };
   };
 
+  urlscan = callPackage ../applications/misc/urlscan { };
+
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "wp_export_parser";

From 2d38cad288207e1f8eb27d1ddea097e58a621e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20P=C3=A4tzel?= <david.a.paetzel+github@gmail.com>
Date: Sun, 23 Oct 2016 23:13:36 +0200
Subject: [PATCH 37/70] enhance python version check

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

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index 2d01d203ba1..b686c4ba9c4 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ urwid ];
 
   # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)
-  disabled = ! isPy35;
+  disabled = !pythonOlder "3.5";
 
   meta = with stdenv.lib; {
     description = "Mutt and terminal url selector (similar to urlview)";

From bef1d42300799c0c42fb4c6b12759c47d6f2444c Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 28 Dec 2016 12:39:51 +0100
Subject: [PATCH 38/70] confclerk: init at 0.6.1

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

diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
new file mode 100644
index 00000000000..08f654cdec4
--- /dev/null
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, qt4, qmake4Hook }:
+
+let version = "0.6.1"; in
+stdenv.mkDerivation {
+  name = "confclerk-${version}";
+
+  src = fetchurl {
+    url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
+    sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g";
+  };
+
+  buildInputs = [ qt4 ];
+
+  nativeBuildInputs = [ qmake4Hook ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp src/bin/confclerk $out/bin
+  '';
+
+  meta = {
+    description = "Offline conference schedule viewer";
+    homepage = "http://www.toastfreeware.priv.at/confclerk";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ ehmry ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4525a73cd67..ee8523342ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12545,6 +12545,8 @@ in
     inherit (gnome2) GConf ORBit2 metacity;
   };
 
+  confclerk = callPackage ../applications/misc/confclerk { };
+
   copyq = callPackage ../applications/misc/copyq { };
 
   coriander = callPackage ../applications/video/coriander {

From 04736aef42e6bb5bad9d703bc9f2b53620d1b7c1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 28 Dec 2016 06:37:08 -0600
Subject: [PATCH 39/70] kde5.plasma: 5.8.4 -> 5.8.5

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

diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh
index 60928c3900d..76f05bad0a7 100644
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/kde-5/plasma/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 75f44f47bec..03ee867453b 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz";
-      sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq";
-      name = "bluedevil-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz";
+      sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv";
+      name = "bluedevil-5.8.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz";
-      sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw";
-      name = "breeze-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz";
+      sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61";
+      name = "breeze-5.8.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz";
-      sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm";
-      name = "breeze-grub-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz";
+      sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf";
+      name = "breeze-grub-5.8.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz";
-      sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a";
-      name = "breeze-gtk-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz";
+      sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd";
+      name = "breeze-gtk-5.8.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz";
-      sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj";
-      name = "breeze-plymouth-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz";
+      sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1";
+      name = "breeze-plymouth-5.8.5.tar.xz";
     };
   };
   discover = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz";
-      sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx";
-      name = "discover-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz";
+      sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg";
+      name = "discover-5.8.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz";
-      sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2";
-      name = "kactivitymanagerd-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz";
+      sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh";
+      name = "kactivitymanagerd-5.8.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz";
-      sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14";
-      name = "kde-cli-tools-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz";
+      sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7";
+      name = "kde-cli-tools-5.8.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz";
-      sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4";
-      name = "kdecoration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz";
+      sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq";
+      name = "kdecoration-5.8.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz";
-      sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4";
-      name = "kde-gtk-config-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz";
+      sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r";
+      name = "kde-gtk-config-5.8.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz";
-      sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4";
-      name = "kdeplasma-addons-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz";
+      sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d";
+      name = "kdeplasma-addons-5.8.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz";
-      sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1";
-      name = "kgamma5-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz";
+      sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2";
+      name = "kgamma5-5.8.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz";
-      sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3";
-      name = "khotkeys-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz";
+      sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh";
+      name = "khotkeys-5.8.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz";
-      sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd";
-      name = "kinfocenter-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz";
+      sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp";
+      name = "kinfocenter-5.8.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz";
-      sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h";
-      name = "kmenuedit-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz";
+      sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m";
+      name = "kmenuedit-5.8.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz";
-      sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl";
-      name = "kscreen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz";
+      sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh";
+      name = "kscreen-5.8.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz";
-      sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv";
-      name = "kscreenlocker-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz";
+      sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj";
+      name = "kscreenlocker-5.8.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz";
-      sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc";
-      name = "ksshaskpass-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz";
+      sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh";
+      name = "ksshaskpass-5.8.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz";
-      sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3";
-      name = "ksysguard-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz";
+      sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9";
+      name = "ksysguard-5.8.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz";
-      sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn";
-      name = "kwallet-pam-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz";
+      sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44";
+      name = "kwallet-pam-5.8.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz";
-      sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7";
-      name = "kwayland-integration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz";
+      sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli";
+      name = "kwayland-integration-5.8.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz";
-      sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn";
-      name = "kwin-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz";
+      sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7";
+      name = "kwin-5.8.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz";
-      sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s";
-      name = "kwrited-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz";
+      sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr";
+      name = "kwrited-5.8.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz";
-      sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p";
-      name = "libkscreen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz";
+      sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9";
+      name = "libkscreen-5.8.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz";
-      sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq";
-      name = "libksysguard-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz";
+      sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp";
+      name = "libksysguard-5.8.5.tar.xz";
     };
   };
   milou = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz";
-      sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8";
-      name = "milou-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz";
+      sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d";
+      name = "milou-5.8.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz";
-      sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4";
-      name = "oxygen-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz";
+      sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7";
+      name = "oxygen-5.8.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz";
-      sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q";
-      name = "plasma-desktop-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz";
+      sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr";
+      name = "plasma-desktop-5.8.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz";
-      sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn";
-      name = "plasma-integration-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz";
+      sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb";
+      name = "plasma-integration-5.8.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz";
-      sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq";
-      name = "plasma-nm-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz";
+      sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc";
+      name = "plasma-nm-5.8.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz";
-      sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i";
-      name = "plasma-pa-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz";
+      sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b";
+      name = "plasma-pa-5.8.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz";
-      sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9";
-      name = "plasma-sdk-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz";
+      sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd";
+      name = "plasma-sdk-5.8.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz";
-      sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k";
-      name = "plasma-tests-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz";
+      sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b";
+      name = "plasma-tests-5.8.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz";
-      sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd";
-      name = "plasma-workspace-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz";
+      sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd";
+      name = "plasma-workspace-5.8.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz";
-      sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3";
-      name = "plasma-workspace-wallpapers-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz";
+      sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz";
+      name = "plasma-workspace-wallpapers-5.8.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.8.4";
+    version = "1-5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz";
-      sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg";
-      name = "polkit-kde-agent-1-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz";
+      sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7";
+      name = "polkit-kde-agent-1-5.8.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz";
-      sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy";
-      name = "powerdevil-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz";
+      sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704";
+      name = "powerdevil-5.8.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz";
-      sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx";
-      name = "sddm-kcm-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz";
+      sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc";
+      name = "sddm-kcm-5.8.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz";
-      sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv";
-      name = "systemsettings-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz";
+      sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga";
+      name = "systemsettings-5.8.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.8.4";
+    version = "5.8.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz";
-      sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d";
-      name = "user-manager-5.8.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz";
+      sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z";
+      name = "user-manager-5.8.5.tar.xz";
     };
   };
 }

From c12613c1110cb8f519295e5c2c21a52ce50acf51 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 13:46:27 +0100
Subject: [PATCH 40/70] botan: 1.10.13 -> 1.10.14, enforce c++11

---
 pkgs/development/libraries/botan/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 6e8a8cd8d7f..f66e7befeb0 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,7 +2,10 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "13";
-  sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13";
+  revision = "14";
+  sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h";
   extraConfigureFlags = "--with-gnump";
+  postPatch = ''
+    sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
+  '';
 })

From 21d4d54a38b394daa9ce1b7ffca19e6a7d42b8ab Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 13:46:51 +0100
Subject: [PATCH 41/70] botan: 1.11.32 -> 1.11.34

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

diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index 71366ed32ad..6ae151dcc64 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "32";
-  sha256 = "0b4wgqyv6accsdh7fgr9as34r38f8r9024i6s3vhah6wiah7kddn";
+  revision = "34";
+  sha256 = "05hzffp0dxac7414a84z0fgv980cnfx55ch2y4vpg5nvin7m9bar";
   openssl = null;
   postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";
 })

From 842a3010e1593db3a8172117fddb7315eaaa0a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 28 Dec 2016 13:51:19 +0100
Subject: [PATCH 42/70] Unbreak nixpkgs eval (urlscan lacked pythonOlder)

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

diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix
index b686c4ba9c4..3875886266d 100644
--- a/pkgs/applications/misc/urlscan/default.nix
+++ b/pkgs/applications/misc/urlscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid }:
+{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid, pythonOlder }:
 
 buildPythonPackage rec {
   name = "urlscan-${version}";

From c24206dc5f89b823d00897a24123410084b99a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Dec 2016 21:35:59 +0100
Subject: [PATCH 43/70] lighttpd: 1.4.41 -> 1.4.44

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

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 549c401fec7..c6f88c24509 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.41";
+  name = "lighttpd-1.4.44";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0v3b6hp8hfwg7kmmxs64hdn9iqkql5qjv2389wl7pp6nyqz3ik2b";
+    sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd";
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]

From 9ec867f59fba934c188e9dd4ccf1d35b49ad0c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 27 Dec 2016 23:00:15 +0100
Subject: [PATCH 44/70] nixos/prometheus: unbreak alertmanager default config

The current default value of listenAddress = null blows up:

  $ nixos-rebuild build
  error: cannot coerce null to a string, at
  .../nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix:97:16

With listenAddress = "" we use the same default as upstream and there is
no blow up :-)
---
 nixos/modules/services/monitoring/prometheus/alertmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index a9c0ce4ed6c..da2cd02eaa3 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -62,8 +62,8 @@ in {
       };
 
       listenAddress = mkOption {
-        type = types.nullOr types.str;
-        default = null;
+        type = types.str;
+        default = "";
         description = ''
           Address to listen on for the web interface and API.
         '';

From 040d5162be94eade7a64a7fd05a2782d97d6f93b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 14:08:40 +0100
Subject: [PATCH 45/70] imagemagick: 6.9.6-7 -> 6.9.7-0

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 8030302cdcf..e7f0a6b11d9 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -11,8 +11,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.6-7";
-    sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5";
+    version = "6.9.7-0";
+    sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.

From de99dc50495e0fb75a039586b882d1cd1b51eb0b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 14:15:53 +0100
Subject: [PATCH 46/70] imagemagick7: init at 7.0.4-0

---
 .../applications/graphics/ImageMagick/7.0.nix | 89 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 26 ++++++
 2 files changed, 115 insertions(+)
 create mode 100644 pkgs/applications/graphics/ImageMagick/7.0.nix

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
new file mode 100644
index 00000000000..3a0771a73ef
--- /dev/null
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -0,0 +1,89 @@
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
+, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
+}:
+
+let
+  arch =
+    if stdenv.system == "i686-linux" then "i686"
+    else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
+    else if stdenv.system == "armv7l-linux" then "armv7l"
+    else throw "ImageMagick is not supported on this platform.";
+
+  cfg = {
+    version = "7.0.4-0";
+    sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds";
+    patches = [];
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "imagemagick-${version}";
+  inherit (cfg) version;
+
+  src = fetchurl {
+    urls = [
+      "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
+      # the original source above removes tarballs quickly
+      "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
+      "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
+    ];
+    inherit (cfg) sha256;
+  };
+
+  patches = [ ./imagetragick.patch ] ++ cfg.patches;
+
+  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
+  outputMan = "out"; # it's tiny
+
+  enableParallelBuilding = true;
+
+  configureFlags =
+    [ "--with-frozenpaths" ]
+    ++ [ "--with-gcc-arch=${arch}" ]
+    ++ lib.optional (librsvg != null) "--with-rsvg"
+    ++ lib.optionals (ghostscript != null)
+      [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
+        "--with-gslib"
+      ]
+    ++ lib.optionals (stdenv.cross.libc or null == "msvcrt")
+      [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
+    ;
+
+  nativeBuildInputs = [ pkgconfig libtool ];
+
+  buildInputs =
+    [ zlib fontconfig freetype ghostscript
+      libpng libtiff libxml2
+    ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ openexr librsvg openjpeg ]
+    ;
+
+  propagatedBuildInputs =
+    [ bzip2 freetype libjpeg lcms2 ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ libX11 libXext libXt libwebp ]
+    ;
+
+  postInstall = ''
+    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+    moveToOutput "bin/*-config" "$dev"
+    moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
+    for file in "$dev"/bin/*-config; do
+      substituteInPlace "$file" --replace pkg-config \
+        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"
+    done
+  '' + lib.optionalString (ghostscript != null) ''
+    for la in $out/lib/*.la; do
+      sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.imagemagick.org/;
+    description = "A software suite to create, edit, compose, or convert bitmap images";
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ the-kenny wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee8523342ff..b5d5cd53291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13571,6 +13571,32 @@ in
 
   imagemagickBig = callPackage ../applications/graphics/ImageMagick { };
 
+  imagemagick7_light = lowPrio (imagemagick.override {
+    bzip2 = null;
+    zlib = null;
+    libX11 = null;
+    libXext = null;
+    libXt = null;
+    fontconfig = null;
+    freetype = null;
+    ghostscript = null;
+    libjpeg = null;
+    lcms2 = null;
+    openexr = null;
+    libpng = null;
+    librsvg = null;
+    libtiff = null;
+    libxml2 = null;
+    openjpeg = null;
+    libwebp = null;
+  });
+
+  imagemagick7 = lowPrio (imagemagickBig.override {
+    ghostscript = null;
+  });
+
+  imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { });
+
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };
 

From 5952897ec499f4e04d952aaa71f748910c1f3661 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <np@users.noreply.github.com>
Date: Wed, 28 Dec 2016 14:51:28 +0100
Subject: [PATCH 47/70] ricochet: 1.1.2 -> 1.1.4 (#21458)

---
 .../networking/instant-messengers/ricochet/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 15cc5a0f093..d1af2ad70d1 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "ricochet-${version}";
-  version = "1.1.2";
+  version = "1.1.4";
 
   src = fetchurl {
     url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz";
-    sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr";
+    sha256 = "1kfj42ksvj7axc809lb8siqzj5hck2pib427b63a3ipnqc5h1faf";
   };
 
   desktopItem = makeDesktopItem {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Anonymous peer-to-peer instant messaging";
     homepage = "https://ricochet.im";
     license = licenses.bsd3;
-    maintainers = [ maintainers.codsl maintainers.jgillich ];
+    maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ];
     platforms = platforms.linux;
   };
 }

From 33d07c7ea9f0d05d47dd4b41ded3b261380acfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 Dec 2016 14:57:06 +0100
Subject: [PATCH 48/70] zfs cannot be distributed. Disabling it in the isos.

It seems that it is a GPL violation to distribute zfs in the
installation ISOs.

https://sfconservancy.org/blog/2016/feb/25/zfs-and-linux/

If anyone knows the issue better and has a reason to reenable it
legally, feel free to reenable it. I don't know much about it.
---
 nixos/modules/profiles/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index f90d0d992ec..687cd9d80d3 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -45,7 +45,7 @@
   ];
 
   # Include support for various filesystems.
-  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
 
   # Configure host id for ZFS to work
   networking.hostId = lib.mkDefault "8425e349";

From 442623e49918f0c6b5b7ee91e519ab38558ca032 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 15:02:24 +0100
Subject: [PATCH 49/70] qemu_28: init at 2.8.0; not updating the main Qemu
 expression yet because there were some claims about NixOS test fragility

---
 pkgs/applications/virtualization/qemu/2.8.nix | 93 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +
 2 files changed, 98 insertions(+)
 create mode 100644 pkgs/applications/virtualization/qemu/2.8.nix

diff --git a/pkgs/applications/virtualization/qemu/2.8.nix b/pkgs/applications/virtualization/qemu/2.8.nix
new file mode 100644
index 00000000000..677386819d3
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/2.8.nix
@@ -0,0 +1,93 @@
+{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib
+, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex
+, bison, lzo, snappy, libaio, gnutls, nettle, curl
+, makeWrapper
+, attr, libcap, libcap_ng
+, CoreServices, Cocoa, rez, setfile
+, numaSupport ? stdenv.isLinux, numactl
+, seccompSupport ? stdenv.isLinux, libseccomp
+, pulseSupport ? !stdenv.isDarwin, libpulseaudio
+, sdlSupport ? !stdenv.isDarwin, SDL
+, vncSupport ? true, libjpeg, libpng
+, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
+, x86Only ? false
+, nixosTestRunner ? false
+}:
+
+with stdenv.lib;
+let
+  version = "2.8.0";
+  audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+    + optionalString pulseSupport "pa,"
+    + optionalString sdlSupport "sdl,";
+in
+
+stdenv.mkDerivation rec {
+  name = "qemu-"  
+    + stdenv.lib.optionalString x86Only "x86-only-"
+    + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+    + version;
+
+  src = fetchurl {
+    url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
+    sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs";
+  };
+
+  buildInputs =
+    [ python2 zlib pkgconfig glib ncurses perl pixman
+      vde2 texinfo libuuid flex bison makeWrapper lzo snappy
+      gnutls nettle curl
+    ]
+    ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]
+    ++ optionals seccompSupport [ libseccomp ]
+    ++ optionals numaSupport [ numactl ]
+    ++ optionals pulseSupport [ libpulseaudio ]
+    ++ optionals sdlSupport [ SDL ]
+    ++ optionals vncSupport [ libjpeg libpng ]
+    ++ optionals spiceSupport [ spice_protocol spice usbredir ]
+    ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];
+
+  enableParallelBuilding = true;
+
+  patches = [
+    ./no-etc-install.patch
+  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+  hardeningDisable = [ "stackprotector" ];
+
+  configureFlags =
+    [ "--smbd=smbd" # use `smbd' from $PATH
+      "--audio-drv-list=${audio}"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+    ]
+    ++ optional numaSupport "--enable-numa"
+    ++ optional seccompSupport "--enable-seccomp"
+    ++ optional spiceSupport "--enable-spice"
+    ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
+    ++ optional stdenv.isDarwin "--enable-cocoa"
+    ++ optional stdenv.isLinux "--enable-linux-aio";
+
+  postFixup =
+    ''
+      for exe in $out/bin/qemu-system-* ; do
+        paxmark m $exe
+      done
+    '';
+
+  postInstall =
+    ''
+      # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
+      p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
+      if [ -e "$p" ]; then
+        makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
+      fi
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.qemu.org/;
+    description = "A generic and open source machine emulator and virtualizer";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ viric eelco ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5d5cd53291..39ddbf8022f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14481,6 +14481,11 @@ in
     inherit (darwin.stubs) rez setfile;
   };
 
+  qemu_28 = callPackage ../applications/virtualization/qemu/2.8.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa;
+    inherit (darwin.stubs) rez setfile;
+  };
+
   qgis = callPackage ../applications/gis/qgis {};
 
   qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };

From 35e3ea0966bcdf3483fc25e78a5e9e1887befe9b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Dec 2016 15:04:41 +0100
Subject: [PATCH 50/70] dovecot: 2.2.25 -> 2.2.27

---
 pkgs/servers/mail/dovecot/2.2.x-module_dir.patch | 10 +++++-----
 pkgs/servers/mail/dovecot/default.nix            |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
index 66059cff6f7..1914933c558 100644
--- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream
 index a0659ab..dba3729 100644
 --- a/src/lib-ssl-iostream/iostream-ssl.c
 +++ b/src/lib-ssl-iostream/iostream-ssl.c
-@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r)
- 	memset(&mod_set, 0, sizeof(mod_set));
+@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r)
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
+ 	mod_set.require_init_funcs = TRUE;
 -	ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
 +	ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);
- 
- 	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
- 	if (ssl_vfuncs == NULL) {
+ 	if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name,
+ 					&mod_set, error_r) < 0)
+ 		return -1;
 diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
 index e2233bf..bbf981e 100644
 --- a/src/lib-storage/mail-storage-settings.c
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 2be20323f25..36d45672150 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.25";
+  name = "dovecot-2.2.27";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq";
+    sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9";
   };
 
   preConfigure = ''

From 897b10998b5953622c475e80518f2788155c91c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 Dec 2016 16:05:01 +0100
Subject: [PATCH 51/70] Tune mksquashfs for smaller isos.

Bigger block size, more suitable for xz.
---
 nixos/lib/make-squashfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 2baa4f66760..4100af27bec 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
 
       # Generate the squashfs image.
       mksquashfs nix-path-registration $storePaths $out \
-        -keep-as-directory -all-root -comp xz
+        -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100%
     '';
 }

From e0078b2cb536c3af0f820d484f46dc9b83547678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 Dec 2016 16:05:30 +0100
Subject: [PATCH 52/70] Make the minimal iso not use profile/minimal, +vim

The profile minimal has several drawbacks: no man pages, unusual 'dbus'
lib that makes many X11 pieces to rebuild, etc.

With xz compression in the squashfs, despite these additions, the iso is
smaller than what it was in 16.09.
---
 .../modules/installer/cd-dvd/installation-cd-minimal.nix  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index 4641b8fcf9d..f4122ab0e51 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -1,11 +1,15 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
 
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports =
     [ ./installation-cd-base.nix
-      ../../profiles/minimal.nix
+    ];
+
+  environment.systemPackages =
+    [
+      pkgs.vim
     ];
 }

From 45338a307730a527127c7ee5caf7aa6a13c0cca0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Dec 2016 01:04:17 +0200
Subject: [PATCH 53/70] fuse: Minor cleanup

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

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 46f242b2ea0..34b6aa1378c 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,13 +1,10 @@
 { stdenv, fetchFromGitHub, utillinux
-  ,autoconf, automake, libtool, gettext }:
+, autoconf, automake, libtool, gettext }:
 
 stdenv.mkDerivation rec {
   name = "fuse-${version}";
-
   version = "2.9.7";
 
-  #builder = ./builder.sh;
-
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "libfuse";
@@ -17,8 +14,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ utillinux autoconf automake libtool gettext ];
 
-  inherit utillinux;
-
   preConfigure =
     ''
       export MOUNT_FUSE_PATH=$out/sbin
@@ -32,7 +27,7 @@ stdenv.mkDerivation rec {
 
       sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
       sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
-      
+
       ./makeconf.sh
     '';
 

From d150e409757d1174192dfa6bdaf37b8b627bb504 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Dec 2016 16:34:51 +0100
Subject: [PATCH 54/70] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-1-gac3ba01 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8db11916ad7a5d7f0d0aa25e615fff3db2cf6ddf.
---
 .../haskell-modules/hackage-packages.nix      | 906 +++++++++++++-----
 1 file changed, 667 insertions(+), 239 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8b917a56a90..641968a4d39 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1675,8 +1675,8 @@ self: {
      }:
      mkDerivation {
        pname = "BitStringRandomMonad";
-       version = "0.1.0.0";
-       sha256 = "70acdb3e821d9fb17190b6bb9882217f31ae44e6d2ddf28f644a8f271156b785";
+       version = "0.1.1.1";
+       sha256 = "496715852ecfd5651fee81eba635b88865ef6dbc87792e56ea47eeac36fd9c36";
        libraryHaskellDepends = [
          base bitstring bytestring mtl parallel primitive transformers
          vector
@@ -9696,6 +9696,8 @@ self: {
        pname = "IPv6Addr";
        version = "0.6.2.0";
        sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926";
+       revision = "1";
+       editedCabalFile = "7da9aae32a048aca882ec02c1f184ed24e53119de5345ff8b8d6fc62ccd6808e";
        libraryHaskellDepends = [
          attoparsec base iproute network network-info random text
        ];
@@ -9707,6 +9709,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IPv6Addr_0_6_3" = callPackage
+    ({ mkDerivation, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "0.6.3";
+       sha256 = "d51d7316a72e7cbe680cafda0b422d07bf9755261f040061ae72351aaf470e02";
+       revision = "1";
+       editedCabalFile = "55425a8e76d1b236298bd447f5ff7d4280a8eb51e0c1e363ed2c6a418dadbb85";
+       libraryHaskellDepends = [
+         attoparsec base iproute network network-info random text
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/MichelBoucey/IPv6Addr";
+       description = "Library to deal with IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -10878,8 +10902,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, List, transformers }:
      mkDerivation {
        pname = "ListTree";
-       version = "0.2.2";
-       sha256 = "b261ac13493c992c44156f81ad194e43f2ab5aa2ae5ea0596414280c3a8addba";
+       version = "0.2.3";
+       sha256 = "0b3aa1d34193d9f7f90b4afeea681a79ab1595e8e651cae093f8fca3c50f60cc";
        libraryHaskellDepends = [
          base directory filepath List transformers
        ];
@@ -15815,12 +15839,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Spintax_0_3_0_0" = callPackage
+  "Spintax_0_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
-       version = "0.3.0.0";
-       sha256 = "b417809b3734c582f1a08be3a14845b913562077bfc35b3bf067ced2309b0ffc";
+       version = "0.3.1";
+       sha256 = "335e13554aa0a13c97b4f9258be904e3007c35a56e8131bdb363c5f7930fc521";
        libraryHaskellDepends = [
          attoparsec base extra mtl mwc-random text
        ];
@@ -18303,6 +18327,8 @@ self: {
        pname = "YamlReference";
        version = "0.10.0";
        sha256 = "4d89cd7714f25c82c6a49a99e8d8b1789640222a1b5863da0a7aa3f4566b9205";
+       revision = "1";
+       editedCabalFile = "987331ab821e7171c21f2b79eb678f2ece44759d4eb1155e5ca93ac2396a99dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32983,7 +33009,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bitcoin-payment-channel_0_6_0_0" = callPackage
+  "bitcoin-payment-channel_0_6_0_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
      , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck
      , scientific, string-conversions, tagged, test-framework
@@ -32991,8 +33017,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
-       version = "0.6.0.0";
-       sha256 = "487e5bb74a3a6c6829971d1071576b302c70298160f9b03654911e2094bcc011";
+       version = "0.6.0.1";
+       sha256 = "10085ef9254d88a4494986f372b07d4109d1767196cc6d230c02ffe18f5f1abd";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cereal errors haskoin-core
          hexstring QuickCheck scientific string-conversions tagged text time
@@ -34858,6 +34884,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bower-json_1_0_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-better-errors, base, bytestring
+     , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "bower-json";
+       version = "1.0.0.1";
+       sha256 = "7aa954e2b1bf79307db710c158108bd9ddb45b333ca96072cdbfaf96c77b7e73";
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base bytestring deepseq ghc-prim mtl
+         scientific text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring tasty tasty-hunit text unordered-containers
+       ];
+       homepage = "https://github.com/hdgarrood/bower-json";
+       description = "Read bower.json from Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bowntz" = callPackage
     ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }:
      mkDerivation {
@@ -38964,6 +39012,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_3_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.3.0";
+       sha256 = "6c2d35f5c70df4744c3cac4a3cda952bd6a36f0f40cbdcf79ec54670ab1c5e1a";
+       revision = "1";
+       editedCabalFile = "7bc68d5b02fa41ebd7652a4e0d080417f4a66e179f24e6cc70845dac0fbb9f63";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -45057,14 +45128,14 @@ self: {
      }) {};
 
   "constraint-classes" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, constraints, transformers }:
      mkDerivation {
        pname = "constraint-classes";
-       version = "0.4.0";
-       sha256 = "0a5dda19ad7688081e43ec1445eac7a1ae0c4ae54139c4b92fd91e5f872a45b8";
-       libraryHaskellDepends = [ base ];
+       version = "0.5.1";
+       sha256 = "5e26e76d7d1bcbdf77a384ffc74eb36a39f82e23a29d3ee80b6bf29ab7ce6921";
+       libraryHaskellDepends = [ base constraints transformers ];
        homepage = "http://github.com/guaraqe/constraint-classes#readme";
-       description = "Prelude classes using ConstraintKinds";
+       description = "Various typeclasses using ConstraintKinds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -47542,8 +47613,8 @@ self: {
        pname = "crypto-enigma";
        version = "0.0.2.6";
        sha256 = "eb162e2b4ea2d73bb3594e12438f02988e338ae58c602e817a31970163533142";
-       revision = "1";
-       editedCabalFile = "4cc74c0744e15e1149d7419e47232db6f0bf53a56360f35d71665b180c2f2a53";
+       revision = "3";
+       editedCabalFile = "c94ac05824b4eb891ee0351c533f6b7a12586437b58c4615538903bfd807317c";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/orome/crypto-enigma-hs";
@@ -50128,8 +50199,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "data-flags";
-       version = "0.0.3.2";
-       sha256 = "9e8944d63a314a116d1cc8ecb115ad0ea8dabd5ccb84dbbefd332e641430794a";
+       version = "0.0.3.3";
+       sha256 = "a1e390d6a58b45c5f9a193c8244badf31f104fad26d5178298c8043ad136faaa";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/mvv/data-flags";
        description = "A package for working with bit masks and flags in general";
@@ -50700,14 +50771,14 @@ self: {
 
   "data-serializer" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, data-endian
-     , parsers, tasty, tasty-quickcheck
+     , parsers, semigroups, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "data-serializer";
-       version = "0.2";
-       sha256 = "1e134ab268125d0202ed95c723cd903283e8dc111918498cf27696820285a584";
+       version = "0.3";
+       sha256 = "c8befa7acf0293b0a367bf8100d19e8cf1ad4b4b48358394daa578103a505e2e";
        libraryHaskellDepends = [
-         base binary bytestring cereal data-endian parsers
+         base binary bytestring cereal data-endian parsers semigroups
        ];
        testHaskellDepends = [
          base binary bytestring cereal tasty tasty-quickcheck
@@ -50810,8 +50881,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-sword";
-       version = "0.2";
-       sha256 = "57db4db48eb3bda4a8b70c781c64342241ee7d7b53f020262dc3c7506f8eec95";
+       version = "0.2.0.1";
+       sha256 = "d2348ed2515a484866d92185640db0d20991ec9b0c6a891ed229ff41d5f304d1";
        libraryHaskellDepends = [
          base data-bword hashable template-haskell
        ];
@@ -60873,6 +60944,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eths-rlp" = callPackage
+    ({ mkDerivation, base, binary, binary-strict, bytestring, doctest
+     , hspec, QuickCheck, quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "eths-rlp";
+       version = "0.1.0.0";
+       sha256 = "aa24e8f30bbb1eff7bd4cbfc635224f772d5bdba26a1db6ef346415b8d2ea09b";
+       libraryHaskellDepends = [ base binary binary-strict bytestring ];
+       testHaskellDepends = [
+         base bytestring doctest hspec QuickCheck quickcheck-instances
+       ];
+       description = "Ethereum Recursive Length Prefix Encoding";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ety" = callPackage
     ({ mkDerivation, base, bytestring, curl, random, text-icu
      , utf8-string, xml
@@ -62417,6 +62504,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-nats" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fast-nats";
+       version = "0.1.0.1";
+       sha256 = "8197f83252621182c32350c20f995fb3ad3549499e2fbf2687235ff80024e3ce";
+       libraryHaskellDepends = [ base ];
+       description = "Natural Numbers with no overhead";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fast-tags" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers, cpphs
      , deepseq, directory, filepath, mtl, tasty, tasty-hunit, text
@@ -62557,6 +62655,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fastpbkdf2" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, openssl
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "fastpbkdf2";
+       version = "0.1.0.0";
+       sha256 = "843103419b79f8fc21062e6842dace2a6e0c214f20c496a4268e1377c512f2f9";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring tasty tasty-hunit
+       ];
+       homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme";
+       description = "Haskell bindings to the fastpbkdf2 C library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) openssl;};
+
   "fathead-util" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hxt, network-uri, text
      }:
@@ -70293,18 +70409,18 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
-  "gi-atk_2_0_9" = callPackage
+  "gi-atk_2_0_11" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.9";
-       sha256 = "246b50192e25a6f125cb51b2c57a38cb76702fe02c7b87b89e548851479598bf";
+       version = "2.0.11";
+       sha256 = "32594ce32ab70fcf7b7e4d2fd212a4714c72d28776be7649f88a989b40632d9b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ atk ];
        doHaddock = false;
@@ -70339,18 +70455,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-cairo_1_0_9" = callPackage
+  "gi-cairo_1_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "1.0.9";
-       sha256 = "acdc06c2543aae4462dee525b7fb806fd974e58d3d1b3482167f5bde2eb14a99";
+       version = "1.0.11";
+       sha256 = "a70bbb9b120d10c95e1bc603511d542b38cecf1025bed870e6dbe2bd2d7e552f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi-base text transformers
+         base bytestring containers haskell-gi haskell-gi-base text
+         transformers
        ];
        libraryPkgconfigDepends = [ cairo gobjectIntrospection ];
        doHaddock = false;
@@ -70387,19 +70504,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
-  "gi-gdk_3_0_9" = callPackage
+  "gi-gdk_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.9";
-       sha256 = "6a908ed5be0a79c0d25a82ddcad4c910e2e65f756696141aaac970ac853fee22";
+       version = "3.0.11";
+       sha256 = "b1947f5abad3e500ac748ccea44275050c8a7261d0f81e49aee21a4266cf34b1";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi-base text transformers
+         gi-gobject gi-pango haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
@@ -70435,18 +70552,18 @@ self: {
      }) {inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gdkpixbuf_2_0_9" = callPackage
+  "gi-gdkpixbuf_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.9";
-       sha256 = "880089ae75884e8e89b2ebba3d524c9f07864b37f3dc8475fea14ed18a01efb0";
+       version = "2.0.11";
+       sha256 = "068c4e9df68a03180dc0f174414af010877ffc781d35d2776e01a63bd1a80149";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ];
@@ -70483,19 +70600,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gio_2_0_9" = callPackage
+  "gi-gio_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.9";
-       sha256 = "fb08fb617f7d845d8e6f50802ad6f30e6063ee71c05dc10da29f581227f16bb8";
+       version = "2.0.11";
+       sha256 = "d63f1c32a935cb818f8f2c1d70dbf4f71cc65a23e200744a93dee66ade50f039";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ glib gobjectIntrospection ];
        doHaddock = false;
@@ -70513,12 +70630,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.9";
-       sha256 = "773fc9bb6d55006f12f68fdb4a68edc25fdc74448549a819ecb4f88a2f0b0efb";
+       version = "1.0.11";
+       sha256 = "3779ee7c9e97a96b05f43607adbde81addf0451b0a1f21e94a9a4353cec1fde2";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-gobject haskell-gi haskell-gi-base
+         text transformers
        ];
        libraryPkgconfigDepends = [ gobjectIntrospection ];
        doHaddock = false;
@@ -70549,18 +70666,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-glib_2_0_9" = callPackage
+  "gi-glib_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.9";
-       sha256 = "1b295151c9d5f83c13c01204f67c10d071173377a67d6c1d4e8093a253c86555";
+       version = "2.0.11";
+       sha256 = "f707cc142c6c7a202b86a5804af38c53fd74c99ee2092946e3f39451220d94e9";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi-base text transformers
+         base bytestring containers haskell-gi haskell-gi-base text
+         transformers
        ];
        libraryPkgconfigDepends = [ glib gobjectIntrospection ];
        doHaddock = false;
@@ -70592,18 +70710,18 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
-  "gi-gobject_2_0_9" = callPackage
+  "gi-gobject_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.9";
-       sha256 = "8525c707a7f6569ac57da4c16fc5c2ea174f4282c8436ba789d36d22cdbe7f1a";
+       version = "2.0.11";
+       sha256 = "fcfe35af13e118db109b9b0d969b89bb5c2a0162a1c3d1fc9413cafcd173058c";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi-base text
+         base bytestring containers gi-glib haskell-gi haskell-gi-base text
          transformers
        ];
        libraryPkgconfigDepends = [ glib gobjectIntrospection ];
@@ -70622,12 +70740,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.9";
-       sha256 = "4ed3756052c41b4198d7c3cfd5d179f2d0f49d2a43d20f2be320d85c0a61b22e";
+       version = "1.0.11";
+       sha256 = "36e63c2330cb274ac6ac8b1a5d4b06a590e10d91ed4209555a72a85dc0c2591a";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gstreamer ];
        doHaddock = false;
@@ -70644,12 +70762,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.9";
-       sha256 = "c6021390e020c2d5c21b003bffb6340059feca7ea416fcad60d5c6bb0c0841c8";
+       version = "1.0.11";
+       sha256 = "faca30e17c95fc5fc00e72bbaef20bbb9edf2a4785f6bad6f6b4a742006d2f5d";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
        libraryPkgconfigDepends = [ gst_plugins_base ];
@@ -70668,11 +70786,11 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.9";
-       sha256 = "5e86bc44fcc16d4009a5cd881169d29abffbd08e8ff0a07098b9e54729137e5d";
+       version = "1.0.11";
+       sha256 = "ca1cf846609ee3a340161747df48885432304b4a4339d3328d3f8b5e683ff577";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject gi-gst
+         base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
          haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
@@ -70692,12 +70810,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.9";
-       sha256 = "1d36e8f907c6ece57c1db76b9a3ebf866b2ce57f9312c0153ab2e1259356c6ab";
+       version = "1.0.11";
+       sha256 = "9f2b49fc2ee31fb4ee4f2bf82f509a8b9d4dc963eff0da62efa6b60e760f42e7";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
        libraryPkgconfigDepends = [ gst_plugins_base ];
@@ -70732,19 +70850,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
-  "gi-gtk_3_0_9" = callPackage
+  "gi-gtk_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.9";
-       sha256 = "5b7b6d064b97066c058288a366e37dffa0b330a4a1d15f3018ed46d2b3a877f3";
+       version = "3.0.11";
+       sha256 = "a4bce9a9ea706a880bb9e8f6a2f8eb872b66acf550f8f42dd13a552b4d725f3f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
          transformers
        ];
        libraryPkgconfigDepends = [ gtk3 ];
@@ -70782,12 +70900,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
-       version = "2.0.9";
-       sha256 = "d4661ae492916d4fc16f34b234e6c22917f3fc8bf37aef0ae6f2dd17123b7834";
+       version = "2.0.11";
+       sha256 = "4d64ad35431052f221a37998b8ca7fa8850a9a98d2741133f64f978b2e3bcad7";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        doHaddock = false;
@@ -70805,13 +70923,13 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.9";
-       sha256 = "3ba4e8d8b446c4c37248748535951e31803140a69cf53a69bdb0e68e254b5090";
+       version = "3.0.11";
+       sha256 = "fb130bc4894aa689ecccb01be94ef246585ddba296fef5145a688e9c14027646";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi-base text
-         transformers
+         gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ gtksourceview ];
        doHaddock = false;
@@ -70842,17 +70960,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;};
 
-  "gi-javascriptcore_4_0_9" = callPackage
+  "gi-javascriptcore_4_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.9";
-       sha256 = "9acd59b75799a572919c3a65541de73296b6f33f54572902c91eeb93ee7a5375";
+       version = "4.0.11";
+       sha256 = "d67899269ffeba7fa266644fb6d540c74d36fa9e15ca1890fc2c6bb1fa19e066";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers haskell-gi-base text transformers
+         base bytestring containers haskell-gi haskell-gi-base text
+         transformers
        ];
        libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ];
        doHaddock = false;
@@ -70870,12 +70989,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.9";
-       sha256 = "7c87c5003d96303398ccca3c2e256d409c8853a7007158e052469ac650aa0221";
+       version = "0.7.11";
+       sha256 = "206eaf4d06e5837e21f665212517c27c201e48bb306ea0ea77e05ce9e8d059ce";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ libnotify ];
        doHaddock = false;
@@ -70912,19 +71031,19 @@ self: {
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; 
          inherit (pkgs.gnome2) pango;};
 
-  "gi-pango_1_0_9" = callPackage
+  "gi-pango_1_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.9";
-       sha256 = "2410b013c336f70b0711aa52b2ff9145945b5fd4b246b09703adac86ca00df1b";
+       version = "1.0.11";
+       sha256 = "8e709c61b8e6a8d2973d7206b15e324327d79ec4b6c301b949837d33d1f7ec66";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi-base text
-         transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ];
        doHaddock = false;
@@ -70947,12 +71066,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.9";
-       sha256 = "7c9e3c78703852ab5e879f8b3ecbb3e6898389d10d1458e3b6341ada252464a4";
+       version = "1.0.11";
+       sha256 = "604c2759510e6987fb2ca63c4b20940147fd07fcf56f701c221bf836de0481ad";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ pango ];
        doHaddock = false;
@@ -70969,12 +71088,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.9";
-       sha256 = "6566f9698ff21dc0eac6b8fb79db191ad48044b424a8d7a2b931ca69a1d517a8";
+       version = "0.18.11";
+       sha256 = "76ec68a35a83c99d3c8fd3374b02b0fede275ced4c21d4c967d817411a8c581b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ poppler ];
        doHaddock = false;
@@ -71004,18 +71123,18 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) libsoup;};
 
-  "gi-soup_2_4_9" = callPackage
+  "gi-soup_2_4_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "2.4.9";
-       sha256 = "e4e45ac1d877e1334ee6b57154422dad87e3e03c2f453f34c05e75aafb7a5daa";
+       version = "2.4.11";
+       sha256 = "5488104e98b7a295b44990d0063b162c951b8a1eec5df35a42bd4ba828dbd0ad";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ libsoup ];
@@ -71033,12 +71152,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.10";
-       sha256 = "8da2e88e7b00ac3f7ab1523836415a53cb92f3c6da576d48fc9fd363f88b3bf0";
+       version = "2.91.12";
+       sha256 = "c286d581ad3f3e25dc4f7b5b8439d4e6a0e2d6312218e5cc528c490c07573670";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
-         gi-gtk gi-pango haskell-gi-base text transformers
+         gi-gtk gi-pango haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ vte ];
        doHaddock = false;
@@ -71071,7 +71190,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
-  "gi-webkit_3_0_9" = callPackage
+  "gi-webkit_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
@@ -71079,13 +71198,13 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "3.0.9";
-       sha256 = "5cd7b6d244b3aeb9eba3f437d40e3b3fbc2fcb253d84d1d5e1e105e7deefc976";
+       version = "3.0.11";
+       sha256 = "d707c10a9f758d5bee1fe59639fb6773a1fcdb596bc86b46c7ce19639556ff3f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
-         haskell-gi-base text transformers
+         haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
        doHaddock = false;
@@ -71103,13 +71222,13 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.9";
-       sha256 = "982635e1c9f7f726100ed980eb12f7bee523d4b8aae14889c10024409f112be5";
+       version = "4.0.11";
+       sha256 = "bc43fb893695cd0395ffdd3381e857d5201e2a7209feb6f6024e0d832219070b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
-         gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text
-         transformers
+         gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
+         haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ webkit2gtk webkitgtk ];
        doHaddock = false;
@@ -71127,12 +71246,12 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.9";
-       sha256 = "df4bac3557c8b29c1fd6b8e7da859a394eef2df5bed12dab5491a57b585835ac";
+       version = "4.0.11";
+       sha256 = "b16b5b2f54bceaa777c64bb5ed19244815892dafcd8b4ce949c6a858ccf19033";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
-         gi-soup haskell-gi-base text transformers
+         gi-soup haskell-gi haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ];
        doHaddock = false;
@@ -71602,15 +71721,17 @@ self: {
      }:
      mkDerivation {
        pname = "git-mediate";
-       version = "1.0";
-       sha256 = "0ec4f74b30997f05059ac4dc1433a3618cd40240bbb93b6ec434d90f40390790";
+       version = "1.0.1";
+       sha256 = "12320be6a3a0c8f982346c3fdb15e2102339ca2ae454b413d2664124f08c3c57";
+       revision = "1";
+       editedCabalFile = "208ad1540eab41d7530395ef31095f6aa8a1c0e415f6e9f6236418f6d4ebb32d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal base base-compat Diff directory filepath mtl
          optparse-applicative process unix
        ];
-       homepage = "https://github.com/ElastiLotem/git-mediate";
+       homepage = "https://github.com/Peaker/git-mediate";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72254,8 +72375,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitter";
-       version = "0.0.0.1";
-       sha256 = "cc755243b8be4a235aaf8ed3dc4aa6d1b5dcecf602c3457131ac96e6bd665a97";
+       version = "0.1";
+       sha256 = "640371046315d609811e3062edc202e386722165f84fbe1f15e22a5e2d66324a";
        libraryHaskellDepends = [
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
@@ -72342,15 +72463,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glabrous_0_2_0_1" = callPackage
+  "glabrous_0_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.2.0.1";
-       sha256 = "cb2f9a9f60395f0abc062311a7cbea8505ecd546f1cb71e51b01291aea323327";
+       version = "0.2.1";
+       sha256 = "79793394c25a1f7bdb0c57e634a8ad37824a2a108272d521cf9fe78bdf9a70a4";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -76046,6 +76167,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-oauth2-jwt_0_1_3" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
+     , RSA, text, unix-time
+     }:
+     mkDerivation {
+       pname = "google-oauth2-jwt";
+       version = "0.1.3";
+       sha256 = "1597575b4d03fea87e7411dd905b2db59221a6050986bd4cffadf4473da1c00b";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring HsOpenSSL RSA text unix-time
+       ];
+       homepage = "https://github.com/MichelBoucey/google-oauth2-jwt";
+       description = "Get a signed JWT for Google Service Accounts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "google-search" = callPackage
     ({ mkDerivation, base, free, nats, text, time }:
      mkDerivation {
@@ -82097,8 +82235,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.0.2";
-       sha256 = "0ef9006c38adb2d4caf4de88c1ac9b3ad26175fc2c4c54ac70ac5e4750062462";
+       version = "0.1.0.4";
+       sha256 = "d17bffafa4c729eab2e9b288c636d201013dd05ed04656e40de5a5fb7bc052a4";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -82407,8 +82545,8 @@ self: {
        pname = "hashing";
        version = "0.1.0.1";
        sha256 = "e5a4a19c6cd6f0a0adda381db76d608d23f8d303e68f1d744735433f91f49410";
-       revision = "1";
-       editedCabalFile = "a50b8538d365ef9fbdc0083c3de91fbdbcebe5e630f36330475e0d10243e2596";
+       revision = "2";
+       editedCabalFile = "98861f16791946cdf28e3c7a6ee9ac8b72d546d6e33c569c7087ef18253294e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring ];
@@ -87258,6 +87396,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "helf" = callPackage
+    ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "helf";
+       version = "0.2016.12.25";
+       sha256 = "7d96b7bb7716b16d0b7b744629b3702766ec5e825cdd9b5015ada24d34a71a0e";
+       revision = "1";
+       editedCabalFile = "a3d5ffe78978b357890472700f2c0d5ac796f312909777476d89941753994385";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base containers mtl pretty QuickCheck
+       ];
+       executableToolDepends = [ alex happy ];
+       homepage = "http://www2.tcs.ifi.lmu.de/~abel/projects.html#helf";
+       description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
+       license = "unknown";
+     }) {};
+
   "helics" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-show
      , data-default-class, newrelic-collector-client, newrelic-common
@@ -88055,8 +88214,8 @@ self: {
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
        pname = "hexml";
-       version = "0.3";
-       sha256 = "ace36d4b3a6ca44dad0b4c2f1ab008252acd281e4ff97c3b08c9af41cafb7386";
+       version = "0.3.1";
+       sha256 = "90d31d91beb87bfb9c0f1b867061b3db6d14dcbf9da87a483d620617aca0b1b0";
        libraryHaskellDepends = [ base bytestring extra ];
        testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/ndmitchell/hexml#readme";
@@ -92001,8 +92160,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.6";
-       sha256 = "fd151310dcdb4fc8c317aabe0faf0b9563ccd59471de12ea3f10136c6f134712";
+       version = "5.0.7";
+       sha256 = "a6ef18db8d3e10707771c216af33e166130ba664eae380b060a1669e44454409";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97869,7 +98028,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-client_0_5_4" = callPackage
+  "http-client_0_5_5" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -97878,8 +98037,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.4";
-       sha256 = "f226b9dd4b7a6b5ef3becddd02baeabe3429b88584a42609ca3733c84bfe7300";
+       version = "0.5.5";
+       sha256 = "d1fdda6035e0bab95d3294f5175ac8c3629f9cd1d32e1bce5d0aa27226751c85";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie deepseq exceptions filepath
@@ -102931,6 +103090,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inflections_0_3_0_0" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec
+     , megaparsec, QuickCheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "inflections";
+       version = "0.3.0.0";
+       sha256 = "0391cb804f012fb27edc9d11c45bb60412bd703b5a7ebca5ccbf776d338926f1";
+       libraryHaskellDepends = [
+         base exceptions megaparsec text unordered-containers
+       ];
+       testHaskellDepends = [
+         base hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       homepage = "https://github.com/stackbuilders/inflections-hs";
+       description = "Inflections library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inflist" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -103138,8 +103317,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.6";
-       sha256 = "364c14c0003b6bdbb6338c017ff706ca2bd57dde828c801a1b588356ce15a4c1";
+       version = "0.6.1";
+       sha256 = "f722733b43839d12f936c5d2e3e8f2d33aae6752a605d4582959a7ad71ce2045";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers directory
          distributed-closure filepath ghc-heap-view inline-c jni jvm
@@ -103839,6 +104018,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "intro" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
+     , deepseq, dlist, extra, hashable, mtl, safe, string-conversions
+     , tagged, text, transformers, unordered-containers, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "intro";
+       version = "0.0.2.0";
+       sha256 = "21cab2d2d744ace03a892f06970db52f9f12294b9e04aa8dfca1c91d3ccef1c4";
+       libraryHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable mtl safe string-conversions tagged text transformers
+         unordered-containers writer-cps-mtl
+       ];
+       homepage = "https://github.com/minad/intro#readme";
+       description = "Total Prelude with Text and Monad transformers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "introduction" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl
@@ -104277,6 +104475,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip6addr_0_5_2" = callPackage
+    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
+     mkDerivation {
+       pname = "ip6addr";
+       version = "0.5.2";
+       sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
+       homepage = "https://github.com/MichelBoucey/ip6addr";
+       description = "Commandline tool to generate IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ipatch" = callPackage
     ({ mkDerivation, base, bytestring, darcs, directory, filepath
      , hashed-storage, process, unix
@@ -106050,8 +106263,8 @@ self: {
      }:
      mkDerivation {
        pname = "jni";
-       version = "0.2";
-       sha256 = "f98f57417cc015219446f2439c543dc0accd45a4bfdd87004c4c5be1b0b862bf";
+       version = "0.2.2";
+       sha256 = "67c1dc21d8f8a3d85e7b4ced2834d1bac4857e9102bb39f3c9d78618c1e72ea4";
        libraryHaskellDepends = [
          base bytestring containers inline-c singletons thread-local-storage
        ];
@@ -106231,6 +106444,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jose-jwt_0_7_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, containers
+     , cryptonite, doctest, either, hspec, HUnit, memory, mtl
+     , QuickCheck, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jose-jwt";
+       version = "0.7.4";
+       sha256 = "747088658aee2b57bce8dc27fa921f9c4181f2f01677dde9a4c17de18bd3febd";
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers cryptonite either memory
+         mtl text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cryptonite doctest either hspec HUnit memory
+         mtl QuickCheck text unordered-containers vector
+       ];
+       homepage = "http://github.com/tekul/jose-jwt";
+       description = "JSON Object Signing and Encryption Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jpeg" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -106308,8 +106544,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.7.0.3";
-       sha256 = "3ee57a6d2640833a511ac1b0aadbfa46bd0be09efabde9bb5e32ddb6d330a2df";
+       version = "0.7.1.0";
+       sha256 = "e93ea7dccd9aa640226a162fb6674b0c71c7acebf0ce9b85d76b0d388f06d53a";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -107396,6 +107632,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jvm-streaming" = callPackage
+    ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni
+     , jvm, singletons, streaming
+     }:
+     mkDerivation {
+       pname = "jvm-streaming";
+       version = "0.1";
+       sha256 = "45788461c552dc2cdcbbe389f3783c67942341e38fa7ba17bd0a906db573d256";
+       revision = "1";
+       editedCabalFile = "f0e204ab4b6d0a8aedb7105800727d22a990a4761787d5abfaa70d016832b184";
+       libraryHaskellDepends = [
+         base distributed-closure inline-java jni jvm singletons streaming
+       ];
+       testHaskellDepends = [ base hspec inline-java jvm streaming ];
+       homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";
+       description = "Expose Java iterators as streams from the streaming package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jwt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
      , data-default, doctest, http-types, HUnit, lens, lens-aeson
@@ -111712,22 +111967,21 @@ self: {
 
   "legion" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, binary-conduit
-     , bytestring, canteven-http, canteven-log, conduit, conduit-extra
-     , containers, data-default-class, data-dword, directory, exceptions
-     , http-types, monad-logger, network, Ranged-sets, scotty
-     , scotty-resource, stm, text, time, transformers, unix, uuid, wai
-     , wai-extra, warp
+     , bytestring, canteven-http, conduit, conduit-extra, containers
+     , data-default-class, data-dword, directory, exceptions, http-types
+     , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm
+     , text, transformers, unix, uuid, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.7.0.0";
-       sha256 = "c2dddc486653344bfe1c5c38c279f5fe8800f725d8778d8df4ef25856d6aed27";
+       version = "0.8.0.1";
+       sha256 = "5756a0ca948e17db7d6d5a904e2e444c9f0e74108e2a5ed139453a650e84f7f7";
        libraryHaskellDepends = [
          aeson attoparsec base binary binary-conduit bytestring
-         canteven-http canteven-log conduit conduit-extra containers
-         data-default-class data-dword directory exceptions http-types
-         monad-logger network Ranged-sets scotty scotty-resource stm text
-         time transformers unix uuid wai wai-extra warp
+         canteven-http conduit conduit-extra containers data-default-class
+         data-dword directory exceptions http-types monad-logger network
+         Ranged-sets scotty scotty-resource stm text transformers unix uuid
+         wai wai-extra warp
        ];
        homepage = "https://github.com/owensmurray/legion#readme";
        description = "Distributed, stateful, homogeneous microservice framework";
@@ -111736,23 +111990,23 @@ self: {
      }) {};
 
   "legion-discovery" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, Cabal
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal
      , canteven-http, canteven-log, conduit, containers
-     , data-default-class, http-types, legion, legion-extra
-     , monad-logger, scotty, scotty-resource, SHA, text, time
-     , transformers, wai, wai-extra, warp
+     , data-default-class, graphviz, http-types, legion, legion-extra
+     , monad-logger, scotty, scotty-format, scotty-resource, SHA, text
+     , time, transformers, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion-discovery";
-       version = "0.2.1.1";
-       sha256 = "9ecb4471cf9a52fd973d95c356d35542e4b12306eb7078f43e4a279d0c478131";
+       version = "0.2.2.1";
+       sha256 = "5338e9ffb14ced8f1ec8bde7c9138e769ef643da8930937fc79cdbac970d6096";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring Cabal canteven-http canteven-log
-         conduit containers data-default-class http-types legion
-         legion-extra monad-logger scotty scotty-resource SHA text time
-         transformers wai wai-extra warp
+         aeson attoparsec base binary bytestring Cabal canteven-http
+         canteven-log conduit containers data-default-class graphviz
+         http-types legion legion-extra monad-logger scotty scotty-format
+         scotty-resource SHA text time transformers wai wai-extra warp
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
@@ -111769,8 +112023,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-discovery-client";
-       version = "0.1.0.1";
-       sha256 = "6235b5f23411bfe0807274e4e31b5e9f805045b214f63a2cfbefed29d9fe27f1";
+       version = "0.1.0.2";
+       sha256 = "d9f8b1f24d90b3711ec81555c21e722280bcb59914c2341bb89e21f9b699dd5d";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-default-class
          http-client http-types load-balancing network text
@@ -111787,8 +112041,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.0.5";
-       sha256 = "f61dc20ac3380725dbf34b934623131c37c4072f081d6d649ffb2a6d4be007f6";
+       version = "0.1.0.6";
+       sha256 = "e9471ff2b1d50596bbe86fd414e78bcd31aa78b867ac3439fddd58e21d24c0c5";
        libraryHaskellDepends = [
          aeson base bytestring canteven-log containers data-default-class
          legion network safe split yaml
@@ -112247,8 +112501,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.4.0";
-       sha256 = "e990aad8168d8e106ef35a0e8dc1fc707d467dfd87db8127f8ec568a47100f8b";
+       version = "1.0.6.0";
+       sha256 = "9a55ddd34f6e41ba274fa1b303262dc883868ffcb0e24810b432441e5ebe220a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127810,8 +128064,8 @@ self: {
     ({ mkDerivation, async, base, bytestring, template-haskell, unix }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.2.5.0";
-       sha256 = "160e9f29ddc659a39c96de3971de7086528f608e372912a3f4e5b5f11a94590b";
+       version = "0.2.5.1";
+       sha256 = "d61e25c00736a33cd5f16555751047fb5e1d79cdc606622f4cba400c6f3df008";
        libraryHaskellDepends = [
          async base bytestring template-haskell unix
        ];
@@ -128777,22 +129031,20 @@ self: {
      }) {};
 
   "numerals" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, containers
-     , containers-unicode-symbols, fingertree, HUnit, integer-gmp
+    ({ mkDerivation, base, containers, fingertree, HUnit, integer-gmp
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text
      }:
      mkDerivation {
        pname = "numerals";
-       version = "0.4";
-       sha256 = "15139b63ec44ce2c308176c96184b3b2d94537f64298a1e128c32e641ca77dba";
+       version = "0.4.1";
+       sha256 = "d2a46b9535bd57ed386adad95e145da4c3e72f595328ebd61302e3887583e1d2";
        libraryHaskellDepends = [
-         base base-unicode-symbols containers containers-unicode-symbols
-         fingertree integer-gmp text
+         base containers fingertree integer-gmp text
        ];
        testHaskellDepends = [
-         base base-unicode-symbols HUnit integer-gmp QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
@@ -129073,6 +129325,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nvim-hs-ghcid" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, yaml
+     }:
+     mkDerivation {
+       pname = "nvim-hs-ghcid";
+       version = "0.1.0";
+       sha256 = "c0f900633873759e49a08be61d8c91c1507f95b2e108d39d1d517adf9adc7bde";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath ghcid nvim-hs
+         nvim-hs-contrib resourcet yaml
+       ];
+       homepage = "https://github.com/saep/nvim-hs-ghcid";
+       description = "Neovim plugin that runs ghcid to update the quickfix list";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "nvvm" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory
      , filepath, template-haskell
@@ -131293,10 +131562,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "ordered-containers";
-       version = "0.0";
-       sha256 = "ea40528ec95f2424bd7231da44b9d96a80b46b4116b2cdfbb57269c88f2419cb";
-       revision = "1";
-       editedCabalFile = "a8de69537c43ab967f7f512466a5a0e32000e9179239b4c10adf3cd3cfd1e524";
+       version = "0.1.0";
+       sha256 = "cb089747cfffd5affedcd08a7e7fed02e5dd90defb513e84440b76f307f35587";
        libraryHaskellDepends = [ base containers ];
        description = "Set- and Map-like types that remember the order elements were inserted";
        license = stdenv.lib.licenses.bsd3;
@@ -133487,8 +133754,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.4.5.0";
-       sha256 = "d60fb0d72ad518e3f3cf49fe6576ad5f2c1f371d75884394791fe2dcf417c5c9";
+       version = "0.4.6.0";
+       sha256 = "166d22f0e1cc2c3e965b84556c07a8ce51537b36aa5ff07d7fd4893a5bcdfd01";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136265,6 +136532,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-cacophony_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes
+     }:
+     mkDerivation {
+       pname = "pipes-cacophony";
+       version = "0.4.1";
+       sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360";
+       libraryHaskellDepends = [ base bytestring cacophony memory pipes ];
+       testHaskellDepends = [ base hlint ];
+       homepage = "https://github.com/centromere/pipes-cacophony";
+       description = "Pipes for Noise-secured network connections";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-cellular" = callPackage
     ({ mkDerivation, base, bytestring, data-cell, pipes }:
      mkDerivation {
@@ -139463,8 +139745,8 @@ self: {
      }:
      mkDerivation {
        pname = "praglude";
-       version = "0.2.1.0";
-       sha256 = "6d0a637bccc13464149d75482e61ed8f10caf93d721d43f49e583032aad6d776";
+       version = "0.3.0.0";
+       sha256 = "8c5c2cdbff18b89b61b28680d92ad9c8204abcf9ef264b5b4622f1ee21f744da";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring casing containers
          data-default deepseq directory filepath hashable lens mtl random
@@ -139480,18 +139762,18 @@ self: {
     ({ mkDerivation, aeson, base, basic-prelude, exceptions
      , fast-logger, lens, monad-control, monad-logger, mtl, resourcet
      , safe, shakers, template-haskell, text, text-manipulate, time
-     , transformers-base, unordered-containers
+     , transformers-base, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.8";
-       sha256 = "2827df5cd7df280b1ca9092e0a17b585341f758ec91d490be7287483f623b374";
+       version = "0.0.13";
+       sha256 = "12d47c88d2ea714d58cd4527fb2826d49e2b5d49bc3d8dda8f6fd52bd4dd830a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base basic-prelude exceptions fast-logger lens monad-control
          monad-logger mtl resourcet safe template-haskell text
-         text-manipulate time transformers-base unordered-containers
+         text-manipulate time transformers-base unordered-containers uuid
        ];
        executableHaskellDepends = [ base shakers ];
        homepage = "https://github.com/swift-nav/preamble";
@@ -142331,6 +142613,8 @@ self: {
        pname = "purescript";
        version = "0.10.3";
        sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2";
+       revision = "2";
+       editedCabalFile = "cd4a6818028652cb5c630372f872072197ef5822edf1814eaf8cd672c75683b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146685,6 +146969,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "refresht" = callPackage
+    ({ mkDerivation, base, data-default, exceptions, lens, mtl }:
+     mkDerivation {
+       pname = "refresht";
+       version = "0.1.0.1";
+       sha256 = "5c910830cc9ee1272602d84ef8545f31120bf456205d18553e2e7cb8fc9c223e";
+       libraryHaskellDepends = [ base data-default exceptions lens mtl ];
+       homepage = "https://github.com/konn/refresht#readme";
+       description = "Environment Monad with automatic resource refreshment";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -146789,10 +147085,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-do";
-       version = "3.1";
-       sha256 = "487ab5968208a0d7ad7b37016145e4a864dc35ae36976ea77328ae3d6b9d590b";
-       revision = "3";
-       editedCabalFile = "ca32ec1c90923370783cfe79bbdae877f4f98f8e816a32dde618874842c2f178";
+       version = "3.2";
+       sha256 = "a7e8a864ee66c2a37fbf4574153dd42ee727283f8f5d0d142f7946172131977b";
        libraryHaskellDepends = [
          array base bytestring regex-base regex-pcre stringsearch tagged
          text
@@ -148481,6 +148775,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "resolve" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-binary, base, bv
+     , bytestring, hashable, hashmap, hslogger, iproute, network, parsec
+     , stm, stm-containers, transformers
+     }:
+     mkDerivation {
+       pname = "resolve";
+       version = "0.1.0.0";
+       sha256 = "4c011446e1cd2865abbcb3d4979f6bbd65d5bd4f54d11819b5a5777cb4b6aa39";
+       libraryHaskellDepends = [
+         attoparsec attoparsec-binary base bv bytestring hashable hashmap
+         hslogger iproute network parsec stm stm-containers transformers
+       ];
+       homepage = "https://github.com/riaqn/resolve#readme";
+       description = "A name resolusion library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "resolve-trivial-conflicts" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
      , filepath, mtl, optparse-applicative, process, unix
@@ -151134,6 +151446,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "safe-money" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal
+     , constraints, deepseq, hashable, store, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "safe-money";
+       version = "0.2";
+       sha256 = "c328e6c36589ad133c8172ce82e64103ad1efd475b311b65a1e7e708dd651636";
+       libraryHaskellDepends = [
+         aeson base binary cereal constraints deepseq hashable store
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring cereal constraints deepseq hashable
+         store tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/k0001/safe-money";
+       description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safe-plugins" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell-src-exts
      , plugins, Unixutils
@@ -152725,10 +153058,8 @@ self: {
      }:
      mkDerivation {
        pname = "scotty-format";
-       version = "0.1.0.2";
-       sha256 = "848a326a18445c1c7f39a7aa5a46d3f042c2e9abfd1ef8f972751f51b4c00968";
-       revision = "1";
-       editedCabalFile = "64c796f66dd445224f06820feec9d91717a1de9d2d24d993d5db1d6021240d32";
+       version = "0.1.1.0";
+       sha256 = "cb6da220c05c95b8deb0fb8cc1505447d462456dbb36bfacee6467d8207f3599";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base http-media http-types scotty text ];
@@ -156546,6 +156877,33 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare_2_0_12_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+     , process, scientific, template-haskell, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.12.1";
+       sha256 = "057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "shakespeare-babel" = callPackage
     ({ mkDerivation, base, classy-prelude, data-default, directory
      , process, shakespeare, template-haskell
@@ -157152,6 +157510,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "show-please" = callPackage
+    ({ mkDerivation, base, mtl, parsec, template-haskell }:
+     mkDerivation {
+       pname = "show-please";
+       version = "0.3";
+       sha256 = "1abd203bf8f0ac863f38f1be813594e0ab30ad5b79aa31730926586c40db642e";
+       libraryHaskellDepends = [ base mtl parsec template-haskell ];
+       homepage = "https://github.com/ddssff/show-please";
+       description = "A wrapper type V with improved Show instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "show-prettyprint" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }:
      mkDerivation {
@@ -163209,8 +163579,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.3.0";
-       sha256 = "060ed345ee724b916427430004548c519eb0219242a019ee06c8afd9a793497b";
+       version = "1.3.2";
+       sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165279,6 +165649,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-bytestring_0_1_4_5" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
+     , resourcet, smallcheck, streaming, tasty, tasty-smallcheck
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.1.4.5";
+       sha256 = "e77047f4027ac7dc4128fdbf651c8a288dab34e580c944bd8eef23e5a236d84e";
+       libraryHaskellDepends = [
+         base bytestring deepseq exceptions mmorph mtl resourcet streaming
+         transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base bytestring smallcheck streaming tasty tasty-smallcheck
+         transformers
+       ];
+       homepage = "https://github.com/michaelt/streaming-bytestring";
+       description = "effectful byte steams, or: bytestring io done right";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
@@ -169811,8 +170204,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-bot";
-       version = "0.5.1.0";
-       sha256 = "525fc12654179fa7c57ae062741bb236f5821dc1b5c0c8b9a5c62946d8817fd3";
+       version = "0.5.4.0";
+       sha256 = "a163600c8b5bca5b545f7701d14165961ce499263e3a27dac8acdca3fe29b072";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171457,8 +171850,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-printer";
-       version = "0.4";
-       sha256 = "b878db9dfb786368324c35cb3e1070264eaa6b1d0f1459bf1581114bfbeb9149";
+       version = "0.5";
+       sha256 = "8f0c01a6a15b4314c2d47ab5f0772d176ec38f1c1fe190b9fa7db5149a6c4a0b";
        libraryHaskellDepends = [
          base bytestring pretty semigroups text text-latin1
        ];
@@ -171782,8 +172175,8 @@ self: {
      }:
      mkDerivation {
        pname = "textlocal";
-       version = "0.1.0.3";
-       sha256 = "56237c4982513680358a13d5bba261e55ce4ec2346e402b8ba438f7a11d06e1c";
+       version = "0.1.0.5";
+       sha256 = "8954ff6270c9920fc390be6b9f398975ea06dd6808a411cbf8fa5fb4a9cf3087";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-conduit text
          unix-time
@@ -173413,42 +173806,50 @@ self: {
      }) {};
 
   "time-warp" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , data-default, data-msgpack, exceptions, formatting, hslogger
-     , hspec, lens, lifted-base, monad-control, monad-loops, MonadRandom
-     , mtl, network-msgpack-rpc, pqueue, QuickCheck
-     , quickcheck-instances, random, safe, serokell-util, stm
-     , template-haskell, text, text-format, time, time-units
-     , transformers, transformers-base
+    ({ mkDerivation, ansi-terminal, array, async, attoparsec, base
+     , binary, binary-conduit, bytestring, conduit, conduit-extra
+     , containers, data-default, data-msgpack, deepseq, exceptions
+     , extra, formatting, hashable, hspec, lens, lifted-base, log-warper
+     , mmorph, monad-control, monad-loops, MonadRandom, mtl, network
+     , pqueue, QuickCheck, quickcheck-instances, random, safe
+     , semigroups, serokell-util, slave-thread, stm, stm-chans
+     , stm-conduit, streaming-commons, template-haskell, text
+     , text-format, time, time-units, transformers, transformers-base
+     , unordered-containers
      }:
      mkDerivation {
        pname = "time-warp";
-       version = "0.1.1.2";
-       sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187";
+       version = "1.1.1.0";
+       sha256 = "4e9fa28d8c67801fc302a7eec2457a2dda41b556129aebf0821bc250307ded4d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base bytestring containers data-default data-msgpack
-         exceptions formatting hslogger lens lifted-base monad-control
-         monad-loops MonadRandom mtl network-msgpack-rpc pqueue QuickCheck
-         quickcheck-instances random safe serokell-util stm template-haskell
-         text text-format time time-units transformers transformers-base
+         ansi-terminal array attoparsec base binary binary-conduit
+         bytestring conduit conduit-extra containers data-default
+         data-msgpack deepseq exceptions extra formatting hashable lens
+         lifted-base log-warper mmorph monad-control monad-loops MonadRandom
+         mtl network pqueue QuickCheck quickcheck-instances random safe
+         semigroups serokell-util slave-thread stm stm-chans stm-conduit
+         streaming-commons template-haskell text text-format time time-units
+         transformers transformers-base unordered-containers
        ];
        executableHaskellDepends = [
-         async base data-default data-msgpack exceptions formatting hspec
-         lens MonadRandom mtl network-msgpack-rpc QuickCheck random
-         serokell-util stm text text-format time-units transformers
+         async base binary binary-conduit conduit data-default data-msgpack
+         exceptions formatting hspec lens log-warper MonadRandom mtl
+         QuickCheck random serokell-util stm text text-format time-units
+         transformers
        ];
        testHaskellDepends = [
-         async base data-default data-msgpack exceptions hspec lens mtl
-         network-msgpack-rpc QuickCheck random serokell-util stm text
-         text-format time-units transformers
+         async base data-default data-msgpack exceptions hspec lens
+         log-warper mtl QuickCheck random serokell-util stm text text-format
+         time-units transformers
        ];
        homepage = "https://github.com/serokell/time-warp";
        description = "Distributed systems execution emulation";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {log-warper = null;};
 
   "timecalc" = callPackage
     ({ mkDerivation, base, haskeline, uu-parsinglib }:
@@ -173737,8 +174138,8 @@ self: {
      }:
      mkDerivation {
        pname = "timeseries";
-       version = "0.4.0";
-       sha256 = "a073a252dcdb671e57a784f4b37f2009f6e0890579bf705869c572923047af51";
+       version = "0.4.1";
+       sha256 = "4e7a17717484225b904c5511152087b6ff9cb1d155fde7277b4bcc9b58c5151e";
        libraryHaskellDepends = [
          base bytestring cassava statistics text text-time time vector
        ];
@@ -173756,8 +174157,8 @@ self: {
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "timespan";
-       version = "0.2.0.0";
-       sha256 = "4e6ce1f32725700c4b78ed4806d90a5ce1275dce9504f78164a454a4ef4b8fe6";
+       version = "0.3.0.0";
+       sha256 = "46a51e1e0d776d65d0094bf8158c938255491fbaa4d4f39b0a1477806312851f";
        libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/agrafix/timespan#readme";
        description = "Useful timespan datatype and functions";
@@ -180573,6 +180974,8 @@ self: {
        pname = "validity";
        version = "0.3.0.4";
        sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f";
+       revision = "1";
+       editedCabalFile = "73bff6370f4e90101291fb3904f388ea57013a6a45997b273b578332149a8d19";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -183984,8 +184387,8 @@ self: {
      }:
      mkDerivation {
        pname = "wave";
-       version = "0.1.1";
-       sha256 = "13d5475356efc3ae95c971e930d5e4bf18f9395dc1bd7b63e8bb8e7ed26ddf23";
+       version = "0.1.2";
+       sha256 = "930d16bc03779c42bdf117ba2a2ac30b3ab08f9d214d9ca52526150d9eec07e3";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default-class transformers
        ];
@@ -185744,8 +186147,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.3";
-       sha256 = "2982a25dbdb4bcbfe563cc49f1bae58d8b837014ad28365eb09405222165f311";
+       version = "0.3.4";
+       sha256 = "8d22d044f67a1edf37cbb59cc3226585dcaa15f1c2b83696d7e191d50053aea2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192293,6 +192696,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zip_0_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, exceptions
+     , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
+     , resourcet, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "0.1.5";
+       sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974";
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest exceptions filepath mtl path
+         path-io plan-b resourcet text time transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit containers exceptions filepath hspec path
+         path-io QuickCheck text time transformers
+       ];
+       homepage = "https://github.com/mrkkrp/zip";
+       description = "Operations on zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty

From ca41610e8aef4a958f6a24f9fba2b125b5442338 Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Fri, 23 Dec 2016 12:23:35 -0600
Subject: [PATCH 55/70] ghc-8.0.1: enable documentation builds by passing the
 required XML/XSLT toolchain

---
 pkgs/development/compilers/ghc/8.0.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index db9e0682096..58e2ff18c1b 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils
+, hscolour, patchutils, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42
 }:
 
 let
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
   ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
-  buildInputs = [ ghc perl hscolour ];
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
 
   enableParallelBuilding = true;
 

From 1a78981b2f5141bac2f8d0255998b9465b0043a9 Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Sun, 25 Dec 2016 07:57:58 -0600
Subject: [PATCH 56/70] ghc-8.0.1: switch to sphinx for documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #20281

"Since GHC 8.0, the User’s Guide is authored in ReStructuredText (or ReST
or RST, for short) a rich but light-weight mark-up language aimed at
producing documentation. The Sphinx tool is used to produce the final
PDF and HTML documentation."
- http://ghc.readthedocs.io/en/8.0.1/editing-guide.html
---
 pkgs/development/compilers/ghc/8.0.1.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 58e2ff18c1b..1834f3ae50b 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42
+, hscolour, patchutils, sphinx
 }:
 
 let
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
   ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
+  buildInputs = [ ghc perl hscolour sphinx];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4cdc70fed4f..59c737dce6d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -45,6 +45,7 @@ rec {
     ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec {
       bootPkgs = packages.ghc7103;
       inherit (bootPkgs) hscolour;
+      sphinx = pkgs.python27Packages.sphinx;
     };
     ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
       bootPkgs = packages.ghc7103;

From 527468209c66b53e37121e67edc39acadb6da9da Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Mon, 26 Dec 2016 08:15:32 -0600
Subject: [PATCH 57/70] ghc-8.0.2: add sphinx to inputs for documentation

Closes https://github.com/NixOS/nixpkgs/pull/21434.
---
 pkgs/development/compilers/ghc/8.0.2.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 977a0fb39b6..b2ae92e02c6 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
-, hscolour, patchutils
+, hscolour, patchutils, sphinx
 }:
 
 let
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
-  buildInputs = [ ghc perl hscolour ];
+  buildInputs = [ ghc perl hscolour sphinx ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 59c737dce6d..f229fb8a35c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -50,6 +50,7 @@ rec {
     ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
       bootPkgs = packages.ghc7103;
       inherit (bootPkgs) hscolour;
+      sphinx = pkgs.python27Packages.sphinx;
     };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc7103;

From 9459dc42c80feae1c2ad2c7737a96bddb9a973d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Dec 2016 15:59:17 +0100
Subject: [PATCH 58/70] haskell-stack: use latest http-client library

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a9ad1a695ac..646db06bb35 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -998,7 +998,7 @@ self: super: {
 
   # The most current version needs some packages to build that are not in LTS 7.x.
   stack = super.stack.overrideScope (self: super: {
-    http-client = self.http-client_0_5_4;
+    http-client = self.http-client_0_5_5;
     http-client-tls = self.http-client-tls_0_3_3;
     http-conduit = self.http-conduit_2_2_3;
     optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;

From 49ba174e7aa7d553214b8ee829753b5bb1a4ba23 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 14 Dec 2016 11:17:48 -0800
Subject: [PATCH 59/70] elm-export: jailbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 646db06bb35..9b03d4633bc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1136,4 +1136,6 @@ self: super: {
   # requires vty 5.13
   brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });
 
+  # https://github.com/krisajenkins/elm-export/pull/22
+  elm-export = doJailbreak super.elm-export;
 }

From 93fc4281ba4cb0464909941a59a60057bd6c9cd3 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 14 Dec 2016 11:18:53 -0800
Subject: [PATCH 60/70] hackage2nix.yaml: update jb55's packages

---
 .../haskell-modules/configuration-hackage2nix.yaml           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 42858390c30..06480f59f28 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2068,10 +2068,13 @@ package-maintainers:
     - ghc-srcspan-plugin
     - located-base
   jb55:
-    - skeletons
+    - bson-lens
     - cased
+    - elm-export-persistent
     - pipes-csv
     - pipes-mongodb
+    - skeletons
+    - streaming-wai
   khumba:
     - hoppy-docs
     - hoppy-generator

From 5ac7da93760905148581a543fdb24ce376b69441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Dec 2016 19:08:17 +0100
Subject: [PATCH 61/70] tzdata: 2016f -> 2016j

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

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 0e59e2e04e3..7784e59e4b2 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2016f";
+  version = "2016j";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "1c024mg4gy572vgdj9rk4dqnb33iap06zs8ibasisbyi1089b37d";
+        sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1vb6n29ik7dzhffzzcnskbhmn6h1dxzan3zanbp118wh8hw5yckj";
+        sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr";
       })
     ];
 

From 384185f9427d6722335a28a881fad4f904aafbeb Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 16:42:47 -0200
Subject: [PATCH 62/70] openmw: 0.40.0 -> 0.41.0

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

diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index f9be01aa928..8b3998aa619 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -11,14 +11,14 @@ let
     };
   });
 in stdenv.mkDerivation rec {
-  version = "0.40.0";
+  version = "0.41.0";
   name = "openmw-${version}";
 
   src = fetchFromGitHub {
     owner = "OpenMW";
     repo = "openmw";
     rev = name;
-    sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w";
+    sha256 = "1qay278965i7ja2rjllhcqfq7zpbapd7w57xly02apniadyfg0yz";
   };
 
   enableParallelBuilding = true;

From 421a7f37fa62c92921e4d0b8853427317f561733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Dec 2016 20:16:12 +0100
Subject: [PATCH 63/70] gdk-pixbuf: security 2.36.0 -> 2.36.2

/cc #21457.  The rebuild impact is probably only a few thousand.
The new utility is put into $out/bin/.
---
 .../libraries/gdk-pixbuf/default.nix           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index f3db9bf5977..736014d665c 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,18 +3,17 @@
 
 let
   ver_maj = "2.36";
-  ver_min = "0";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c";
+    sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
-  outputBin = "dev";
 
   setupHook = ./setup-hook.sh;
 
@@ -27,14 +26,21 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
+  configureFlags = "--with-libjasper --with-x11"
+    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
+    ;
+
   # on darwin, tests don't link
   preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
     substituteInPlace Makefile --replace "docs tests" "docs"
   '';
 
-  configureFlags = "--with-libjasper --with-x11"
-    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
-    ;
+  postInstall =
+    # All except one utility seem to be only useful during building.
+    ''
+      moveToOutput "bin" "$dev"
+      moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+    '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
   inherit (doCheck);

From e4a25aabf26082ac11ecb98371bef595fad4ba33 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 28 Dec 2016 13:41:19 -0600
Subject: [PATCH 64/70] Add top-level attr for lldb. (#21476)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39ddbf8022f..5b261c83b65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5140,6 +5140,8 @@ in
 
   lizardfs = callPackage ../tools/filesystems/lizardfs { };
 
+  lldb = llvmPackages.lldb;
+
   llvm = llvmPackages.llvm;
 
   llvm_39 = llvmPackages_39.llvm;

From 310d3fb910c95598aaccea3415e70657b1a77f50 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 17:36:34 -0200
Subject: [PATCH 65/70] freeciv: 2.5.3 -> 2.5.6

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

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index b5619644bd8..c5f3dfeabab 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -10,14 +10,14 @@ let
   gtkName = if gtkClient then "-gtk" else "";
 
   name = "freeciv";
-  version = "2.5.3";
+  version = "2.5.6";
 in
 stdenv.mkDerivation {
   name = "${name}${sdlName}${gtkName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
-    sha256 = "0p40bpkhbldsnlqdvfn3qd2vzadxfrfsf1r57x1akwabqs0h62s8";
+    sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 00c46ecd74ee8c85c30191652e3bb25f9c91867a Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 28 Dec 2016 18:32:34 -0200
Subject: [PATCH 66/70] freeciv: add enable_sqlite

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

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index c5f3dfeabab..9e2a8b19609 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
 , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
 , gtkClient ? false, gtk2
-, server ? true, readline }:
+, server ? true, enable_sqlite ? true, readline, sqlite }:
 
 let
   inherit (stdenv.lib) optional optionals;
@@ -25,10 +25,12 @@ stdenv.mkDerivation {
   buildInputs = [ zlib bzip2 curl lzma gettext ]
     ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
     ++ optionals gtkClient [ gtk2 ]
-    ++ optional server readline;
+    ++ optional server readline
+    ++ optional enable_sqlite sqlite;
 
   configureFlags = []
     ++ optional sdlClient "--enable-client=sdl"
+    ++ optional enable_sqlite "--enable-fcdb=sqlite3"
     ++ optional (!gtkClient) "--enable-fcmp=cli"
     ++ optional (!server) "--disable-server";
 

From a36a2412ee99d0e7714143e174b1f994635cc1d9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 28 Dec 2016 18:50:54 +0300
Subject: [PATCH 67/70] libudev0-shim: init at 1

---
 .../linux/libudev0-shim/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/libudev0-shim/default.nix

diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix
new file mode 100644
index 00000000000..203d1defa28
--- /dev/null
+++ b/pkgs/os-specific/linux/libudev0-shim/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, udev }:
+
+stdenv.mkDerivation rec {
+  name = "libudev0-shim-${version}";
+  version = "1";
+
+  src = fetchFromGitHub {
+    owner = "archlinux";
+    repo = "libudev0-shim";
+    rev = "v${version}";
+    sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z";
+  };
+
+  buildInputs = [ udev ];
+
+  installPhase = ''
+    name="$(echo libudev.so.*)"
+    install -Dm755 "$name" "$out/lib/$name"
+    ln -s "$name" "$out/lib/libudev.so.0"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Shim to preserve libudev.so.0 compatibility";
+    homepage = "https://github.com/archlinux/libudev0-shim";
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b261c83b65..a73e0ad1781 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11671,6 +11671,7 @@ in
 
   # libudev.so.0
   udev182 = callPackage ../os-specific/linux/udev/182.nix { };
+  libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
   udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };

From cdf306909f3bf25fe962195c584dbe5b18ee9896 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 28 Dec 2016 18:51:01 +0300
Subject: [PATCH 68/70] udev182: remove

---
 pkgs/games/steam/runtime-wrapped.nix |  2 +-
 pkgs/os-specific/linux/udev/145.nix  | 53 ----------------------------
 pkgs/os-specific/linux/udev/182.nix  | 39 --------------------
 pkgs/top-level/all-packages.nix      |  2 --
 4 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/udev/145.nix
 delete mode 100644 pkgs/os-specific/linux/udev/182.nix

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 38d73f59dee..d9d6e0ecf0d 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -44,7 +44,7 @@ let
     libav
     atk
     # Only libraries are needed from those two
-    udev182
+    libudev0-shim
     networkmanager098
 
     # Verified games requirements
diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix
deleted file mode 100644
index 6dd551e1ce1..00000000000
--- a/pkgs/os-specific/linux/udev/145.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  name = "udev-145";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
-  };
-
-  buildInputs = [gperf pkgconfig glib acl libusb usbutils];
-
-  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
-
-  preConfigure =
-    ''
-      substituteInPlace extras/keymap/Makefile.in \
-        --replace /usr/include ${stdenv.glibc.dev}/include
-    '';
-
-  postInstall =
-    ''
-      # Install some rules that really should be installed by default.
-      for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
-        cp rules/packages/$i $out/libexec/rules.d/
-      done
-
-      # The path to rule_generator.functions in write_cd_rules and
-      # write_net_rules is broken.  Also, don't store the mutable
-      # persistant rules in /etc/udev/rules.d but in
-      # /var/lib/udev/rules.d.
-      for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do
-        substituteInPlace $i \
-          --replace /lib/udev $out/libexec \
-          --replace /etc/udev/rules.d /var/lib/udev/rules.d
-      done
-
-      # Don't set PATH to /bin:/sbin; won't work in NixOS.
-      substituteInPlace $out/libexec/rule_generator.functions \
-        --replace 'PATH=' '#PATH='
-
-      # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
-      # environment of the caller.
-      sed '3,4d' -i $out/libexec/firmware.sh
-    '';
-
-  meta = {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
-    description = "Udev manages the /dev filesystem";
-  };
-}
diff --git a/pkgs/os-specific/linux/udev/182.nix b/pkgs/os-specific/linux/udev/182.nix
deleted file mode 100644
index 33a4907c7ca..00000000000
--- a/pkgs/os-specific/linux/udev/182.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig
-, pciutils, utillinux, kmod, usbutils, gperf
-}:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  name = "udev-182";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "143qvm0kij26j2l5icnch4x38fajys6li7j0c5mpwi6kqmc8hqx0";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [ utillinux kmod usbutils #glib gobjectIntrospection
-                  gperf
-                ];
-
-  configureFlags = [ "--with-pci-ids-path=${pciutils}/share/pci.ids"
-                     "--disable-gudev"
-                     "--disable-introspection"
-                   ];
-
-  postPatch = ''
-    sed -i 's:input.h:input-event-codes.h:' Makefile.in
-    sed -i '20a#include <stdint.h>' src/mtd_probe/mtd_probe.h
-  '';
-
-  NIX_LDFLAGS = [ "-lrt" ];
-
-  meta = with stdenv.lib; {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
-    description = "Udev manages the /dev filesystem";
-    platforms = platforms.linux;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a73e0ad1781..d9e462a208f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11669,8 +11669,6 @@ in
 
   eudev = callPackage ../os-specific/linux/eudev {};
 
-  # libudev.so.0
-  udev182 = callPackage ../os-specific/linux/udev/182.nix { };
   libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };

From d479639187d0b3142aa158e15f1014e928a9f90c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 29 Dec 2016 00:33:13 +0300
Subject: [PATCH 69/70] freeciv: build with shared (not static) libraries

---
 pkgs/games/freeciv/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index d33d0bf80a8..608b1a01120 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -16,6 +16,7 @@ let
 in
 stdenv.mkDerivation {
   name = "${name}${sdlName}${gtkName}-${version}";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
@@ -30,7 +31,7 @@ stdenv.mkDerivation {
     ++ optional server readline
     ++ optional enableSqlite sqlite;
 
-  configureFlags = []
+  configureFlags = [ "--enable-shared" ]
     ++ optional sdlClient "--enable-client=sdl"
     ++ optional enableSqlite "--enable-fcdb=sqlite3"
     ++ optional (!gtkClient) "--enable-fcmp=cli"

From 81d8a457ed83a83f2cb4a0151ce0a9451f77eb20 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Wed, 28 Dec 2016 23:04:58 +0100
Subject: [PATCH 70/70] Fix asterisk & asterisk: 13.6.0 -> 14.1.2 (#20788)

* fix/asterisk-module: use unix-group for asterisk-files
* fix/asterisk-module: add configOption to use some default config-files
* fix/asterisk-module: correction of skel copy
* fix/asterisk-module: use /etc/asterisk as configDir
* fix/asterisk-module: add reload; do not restart unit
* asterisk: 13.6.0 -> 14.1.2
* fix/asterisk: compile with lua, pjsip, format_mp3
* fix/asterisk: fix indentation
* fix/asterisk: remove broken flag
---
 nixos/modules/misc/ids.nix                    |  2 +-
 .../modules/services/networking/asterisk.nix  | 60 +++++++++++++++----
 pkgs/servers/asterisk/default.nix             | 44 +++++++++-----
 pkgs/servers/asterisk/disable-download.patch  |  8 +--
 pkgs/servers/asterisk/runtime-vardirs.patch   |  6 +-
 5 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 70705771183..eb6f8e70689 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -467,7 +467,7 @@
       ihaskell = 189;
       i2p = 190;
       lambdabot = 191;
-      #asterisk = 192; # unused
+      asterisk = 192;
       plex = 193;
       sabnzbd = 194;
       #grafana = 196; #unused
diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix
index 13617a1b6c5..5c71a1d8dda 100644
--- a/nixos/modules/services/networking/asterisk.nix
+++ b/nixos/modules/services/networking/asterisk.nix
@@ -6,29 +6,38 @@ let
   cfg = config.services.asterisk;
 
   asteriskUser = "asterisk";
+  asteriskGroup = "asterisk";
 
   varlibdir = "/var/lib/asterisk";
   spooldir = "/var/spool/asterisk";
   logdir = "/var/log/asterisk";
 
+  # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override
+  defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;
+  allConfFiles =
+    cfg.confFiles //
+    builtins.listToAttrs (map (x: { name = x;
+                                    value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); })
+                              defaultConfFiles);
+
   asteriskEtc = pkgs.stdenv.mkDerivation
   ((mapAttrs' (name: value: nameValuePair
         # Fudge the names to make bash happy
         ((replaceChars ["."] ["_"] name) + "_")
         (value)
-      ) cfg.confFiles) //
+      ) allConfFiles) //
   {
     confFilesString = concatStringsSep " " (
-      attrNames cfg.confFiles
+      attrNames allConfFiles
     );
 
-    name = "asterisk.etc";
+    name = "asterisk-etc";
 
     # Default asterisk.conf file
     # (Notice that astetcdir will be set to the path of this derivation)
     asteriskConf = ''
       [directories]
-      astetcdir => @out@
+      astetcdir => /etc/asterisk
       astmoddir => ${pkgs.asterisk}/lib/asterisk/modules
       astvarlibdir => /var/lib/asterisk
       astdbdir => /var/lib/asterisk
@@ -169,6 +178,16 @@ in
         '';
       };
 
+      useTheseDefaultConfFiles = mkOption {
+        default = [ "ari.conf" "acl.conf" "agents.conf" "amd.conf" "calendar.conf" "cdr.conf" "cdr_syslog.conf" "cdr_custom.conf" "cel.conf" "cel_custom.conf" "cli_aliases.conf" "confbridge.conf" "dundi.conf" "features.conf" "hep.conf" "iax.conf" "pjsip.conf" "pjsip_wizard.conf" "phone.conf" "phoneprov.conf" "queues.conf" "res_config_sqlite3.conf" "res_parking.conf" "statsd.conf" "udptl.conf" "unistim.conf" ];
+        type = types.listOf types.str;
+        example = [ "sip.conf" "dundi.conf" ];
+        description = ''Sets these config files to the default content. The default value for
+          this option contains all necesscary files to avoid errors at startup.
+          This does not override settings via <option>services.asterisk.confFiles</option>.
+        '';
+      };
+
       extraArguments = mkOption {
         default = [];
         type = types.listOf types.str;
@@ -182,12 +201,22 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = singleton
-    { name = asteriskUser;
-      uid = config.ids.uids.asterisk;
-      description = "Asterisk daemon user";
-      home = varlibdir;
-    };
+    environment.systemPackages = [ pkgs.asterisk ];
+
+    environment.etc.asterisk.source = asteriskEtc;
+
+    users.extraUsers.asterisk =
+      { name = asteriskUser;
+        group = asteriskGroup;
+        uid = config.ids.uids.asterisk;
+        description = "Asterisk daemon user";
+        home = varlibdir;
+      };
+
+    users.extraGroups.asterisk =
+      { name = asteriskGroup;
+        gid = config.ids.gids.asterisk;
+      };
 
     systemd.services.asterisk = {
       description = ''
@@ -196,14 +225,17 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
+      # Do not restart, to avoid disruption of running calls. Restart unit by yourself!
+      restartIfChanged = false;
+
       preStart = ''
         # Copy skeleton directory tree to /var
         for d in '${varlibdir}' '${spooldir}' '${logdir}'; do
           # TODO: Make exceptions for /var directories that likely should be updated
           if [ ! -e "$d" ]; then
             mkdir -p "$d"
-            cp --recursive ${pkgs.asterisk}/"$d" "$d"
-            chown --recursive ${asteriskUser} "$d"
+            cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/
+            chown --recursive ${asteriskUser}:${asteriskGroup} "$d"
             find "$d" -type d | xargs chmod 0755
           fi
         done
@@ -215,7 +247,9 @@ in
             # FIXME: This doesn't account for arguments with spaces
             argString = concatStringsSep " " cfg.extraArguments;
           in
-          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C ${asteriskEtc}/asterisk.conf ${argString} -F";
+          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";
+        ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload"
+          '';
         Type = "forking";
         PIDFile = "/var/run/asterisk/asterisk.pid";
       };
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index ed772e7b247..2433750ce45 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux }:
-
+{ stdenv, pkgs, fetchurl, fetchgit,
+  jansson, libxml2, libxslt, ncurses, openssl, sqlite,
+  utillinux, dmidecode, libuuid, binutils, newt,
+  lua,
+  srtp, wget, curl,
+  subversionClient
+}:
 stdenv.mkDerivation rec {
   name = "asterisk-${version}";
-  version = "13.6.0";
+  version = "14.1.2";
 
   src = fetchurl {
     url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";
-    sha256 = "0nh0fnqx84as92kk9d73s0386cndd17l06y1c72jl2bdjhyba0ca";
+    sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8";
   };
 
   # Note that these sounds are included with the release tarball. They are
   # provided here verbatim for the convenience of anyone wanting to build
   # Asterisk from other sources.
   coreSounds = fetchurl {
-    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.26.tar.gz;
-    sha256 = "2300e3ed1d2ded6808a30a6ba71191e7784710613a5431afebbd0162eb4d5d73";
+    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;
+    sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";
   };
   mohSounds = fetchurl {
     url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
@@ -22,7 +27,7 @@ stdenv.mkDerivation rec {
   };
   # TODO: Sounds for other languages could be added here
 
-  buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux ];
+  buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ];
 
   patches = [
     # Disable downloading of sound files (we will fetch them
@@ -38,14 +43,24 @@ stdenv.mkDerivation rec {
 
   # Use the following preConfigure section when building Asterisk from sources
   # other than the release tarball.
-#   preConfigure = ''
-#     ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz
-#     ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz
-#   '';
+  # preConfigure = ''
+  #   ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz
+  #   ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz
+  #'';
 
   # The default libdir is $PREFIX/usr/lib, which causes problems when paths
   # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib.
-  configureFlags = "--libdir=\${out}/lib";
+  configureFlags = [
+    "--libdir=\${out}/lib"
+    "--with-lua=${lua}/lib"
+    "--with-pjproject-bundled"
+  ];
+
+  preBuild = ''
+    make menuselect.makeopts
+    substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
+    ./contrib/scripts/get_mp3_source.sh
+  '';
 
   postInstall = ''
     # Install sample configuration files for this version of Asterisk
@@ -56,9 +71,6 @@ stdenv.mkDerivation rec {
     description = "Software implementation of a telephone private branch exchange (PBX)";
     homepage = http://www.asterisk.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ auntie ];
-    # Marked as broken due to needing an update for security issues.
-    # See: https://github.com/NixOS/nixpkgs/issues/18856
-    broken = true;
+    maintainers = with maintainers; [ auntie DerTim1 ];
   };
 }
diff --git a/pkgs/servers/asterisk/disable-download.patch b/pkgs/servers/asterisk/disable-download.patch
index 8b15ecdfaaa..670886bfe3c 100644
--- a/pkgs/servers/asterisk/disable-download.patch
+++ b/pkgs/servers/asterisk/disable-download.patch
@@ -1,7 +1,7 @@
-diff -ruN asterisk-13.2.0/sounds/Makefile asterisk-13.2.0-patched/sounds/Makefile
---- asterisk-13.2.0/sounds/Makefile	2014-09-09 14:01:11.000000000 -0600
-+++ asterisk-13.2.0-patched/sounds/Makefile	2015-03-31 16:12:00.549133670 -0600
-@@ -89,7 +89,7 @@
+diff -ruN asterisk-14.1.2/sounds/Makefile asterisk-14.1.2-patched/sounds/Makefile 
+--- asterisk-14.1.2/sounds/Makefile	2016-11-10 20:43:02.000000000 +0100
++++ asterisk-14.1.2-patched/sounds/Makefile	2016-11-16 10:08:46.591615147 +0100
+@@ -90,7 +90,7 @@
  	  ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \
  	fi
  
diff --git a/pkgs/servers/asterisk/runtime-vardirs.patch b/pkgs/servers/asterisk/runtime-vardirs.patch
index dfc00186d13..17959bac9a0 100644
--- a/pkgs/servers/asterisk/runtime-vardirs.patch
+++ b/pkgs/servers/asterisk/runtime-vardirs.patch
@@ -1,6 +1,6 @@
-diff -rupN asterisk-13.3.2/build_tools/make_defaults_h asterisk-13.3.2-patched/build_tools/make_defaults_h
---- asterisk-13.3.2/build_tools/make_defaults_h	2012-01-30 14:21:16.000000000 -0700
-+++ asterisk-13.3.2-patched/build_tools/make_defaults_h	2015-04-15 19:07:46.760351155 -0600
+diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/build_tools/make_defaults_h
+--- asterisk-14.1.2/build_tools/make_defaults_h	2016-11-10 20:43:02.000000000 +0100
++++ asterisk-14.1.2-patched/build_tools/make_defaults_h	2016-11-16 10:09:04.189625495 +0100
 @@ -1,4 +1,13 @@
  #!/bin/sh
 +